Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7833ff32e6 | |||
| 6fee9f6bd6 | |||
| 276f242b10 | |||
| 97301dcd6c | |||
| daeb8b3003 | |||
| 9c311cb58b |
@@ -3,6 +3,14 @@ lexik_jwt_authentication:
|
|||||||
public_key: '%env(resolve:JWT_PUBLIC_KEY)%'
|
public_key: '%env(resolve:JWT_PUBLIC_KEY)%'
|
||||||
pass_phrase: '%env(JWT_PASSPHRASE)%'
|
pass_phrase: '%env(JWT_PASSPHRASE)%'
|
||||||
token_ttl: '%env(int:JWT_TOKEN_TTL)%'
|
token_ttl: '%env(int:JWT_TOKEN_TTL)%'
|
||||||
|
# Tolerance d'horloge (en secondes) appliquee a la validation des claims
|
||||||
|
# temporels iat / nbf / exp (LooseValidAt cote lcobucci). Sans cette marge
|
||||||
|
# (defaut 0), un recul d'horloge entre la signature (/login_check) et la
|
||||||
|
# requete suivante rend iat/nbf « dans le futur » -> « Invalid JWT Token »
|
||||||
|
# (401). Observe en dev sous WSL2/Docker (horloge CLOCK_REALTIME non
|
||||||
|
# monotone) : flakes intermittents de la suite PHPUnit (ERP-98). Benefice
|
||||||
|
# aussi en prod si les noeuds derivent legerement entre eux.
|
||||||
|
clock_skew: 15
|
||||||
remove_token_from_body_when_cookies_used: true
|
remove_token_from_body_when_cookies_used: true
|
||||||
token_extractors:
|
token_extractors:
|
||||||
authorization_header:
|
authorization_header:
|
||||||
|
|||||||
+1
-1
@@ -1,2 +1,2 @@
|
|||||||
parameters:
|
parameters:
|
||||||
app.version: '0.1.68'
|
app.version: '0.1.71'
|
||||||
|
|||||||
@@ -87,7 +87,24 @@
|
|||||||
"archiveSuccess": "Client archivé avec succès",
|
"archiveSuccess": "Client archivé avec succès",
|
||||||
"restoreSuccess": "Client restauré avec succès",
|
"restoreSuccess": "Client restauré avec succès",
|
||||||
"error": "Une erreur est survenue. Réessayez.",
|
"error": "Une erreur est survenue. Réessayez.",
|
||||||
"exportError": "L'export du répertoire clients a échoué. Réessayez."
|
"exportError": "L'export du répertoire clients a échoué. Réessayez.",
|
||||||
|
"restoreConflict": "Impossible de restaurer : un client actif portant ce nom existe déjà."
|
||||||
|
},
|
||||||
|
"consultation": {
|
||||||
|
"title": "Consultation client",
|
||||||
|
"back": "Retour au répertoire",
|
||||||
|
"loading": "Chargement du client…",
|
||||||
|
"notFound": "Client introuvable.",
|
||||||
|
"emptyContacts": "Aucun contact enregistré.",
|
||||||
|
"emptyAddresses": "Aucune adresse enregistrée.",
|
||||||
|
"confirmArchive": {
|
||||||
|
"title": "Archiver le client",
|
||||||
|
"message": "Ce client n'apparaîtra plus dans le répertoire actif. Confirmer l'archivage ?"
|
||||||
|
},
|
||||||
|
"confirmRestore": {
|
||||||
|
"title": "Restaurer le client",
|
||||||
|
"message": "Ce client réapparaîtra dans le répertoire actif. Confirmer la restauration ?"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"validation": {
|
"validation": {
|
||||||
"informationRequiredForCommercial": "Les informations de l'entreprise sont obligatoires pour le rôle Commerciale.",
|
"informationRequiredForCommercial": "Les informations de l'entreprise sont obligatoires pour le rôle Commerciale.",
|
||||||
|
|||||||
@@ -88,9 +88,11 @@
|
|||||||
sur l'input interne, pas sur la cellule de grille. Le wrapper porte
|
sur l'input interne, pas sur la cellule de grille. Le wrapper porte
|
||||||
le col-span-2, le champ le remplit (w-full). -->
|
le col-span-2, le champ le remplit (w-full). -->
|
||||||
<div class="col-span-2">
|
<div class="col-span-2">
|
||||||
<!-- Adresse : saisie assistee (BAN) ou libre en mode degrade. -->
|
<!-- Adresse : saisie assistee (BAN) en edition ; champ texte simple en
|
||||||
|
mode degrade OU en lecture seule (MalioInputAutocomplete ne reaffiche
|
||||||
|
pas sa valeur liee, il n'afficherait rien en readonly). -->
|
||||||
<MalioInputAutocomplete
|
<MalioInputAutocomplete
|
||||||
v-if="!degraded"
|
v-if="!degraded && !readonly"
|
||||||
:model-value="model.street"
|
:model-value="model.street"
|
||||||
:options="addressOptions"
|
:options="addressOptions"
|
||||||
:loading="addressLoading"
|
:loading="addressLoading"
|
||||||
@@ -197,8 +199,21 @@ const model = computed(() => props.modelValue)
|
|||||||
|
|
||||||
// Mode degrade : service BAN indisponible → Ville/Adresse en saisie libre.
|
// Mode degrade : service BAN indisponible → Ville/Adresse en saisie libre.
|
||||||
const degraded = ref(false)
|
const degraded = ref(false)
|
||||||
const cityOptions = ref<RefOption[]>([])
|
// Villes proposees par la BAN (alimentees a la saisie du code postal).
|
||||||
|
const banCityOptions = ref<RefOption[]>([])
|
||||||
const addressOptions = ref<RefOption[]>([])
|
const addressOptions = ref<RefOption[]>([])
|
||||||
|
|
||||||
|
// Options ville effectives : on garantit que la ville courante figure toujours
|
||||||
|
// dans la liste, sinon MalioSelect (qui resout le libelle depuis ses options)
|
||||||
|
// afficherait un champ vide en lecture seule (consultation 1.11) ou en edition
|
||||||
|
// d'une adresse existante (1.12), ou la BAN n'a pas (re)peuple les suggestions.
|
||||||
|
const cityOptions = computed<RefOption[]>(() => {
|
||||||
|
const current = props.modelValue.city
|
||||||
|
if (current && !banCityOptions.value.some(o => o.value === current)) {
|
||||||
|
return [{ value: current, label: current }, ...banCityOptions.value]
|
||||||
|
}
|
||||||
|
return banCityOptions.value
|
||||||
|
})
|
||||||
const addressLoading = ref(false)
|
const addressLoading = ref(false)
|
||||||
// Conserve les suggestions d'adresse pour retrouver ville/CP au moment du select.
|
// Conserve les suggestions d'adresse pour retrouver ville/CP au moment du select.
|
||||||
let lastAddressSuggestions: AddressSuggestion[] = []
|
let lastAddressSuggestions: AddressSuggestion[] = []
|
||||||
@@ -248,7 +263,7 @@ async function onPostalCodeChange(value: string): Promise<void> {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const suggestions = await autocomplete.searchCity(digits)
|
const suggestions = await autocomplete.searchCity(digits)
|
||||||
cityOptions.value = suggestions.map(s => ({ value: s.city, label: s.city }))
|
banCityOptions.value = suggestions.map(s => ({ value: s.city, label: s.city }))
|
||||||
}
|
}
|
||||||
catch {
|
catch {
|
||||||
enterDegraded()
|
enterDegraded()
|
||||||
|
|||||||
@@ -0,0 +1,95 @@
|
|||||||
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||||
|
|
||||||
|
// Mocks des composables auto-importes par Nuxt (indisponibles sous happy-dom).
|
||||||
|
const mockGet = vi.hoisted(() => vi.fn())
|
||||||
|
const mockPatch = vi.hoisted(() => vi.fn())
|
||||||
|
|
||||||
|
vi.stubGlobal('useApi', () => ({
|
||||||
|
get: mockGet,
|
||||||
|
post: vi.fn(),
|
||||||
|
put: vi.fn(),
|
||||||
|
patch: mockPatch,
|
||||||
|
delete: vi.fn(),
|
||||||
|
}))
|
||||||
|
|
||||||
|
const { useClient } = await import('../useClient')
|
||||||
|
|
||||||
|
const SAMPLE = { '@id': '/api/clients/42', id: 42, companyName: 'ACME', isArchived: false }
|
||||||
|
|
||||||
|
describe('useClient', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
mockGet.mockReset()
|
||||||
|
mockPatch.mockReset()
|
||||||
|
mockGet.mockResolvedValue(SAMPLE)
|
||||||
|
mockPatch.mockResolvedValue({ ...SAMPLE, isArchived: true })
|
||||||
|
})
|
||||||
|
|
||||||
|
it('charge le detail via GET /clients/{id} en Hydra, sans toast', async () => {
|
||||||
|
const { client, load } = useClient(42)
|
||||||
|
await load()
|
||||||
|
|
||||||
|
expect(mockGet).toHaveBeenCalledWith(
|
||||||
|
'/clients/42',
|
||||||
|
{},
|
||||||
|
expect.objectContaining({
|
||||||
|
headers: { Accept: 'application/ld+json' },
|
||||||
|
toast: false,
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
expect(client.value).toEqual(SAMPLE)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('bascule loading pendant le chargement et le retombe a false', async () => {
|
||||||
|
const { loading, load } = useClient(42)
|
||||||
|
const promise = load()
|
||||||
|
expect(loading.value).toBe(true)
|
||||||
|
await promise
|
||||||
|
expect(loading.value).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('marque error et laisse client null si le GET echoue (404...)', async () => {
|
||||||
|
mockGet.mockRejectedValueOnce(new Error('not found'))
|
||||||
|
const { client, error, load } = useClient(99)
|
||||||
|
await load()
|
||||||
|
expect(error.value).toBe(true)
|
||||||
|
expect(client.value).toBeNull()
|
||||||
|
})
|
||||||
|
|
||||||
|
it('archive() PATCHe { isArchived: true } sans toast puis RECHARGE le detail complet', async () => {
|
||||||
|
// 1er GET = chargement initial, 2e GET = rechargement post-archivage.
|
||||||
|
mockGet.mockResolvedValueOnce(SAMPLE)
|
||||||
|
mockGet.mockResolvedValueOnce({ ...SAMPLE, isArchived: true })
|
||||||
|
const { client, load, archive } = useClient(42)
|
||||||
|
await load()
|
||||||
|
await archive()
|
||||||
|
|
||||||
|
expect(mockPatch).toHaveBeenCalledWith(
|
||||||
|
'/clients/42',
|
||||||
|
{ isArchived: true },
|
||||||
|
expect.objectContaining({ toast: false }),
|
||||||
|
)
|
||||||
|
// Le detail est re-fetch (le PATCH ne renvoie pas l'embed complet).
|
||||||
|
expect(mockGet).toHaveBeenCalledTimes(2)
|
||||||
|
expect(client.value?.isArchived).toBe(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('restore() PATCHe { isArchived: false } (payload isArchived SEUL)', async () => {
|
||||||
|
const { load, restore } = useClient(42)
|
||||||
|
await load()
|
||||||
|
await restore()
|
||||||
|
|
||||||
|
expect(mockPatch).toHaveBeenCalledWith(
|
||||||
|
'/clients/42',
|
||||||
|
{ isArchived: false },
|
||||||
|
expect.objectContaining({ toast: false }),
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('propage l\'erreur (ex: 409 conflit homonyme RG-1.23) au lieu de l\'avaler', async () => {
|
||||||
|
const conflict = { response: { status: 409 } }
|
||||||
|
mockPatch.mockRejectedValueOnce(conflict)
|
||||||
|
const { load, restore } = useClient(42)
|
||||||
|
await load()
|
||||||
|
await expect(restore()).rejects.toBe(conflict)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
import { ref } from 'vue'
|
||||||
|
import type { ClientDetail } from '~/modules/commercial/utils/clientConsultation'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Chargement et actions d'archivage d'un client unique (ecran « Consultation
|
||||||
|
* client », 1.11). Lit le detail embarque via `GET /api/clients/{id}` (contacts /
|
||||||
|
* adresses / ribs sous `client:item:read` / `client:read:accounting`) et expose
|
||||||
|
* les bascules d'archivage (PATCH `isArchived` SEUL — tout autre champ => 422).
|
||||||
|
*
|
||||||
|
* L'en-tete `Accept: application/ld+json` est impose pour obtenir le payload
|
||||||
|
* Hydra complet (sans lui, API Platform 4 renvoie une representation reduite).
|
||||||
|
*
|
||||||
|
* Etat 100 % local a l'instance (refs) — aucune persistance URL. Les erreurs
|
||||||
|
* d'archivage/restauration (notamment le 409 RG-1.23 : homonyme actif a la
|
||||||
|
* restauration) sont PROPAGEES a l'appelant, qui decide du toast a afficher.
|
||||||
|
*/
|
||||||
|
export function useClient(id: number | string) {
|
||||||
|
const api = useApi()
|
||||||
|
|
||||||
|
const client = ref<ClientDetail | null>(null)
|
||||||
|
const loading = ref(false)
|
||||||
|
const error = ref(false)
|
||||||
|
|
||||||
|
/** Recupere le detail complet (embed contacts/adresses/ribs + comptabilite). */
|
||||||
|
function fetchDetail(): Promise<ClientDetail> {
|
||||||
|
return api.get<ClientDetail>(
|
||||||
|
`/clients/${id}`,
|
||||||
|
{},
|
||||||
|
{ headers: { Accept: 'application/ld+json' }, toast: false },
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Charge le detail du client. En cas d'echec : `error = true`, `client = null`. */
|
||||||
|
async function load(): Promise<void> {
|
||||||
|
loading.value = true
|
||||||
|
error.value = false
|
||||||
|
try {
|
||||||
|
client.value = await fetchDetail()
|
||||||
|
}
|
||||||
|
catch {
|
||||||
|
error.value = true
|
||||||
|
client.value = null
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bascule l'archivage (PATCH `isArchived` SEUL — tout autre champ => 422),
|
||||||
|
* puis RECHARGE le detail complet : la reponse du PATCH ne porte que le groupe
|
||||||
|
* `client:read` (ni l'embed contacts/adresses/ribs ni les libelles des
|
||||||
|
* referentiels comptables), un simple merge laisserait l'affichage incoherent.
|
||||||
|
* Toute erreur (notamment le 409 d'homonyme actif a la restauration, RG-1.23)
|
||||||
|
* est propagee a l'appelant AVANT le rechargement.
|
||||||
|
*/
|
||||||
|
async function setArchived(isArchived: boolean): Promise<void> {
|
||||||
|
await api.patch(`/clients/${id}`, { isArchived }, { toast: false })
|
||||||
|
client.value = await fetchDetail()
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
client,
|
||||||
|
loading,
|
||||||
|
error,
|
||||||
|
load,
|
||||||
|
archive: () => setArchived(true),
|
||||||
|
restore: () => setArchived(false),
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,481 @@
|
|||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<!-- En-tete : retour repertoire + nom du client + actions (Modifier / Archiver|Restaurer). -->
|
||||||
|
<div class="flex items-center gap-3">
|
||||||
|
<MalioButtonIcon
|
||||||
|
icon="mdi:arrow-left-bold"
|
||||||
|
icon-size="24"
|
||||||
|
variant="ghost"
|
||||||
|
v-bind="{ ariaLabel: t('commercial.clients.consultation.back') }"
|
||||||
|
@click="goBack"
|
||||||
|
/>
|
||||||
|
<h1 class="text-[32px] font-bold text-m-primary">{{ headerTitle }}</h1>
|
||||||
|
|
||||||
|
<!-- gap-12 = 48px : meme espacement que Ajouter / Filtres du repertoire. -->
|
||||||
|
<div class="ml-auto flex items-center gap-12">
|
||||||
|
<MalioButton
|
||||||
|
v-if="canEdit"
|
||||||
|
variant="secondary"
|
||||||
|
icon-name="mdi:pencil-outline"
|
||||||
|
icon-position="left"
|
||||||
|
:label="t('commercial.clients.action.edit')"
|
||||||
|
@click="goEdit"
|
||||||
|
/>
|
||||||
|
<MalioButton
|
||||||
|
v-if="showArchive"
|
||||||
|
variant="secondary"
|
||||||
|
icon-name="mdi:archive-arrow-down-outline"
|
||||||
|
icon-position="left"
|
||||||
|
:label="t('commercial.clients.action.archive')"
|
||||||
|
@click="askToggleArchive"
|
||||||
|
/>
|
||||||
|
<MalioButton
|
||||||
|
v-if="showRestore"
|
||||||
|
variant="secondary"
|
||||||
|
icon-name="mdi:archive-arrow-up-outline"
|
||||||
|
icon-position="left"
|
||||||
|
:label="t('commercial.clients.action.restore')"
|
||||||
|
@click="askToggleArchive"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Etats de chargement / introuvable. -->
|
||||||
|
<p v-if="loading" class="mt-12 text-center text-black/60">{{ t('commercial.clients.consultation.loading') }}</p>
|
||||||
|
<p v-else-if="error" class="mt-12 text-center text-m-danger">{{ t('commercial.clients.consultation.notFound') }}</p>
|
||||||
|
|
||||||
|
<template v-else-if="client">
|
||||||
|
<!-- ── Formulaire principal (lecture seule) ──────────────────────── -->
|
||||||
|
<div class="mt-[48px] grid grid-cols-3 xl:grid-cols-4 gap-x-[44px] gap-y-4">
|
||||||
|
<MalioInputText
|
||||||
|
:model-value="client.companyName"
|
||||||
|
:label="t('commercial.clients.form.main.companyName')"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<MalioInputText
|
||||||
|
:model-value="client.lastName"
|
||||||
|
:label="t('commercial.clients.form.main.lastName')"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<MalioInputText
|
||||||
|
:model-value="client.firstName"
|
||||||
|
:label="t('commercial.clients.form.main.firstName')"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<MalioSelectCheckbox
|
||||||
|
:model-value="categoryIris"
|
||||||
|
:options="mainCategoryOptions"
|
||||||
|
:label="t('commercial.clients.form.main.categories')"
|
||||||
|
:display-tag="true"
|
||||||
|
disabled
|
||||||
|
/>
|
||||||
|
<MalioInputPhone
|
||||||
|
v-for="(phone, index) in mainPhones"
|
||||||
|
:key="index"
|
||||||
|
:model-value="phone"
|
||||||
|
:label="index === 0 ? t('commercial.clients.form.main.phonePrimary') : t('commercial.clients.form.main.phoneSecondary')"
|
||||||
|
:mask="PHONE_MASK"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<MalioInputEmail
|
||||||
|
:model-value="client.email"
|
||||||
|
:label="t('commercial.clients.form.main.email')"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<MalioSelect
|
||||||
|
v-if="relation.type"
|
||||||
|
:model-value="relation.type"
|
||||||
|
:options="relationOptions"
|
||||||
|
:label="t('commercial.clients.form.main.relation')"
|
||||||
|
disabled
|
||||||
|
/>
|
||||||
|
<MalioInputText
|
||||||
|
v-if="relation.type"
|
||||||
|
:model-value="relation.name"
|
||||||
|
:label="relation.type === 'distributeur' ? t('commercial.clients.form.main.distributorName') : t('commercial.clients.form.main.brokerName')"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<MalioCheckbox
|
||||||
|
:model-value="client.triageService === true"
|
||||||
|
:label="t('commercial.clients.form.main.triageService')"
|
||||||
|
group-class="self-center"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- ── Onglets (navigation libre, tout en lecture seule) ─────────── -->
|
||||||
|
<MalioTabList v-model="activeTab" :tabs="tabs" class="mt-[60px]">
|
||||||
|
<!-- Onglet Information -->
|
||||||
|
<template #information>
|
||||||
|
<div class="mt-12 grid grid-cols-4 gap-x-[44px] gap-y-4 bg-white py-4 pl-[28px] pr-[60px] shadow-[0_4px_4px_0_rgba(0,0,0,0.25)]">
|
||||||
|
<MalioInputTextArea
|
||||||
|
:model-value="information.description"
|
||||||
|
:label="t('commercial.clients.form.information.description')"
|
||||||
|
resize="none"
|
||||||
|
group-class="row-span-2 pt-1"
|
||||||
|
text-input="h-full text-lg"
|
||||||
|
disabled
|
||||||
|
/>
|
||||||
|
<MalioInputText
|
||||||
|
:model-value="information.competitors"
|
||||||
|
:label="t('commercial.clients.form.information.competitors')"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<MalioDate
|
||||||
|
:model-value="information.foundedAt"
|
||||||
|
:label="t('commercial.clients.form.information.foundedAt')"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<MalioInputText
|
||||||
|
:model-value="information.employeesCount"
|
||||||
|
:label="t('commercial.clients.form.information.employeesCount')"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<MalioInputAmount
|
||||||
|
:model-value="information.revenueAmount"
|
||||||
|
:label="t('commercial.clients.form.information.revenueAmount')"
|
||||||
|
disabled
|
||||||
|
/>
|
||||||
|
<MalioInputText
|
||||||
|
:model-value="information.directorName"
|
||||||
|
:label="t('commercial.clients.form.information.directorName')"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<MalioInputAmount
|
||||||
|
:model-value="information.profitAmount"
|
||||||
|
:label="t('commercial.clients.form.information.profitAmount')"
|
||||||
|
disabled
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<!-- Onglet Contact -->
|
||||||
|
<template #contact>
|
||||||
|
<div class="mt-12 flex flex-col gap-6">
|
||||||
|
<ClientContactBlock
|
||||||
|
v-for="(contact, index) in contacts"
|
||||||
|
:key="contact.id ?? index"
|
||||||
|
:model-value="contact"
|
||||||
|
:title="t('commercial.clients.form.contact.title', { n: index + 1 })"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<p v-if="contacts.length === 0" class="text-center text-black/60">
|
||||||
|
{{ t('commercial.clients.consultation.emptyContacts') }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<!-- Onglet Adresse -->
|
||||||
|
<template #address>
|
||||||
|
<div class="mt-12 flex flex-col gap-6">
|
||||||
|
<ClientAddressBlock
|
||||||
|
v-for="(view, index) in addressViews"
|
||||||
|
:key="view.draft.id ?? index"
|
||||||
|
:model-value="view.draft"
|
||||||
|
:title="t('commercial.clients.form.address.title', { n: index + 1 })"
|
||||||
|
:category-options="view.categoryOptions"
|
||||||
|
:site-options="view.siteOptions"
|
||||||
|
:contact-options="contactOptions"
|
||||||
|
:country-options="countryOptions"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<p v-if="addressViews.length === 0" class="text-center text-black/60">
|
||||||
|
{{ t('commercial.clients.consultation.emptyAddresses') }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<!-- Onglet Comptabilite (present uniquement si accounting.view). -->
|
||||||
|
<template v-if="canAccountingView" #accounting>
|
||||||
|
<div class="mt-12 flex flex-col gap-6">
|
||||||
|
<div class="bg-white py-4 pl-[28px] pr-[60px] shadow-[0_4px_4px_0_rgba(0,0,0,0.25)]">
|
||||||
|
<div class="grid grid-cols-3 gap-x-[80px] gap-y-5">
|
||||||
|
<MalioInputText
|
||||||
|
:model-value="accounting.siren"
|
||||||
|
:label="t('commercial.clients.form.accounting.siren')"
|
||||||
|
:mask="SIREN_MASK"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<MalioInputText
|
||||||
|
:model-value="accounting.accountNumber"
|
||||||
|
:label="t('commercial.clients.form.accounting.accountNumber')"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<MalioSelect
|
||||||
|
:model-value="accounting.tvaModeIri"
|
||||||
|
:options="tvaModeOptions"
|
||||||
|
:label="t('commercial.clients.form.accounting.tvaMode')"
|
||||||
|
empty-option-label=""
|
||||||
|
disabled
|
||||||
|
/>
|
||||||
|
<MalioInputText
|
||||||
|
:model-value="accounting.nTva"
|
||||||
|
:label="t('commercial.clients.form.accounting.nTva')"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<MalioSelect
|
||||||
|
:model-value="accounting.paymentDelayIri"
|
||||||
|
:options="paymentDelayOptions"
|
||||||
|
:label="t('commercial.clients.form.accounting.paymentDelay')"
|
||||||
|
empty-option-label=""
|
||||||
|
disabled
|
||||||
|
/>
|
||||||
|
<MalioSelect
|
||||||
|
:model-value="accounting.paymentTypeIri"
|
||||||
|
:options="paymentTypeOptions"
|
||||||
|
:label="t('commercial.clients.form.accounting.paymentType')"
|
||||||
|
empty-option-label=""
|
||||||
|
disabled
|
||||||
|
/>
|
||||||
|
<MalioSelect
|
||||||
|
v-if="accounting.bankIri"
|
||||||
|
:model-value="accounting.bankIri"
|
||||||
|
:options="bankOptions"
|
||||||
|
:label="t('commercial.clients.form.accounting.bank')"
|
||||||
|
empty-option-label=""
|
||||||
|
disabled
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Blocs RIB (0..n), lecture seule. -->
|
||||||
|
<div
|
||||||
|
v-for="(rib, index) in ribs"
|
||||||
|
:key="rib.id ?? index"
|
||||||
|
class="bg-white py-4 pl-[28px] pr-[60px] shadow-[0_4px_4px_0_rgba(0,0,0,0.25)]"
|
||||||
|
>
|
||||||
|
<div class="grid grid-cols-3 gap-x-[80px] gap-y-5">
|
||||||
|
<MalioInputText
|
||||||
|
:model-value="rib.label"
|
||||||
|
:label="t('commercial.clients.form.accounting.ribLabel')"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<MalioInputText
|
||||||
|
:model-value="rib.bic"
|
||||||
|
:label="t('commercial.clients.form.accounting.ribBic')"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
<MalioInputText
|
||||||
|
:model-value="rib.iban"
|
||||||
|
:label="t('commercial.clients.form.accounting.ribIban')"
|
||||||
|
readonly
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<!-- Onglets non encore implementes : frame vide (navigation libre). -->
|
||||||
|
<template #transport><TabPlaceholderBlank /></template>
|
||||||
|
<template #statistics><TabPlaceholderBlank /></template>
|
||||||
|
<template #reports><TabPlaceholderBlank /></template>
|
||||||
|
<template #exchanges><TabPlaceholderBlank /></template>
|
||||||
|
</MalioTabList>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<!-- Modal de confirmation Archiver / Restaurer. -->
|
||||||
|
<MalioModal v-model="confirmOpen" modal-class="max-w-md">
|
||||||
|
<template #header>
|
||||||
|
<h2 class="text-[24px] font-bold">
|
||||||
|
{{ isArchived ? t('commercial.clients.consultation.confirmRestore.title') : t('commercial.clients.consultation.confirmArchive.title') }}
|
||||||
|
</h2>
|
||||||
|
</template>
|
||||||
|
<p>{{ isArchived ? t('commercial.clients.consultation.confirmRestore.message') : t('commercial.clients.consultation.confirmArchive.message') }}</p>
|
||||||
|
<template #footer>
|
||||||
|
<MalioButton
|
||||||
|
variant="secondary"
|
||||||
|
button-class="flex-1"
|
||||||
|
:label="t('commercial.clients.form.confirmDelete.cancel')"
|
||||||
|
@click="confirmOpen = false"
|
||||||
|
/>
|
||||||
|
<MalioButton
|
||||||
|
:variant="isArchived ? 'primary' : 'danger'"
|
||||||
|
button-class="flex-1"
|
||||||
|
:label="t('commercial.clients.form.confirmDelete.confirm')"
|
||||||
|
:disabled="toggling"
|
||||||
|
@click="confirmToggleArchive"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</MalioModal>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, onMounted, ref } from 'vue'
|
||||||
|
import { useClient } from '~/modules/commercial/composables/useClient'
|
||||||
|
import { buildClientFormTabKeys } from '~/modules/commercial/utils/clientFormRules'
|
||||||
|
import {
|
||||||
|
canEditClient,
|
||||||
|
categoryOptionsOf,
|
||||||
|
contactOptionsOf,
|
||||||
|
mapAccountingDraft,
|
||||||
|
mapAddressView,
|
||||||
|
mapContactToDraft,
|
||||||
|
mapRibToDraft,
|
||||||
|
referentialOptionOf,
|
||||||
|
relationOf,
|
||||||
|
showArchiveAction,
|
||||||
|
showRestoreAction,
|
||||||
|
type ClientDetail,
|
||||||
|
type SelectOption,
|
||||||
|
} from '~/modules/commercial/utils/clientConsultation'
|
||||||
|
import { formatPhoneFR } from '~/shared/utils/phone'
|
||||||
|
|
||||||
|
// Masques d'affichage (purement visuels, la donnee reste celle du serveur).
|
||||||
|
const PHONE_MASK = '## ## ## ## ##'
|
||||||
|
const SIREN_MASK = '#########'
|
||||||
|
|
||||||
|
const { t } = useI18n()
|
||||||
|
const route = useRoute()
|
||||||
|
const router = useRouter()
|
||||||
|
const toast = useToast()
|
||||||
|
const { can, canAny } = usePermissions()
|
||||||
|
|
||||||
|
// Gating de la route : la consultation exige `view`. Usine (sans view) est
|
||||||
|
// redirige vers le repertoire (lui-meme protege). Cf. matrice § 2.7.
|
||||||
|
if (!can('commercial.clients.view')) {
|
||||||
|
await navigateTo('/clients')
|
||||||
|
}
|
||||||
|
|
||||||
|
const clientId = route.params.id as string
|
||||||
|
|
||||||
|
const { client, loading, error, load, archive, restore } = useClient(clientId)
|
||||||
|
|
||||||
|
// ── Permissions / visibilite des actions ───────────────────────────────────
|
||||||
|
const canAccountingView = computed(() => can('commercial.clients.accounting.view'))
|
||||||
|
const canEdit = computed(() => canEditClient(canAny))
|
||||||
|
const isArchived = computed(() => client.value?.isArchived === true)
|
||||||
|
const showArchive = computed(() => showArchiveAction(can, isArchived.value))
|
||||||
|
const showRestore = computed(() => showRestoreAction(can, isArchived.value))
|
||||||
|
|
||||||
|
const headerTitle = computed(() => client.value?.companyName ?? t('commercial.clients.consultation.title'))
|
||||||
|
|
||||||
|
// ── Donnees derivees du payload (lecture seule) ────────────────────────────
|
||||||
|
const relation = computed(() => (client.value ? relationOf(client.value) : { type: null, name: null }))
|
||||||
|
const categoryIris = computed(() => (client.value?.categories ?? []).map(c => c['@id']))
|
||||||
|
|
||||||
|
// Telephones du formulaire principal, formates XX XX XX XX XX (RG d'affichage).
|
||||||
|
const mainPhones = computed(() =>
|
||||||
|
[client.value?.phonePrimary, client.value?.phoneSecondary]
|
||||||
|
.filter((p): p is string => Boolean(p))
|
||||||
|
.map(formatPhoneFR),
|
||||||
|
)
|
||||||
|
|
||||||
|
const information = computed(() => ({
|
||||||
|
description: client.value?.description ?? null,
|
||||||
|
competitors: client.value?.competitors ?? null,
|
||||||
|
// MalioDate attend strictement YYYY-MM-DD : on tronque l'ISO datetime renvoye.
|
||||||
|
foundedAt: client.value?.foundedAt ? client.value.foundedAt.slice(0, 10) : null,
|
||||||
|
employeesCount: client.value?.employeesCount != null ? String(client.value.employeesCount) : null,
|
||||||
|
revenueAmount: client.value?.revenueAmount ?? null,
|
||||||
|
profitAmount: client.value?.profitAmount ?? null,
|
||||||
|
directorName: client.value?.directorName ?? null,
|
||||||
|
}))
|
||||||
|
|
||||||
|
const contacts = computed(() => (client.value?.contacts ?? []).map(mapContactToDraft))
|
||||||
|
// Vue par adresse : brouillon + options (sites/categories) propres a l'adresse.
|
||||||
|
const addressViews = computed(() => (client.value?.addresses ?? []).map(mapAddressView))
|
||||||
|
const ribs = computed(() => (client.value?.ribs ?? []).map(mapRibToDraft))
|
||||||
|
// Draft comptable (tout null si l'utilisateur n'a pas accounting.view).
|
||||||
|
const accounting = computed(() => mapAccountingDraft(client.value ?? ({} as ClientDetail)))
|
||||||
|
|
||||||
|
// ── Options des selects (construites depuis l'EMBED, jamais via un GET de
|
||||||
|
// referentiel : /categories et /sites sont en 403 pour les roles metier
|
||||||
|
// non-admin, ce qui laisserait les libelles vides). ───────────────────────
|
||||||
|
const mainCategoryOptions = computed(() => categoryOptionsOf(client.value?.categories))
|
||||||
|
const contactOptions = computed(() => contactOptionsOf(client.value?.contacts))
|
||||||
|
|
||||||
|
const relationOptions = computed<SelectOption[]>(() => [
|
||||||
|
{ value: 'distributeur', label: t('commercial.clients.form.main.relationDistributor') },
|
||||||
|
{ value: 'courtier', label: t('commercial.clients.form.main.relationBroker') },
|
||||||
|
])
|
||||||
|
|
||||||
|
const countryOptions: SelectOption[] = [
|
||||||
|
{ value: 'France', label: 'France' },
|
||||||
|
{ value: 'Espagne', label: 'Espagne' },
|
||||||
|
]
|
||||||
|
|
||||||
|
// Selects comptables : libelle issu de l'embed (option unique ou vide).
|
||||||
|
const tvaModeOptions = computed(() => referentialOptionOf(client.value?.tvaMode))
|
||||||
|
const paymentDelayOptions = computed(() => referentialOptionOf(client.value?.paymentDelay))
|
||||||
|
const paymentTypeOptions = computed(() => referentialOptionOf(client.value?.paymentType))
|
||||||
|
const bankOptions = computed(() => referentialOptionOf(client.value?.bank))
|
||||||
|
|
||||||
|
// ── Onglets : navigation LIBRE (pas de sequence forcee en consultation) ────
|
||||||
|
// 4 onglets actifs (Information, Contact, Adresse, + Comptabilite si droit) et
|
||||||
|
// 4 coquilles (Transport, Statistiques, Rapports, Echanges).
|
||||||
|
const tabKeys = computed(() => buildClientFormTabKeys(canAccountingView.value, { includeEditOnlyTabs: true }))
|
||||||
|
|
||||||
|
const TAB_ICONS: Record<string, string> = {
|
||||||
|
information: 'mdi:account-outline',
|
||||||
|
contact: 'mdi:account-box-plus-outline',
|
||||||
|
address: 'mdi:map-marker-outline',
|
||||||
|
transport: 'mdi:truck-delivery-outline',
|
||||||
|
accounting: 'mdi:bank-circle-outline',
|
||||||
|
statistics: 'mdi:finance',
|
||||||
|
reports: 'mdi:file-document-edit-outline',
|
||||||
|
exchanges: 'mdi:account-group-outline',
|
||||||
|
}
|
||||||
|
|
||||||
|
const tabs = computed(() => tabKeys.value.map(key => ({
|
||||||
|
key,
|
||||||
|
label: t(`commercial.clients.tab.${key}`),
|
||||||
|
icon: TAB_ICONS[key],
|
||||||
|
})))
|
||||||
|
|
||||||
|
const activeTab = ref('information')
|
||||||
|
|
||||||
|
// ── Navigation ─────────────────────────────────────────────────────────────
|
||||||
|
function goBack(): void {
|
||||||
|
router.push('/clients')
|
||||||
|
}
|
||||||
|
|
||||||
|
function goEdit(): void {
|
||||||
|
router.push(`/clients/${clientId}/edit`)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Archivage / Restauration ────────────────────────────────────────────────
|
||||||
|
const confirmOpen = ref(false)
|
||||||
|
const toggling = ref(false)
|
||||||
|
|
||||||
|
function askToggleArchive(): void {
|
||||||
|
confirmOpen.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Confirme l'archivage ou la restauration (PATCH isArchived seul). Gere le 409
|
||||||
|
* de conflit d'homonyme actif a la restauration (RG-1.23) avec un message dedie.
|
||||||
|
*/
|
||||||
|
async function confirmToggleArchive(): Promise<void> {
|
||||||
|
if (toggling.value) return
|
||||||
|
toggling.value = true
|
||||||
|
const restoring = isArchived.value
|
||||||
|
try {
|
||||||
|
if (restoring) {
|
||||||
|
await restore()
|
||||||
|
toast.success({ title: t('commercial.clients.toast.restoreSuccess') })
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
await archive()
|
||||||
|
toast.success({ title: t('commercial.clients.toast.archiveSuccess') })
|
||||||
|
}
|
||||||
|
confirmOpen.value = false
|
||||||
|
}
|
||||||
|
catch (e) {
|
||||||
|
const status = (e as { response?: { status?: number } })?.response?.status
|
||||||
|
toast.error({
|
||||||
|
title: t('commercial.clients.toast.error'),
|
||||||
|
message: restoring && status === 409
|
||||||
|
? t('commercial.clients.toast.restoreConflict')
|
||||||
|
: t('commercial.clients.toast.error'),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
toggling.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
useHead({ title: headerTitle })
|
||||||
|
|
||||||
|
onMounted(load)
|
||||||
|
</script>
|
||||||
@@ -0,0 +1,235 @@
|
|||||||
|
import { describe, expect, it } from 'vitest'
|
||||||
|
import {
|
||||||
|
canEditClient,
|
||||||
|
categoryOptionsOf,
|
||||||
|
contactOptionsOf,
|
||||||
|
iriOf,
|
||||||
|
mapAccountingDraft,
|
||||||
|
mapAddressToDraft,
|
||||||
|
mapAddressView,
|
||||||
|
mapContactToDraft,
|
||||||
|
mapRibToDraft,
|
||||||
|
referentialOptionOf,
|
||||||
|
relationOf,
|
||||||
|
showArchiveAction,
|
||||||
|
showRestoreAction,
|
||||||
|
siteOptionsOf,
|
||||||
|
type ClientDetail,
|
||||||
|
} from '../clientConsultation'
|
||||||
|
|
||||||
|
describe('iriOf', () => {
|
||||||
|
it('retourne l\'@id d\'une relation embarquee (objet)', () => {
|
||||||
|
expect(iriOf({ '@id': '/api/payment_types/10', code: 'LCR' })).toBe('/api/payment_types/10')
|
||||||
|
})
|
||||||
|
|
||||||
|
it('retourne la chaine telle quelle si la relation est deja un IRI', () => {
|
||||||
|
expect(iriOf('/api/banks/3')).toBe('/api/banks/3')
|
||||||
|
})
|
||||||
|
|
||||||
|
it('retourne null pour une relation absente (null / undefined / skip_null_values)', () => {
|
||||||
|
expect(iriOf(null)).toBeNull()
|
||||||
|
expect(iriOf(undefined)).toBeNull()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('relationOf', () => {
|
||||||
|
it('detecte une relation distributeur et expose son nom', () => {
|
||||||
|
const client = { distributor: { '@id': '/api/clients/15', companyName: 'DISTRIB GRAND SUD-OUEST' } } as ClientDetail
|
||||||
|
expect(relationOf(client)).toEqual({ type: 'distributeur', name: 'DISTRIB GRAND SUD-OUEST' })
|
||||||
|
})
|
||||||
|
|
||||||
|
it('detecte une relation courtier et expose son nom', () => {
|
||||||
|
const client = { broker: { '@id': '/api/clients/16', companyName: 'CABINET LEONARD' } } as ClientDetail
|
||||||
|
expect(relationOf(client)).toEqual({ type: 'courtier', name: 'CABINET LEONARD' })
|
||||||
|
})
|
||||||
|
|
||||||
|
it('retourne type null quand aucune relation n\'est posee (cles omises)', () => {
|
||||||
|
expect(relationOf({} as ClientDetail)).toEqual({ type: null, name: null })
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('mapContactToDraft', () => {
|
||||||
|
it('formate les telephones en XX XX XX XX XX et conserve l\'iri', () => {
|
||||||
|
const draft = mapContactToDraft({
|
||||||
|
'@id': '/api/client_contacts/18',
|
||||||
|
id: 18,
|
||||||
|
firstName: 'Sophie',
|
||||||
|
lastName: 'Léonard',
|
||||||
|
jobTitle: 'Gérante',
|
||||||
|
phonePrimary: '0549112233',
|
||||||
|
email: 'sophie@x.fr',
|
||||||
|
})
|
||||||
|
expect(draft.id).toBe(18)
|
||||||
|
expect(draft.iri).toBe('/api/client_contacts/18')
|
||||||
|
expect(draft.phonePrimary).toBe('05 49 11 22 33')
|
||||||
|
expect(draft.hasSecondaryPhone).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('revele le 2e telephone quand phoneSecondary est present', () => {
|
||||||
|
const draft = mapContactToDraft({
|
||||||
|
'@id': '/api/client_contacts/19',
|
||||||
|
id: 19,
|
||||||
|
phonePrimary: '0600000000',
|
||||||
|
phoneSecondary: '0611111111',
|
||||||
|
})
|
||||||
|
expect(draft.hasSecondaryPhone).toBe(true)
|
||||||
|
expect(draft.phoneSecondary).toBe('06 11 11 11 11')
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('mapAddressToDraft', () => {
|
||||||
|
it('extrait les iris de sites / categories / contacts (objets ou chaines)', () => {
|
||||||
|
const draft = mapAddressToDraft({
|
||||||
|
'@id': '/api/client_addresses/18',
|
||||||
|
id: 18,
|
||||||
|
country: 'France',
|
||||||
|
postalCode: '86100',
|
||||||
|
city: 'Châtellerault',
|
||||||
|
street: '5 rue des Courtiers',
|
||||||
|
billingEmail: 'factures@x.fr',
|
||||||
|
isProspect: false,
|
||||||
|
isDelivery: false,
|
||||||
|
isBilling: true,
|
||||||
|
sites: [{ '@id': '/api/sites/4', name: 'Chatellerault', color: '#056CF2' }],
|
||||||
|
categories: [{ '@id': '/api/categories/3', code: 'SECTEUR' }],
|
||||||
|
contacts: [{ '@id': '/api/client_contacts/18' }, '/api/client_contacts/20'],
|
||||||
|
})
|
||||||
|
expect(draft.siteIris).toEqual(['/api/sites/4'])
|
||||||
|
expect(draft.categoryIris).toEqual(['/api/categories/3'])
|
||||||
|
expect(draft.contactIris).toEqual(['/api/client_contacts/18', '/api/client_contacts/20'])
|
||||||
|
expect(draft.isBilling).toBe(true)
|
||||||
|
expect(draft.city).toBe('Châtellerault')
|
||||||
|
expect(draft.country).toBe('France')
|
||||||
|
})
|
||||||
|
|
||||||
|
it('tolere les sous-collections absentes (defaut tableau vide, pays France)', () => {
|
||||||
|
const draft = mapAddressToDraft({ '@id': '/api/client_addresses/9', id: 9 })
|
||||||
|
expect(draft.siteIris).toEqual([])
|
||||||
|
expect(draft.categoryIris).toEqual([])
|
||||||
|
expect(draft.contactIris).toEqual([])
|
||||||
|
expect(draft.country).toBe('France')
|
||||||
|
expect(draft.isBilling).toBe(false)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('mapRibToDraft', () => {
|
||||||
|
it('mappe label / bic / iban et l\'id serveur', () => {
|
||||||
|
const draft = mapRibToDraft({ '@id': '/api/client_ribs/3', id: 3, label: 'Compte', bic: 'BNPAFRPPXXX', iban: 'FR14...' })
|
||||||
|
expect(draft).toEqual({ id: 3, label: 'Compte', bic: 'BNPAFRPPXXX', iban: 'FR14...' })
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('mapAccountingDraft', () => {
|
||||||
|
it('mappe les scalaires et resout les iris des referentiels embarques', () => {
|
||||||
|
const acc = mapAccountingDraft({
|
||||||
|
'@id': '/api/clients/1',
|
||||||
|
id: 1,
|
||||||
|
siren: '123456789',
|
||||||
|
accountNumber: '411000',
|
||||||
|
nTva: 'FR123',
|
||||||
|
tvaMode: { '@id': '/api/tva_modes/1' },
|
||||||
|
paymentDelay: { '@id': '/api/payment_delays/2' },
|
||||||
|
paymentType: { '@id': '/api/payment_types/10', code: 'LCR' },
|
||||||
|
bank: { '@id': '/api/banks/3' },
|
||||||
|
} as ClientDetail)
|
||||||
|
expect(acc).toEqual({
|
||||||
|
siren: '123456789',
|
||||||
|
accountNumber: '411000',
|
||||||
|
nTva: 'FR123',
|
||||||
|
tvaModeIri: '/api/tva_modes/1',
|
||||||
|
paymentDelayIri: '/api/payment_delays/2',
|
||||||
|
paymentTypeIri: '/api/payment_types/10',
|
||||||
|
bankIri: '/api/banks/3',
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
it('renvoie des null quand les champs comptables sont absents (sans accounting.view)', () => {
|
||||||
|
const acc = mapAccountingDraft({} as ClientDetail)
|
||||||
|
expect(acc).toEqual({
|
||||||
|
siren: null,
|
||||||
|
accountNumber: null,
|
||||||
|
nTva: null,
|
||||||
|
tvaModeIri: null,
|
||||||
|
paymentDelayIri: null,
|
||||||
|
paymentTypeIri: null,
|
||||||
|
bankIri: null,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('options construites depuis l\'embed (role-independantes)', () => {
|
||||||
|
it('categoryOptionsOf expose value=IRI, label=nom, code', () => {
|
||||||
|
expect(categoryOptionsOf([{ '@id': '/api/categories/3', name: 'Secteur', code: 'SECTEUR' }])).toEqual([
|
||||||
|
{ value: '/api/categories/3', label: 'Secteur', code: 'SECTEUR' },
|
||||||
|
])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('siteOptionsOf expose value=IRI, label=nom', () => {
|
||||||
|
expect(siteOptionsOf([{ '@id': '/api/sites/4', name: 'Chatellerault', color: '#000' }])).toEqual([
|
||||||
|
{ value: '/api/sites/4', label: 'Chatellerault' },
|
||||||
|
])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('contactOptionsOf compose le libelle (nom complet, sinon email)', () => {
|
||||||
|
expect(contactOptionsOf([
|
||||||
|
{ '@id': '/api/client_contacts/1', id: 1, firstName: 'Jean', lastName: 'Dupont' },
|
||||||
|
{ '@id': '/api/client_contacts/2', id: 2, email: 'a@b.fr' },
|
||||||
|
])).toEqual([
|
||||||
|
{ value: '/api/client_contacts/1', label: 'Jean Dupont' },
|
||||||
|
{ value: '/api/client_contacts/2', label: 'a@b.fr' },
|
||||||
|
])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('referentialOptionOf : option unique depuis l\'embed, vide pour IRI nu / absent', () => {
|
||||||
|
expect(referentialOptionOf({ '@id': '/api/payment_types/10', label: 'LCR' })).toEqual([
|
||||||
|
{ value: '/api/payment_types/10', label: 'LCR' },
|
||||||
|
])
|
||||||
|
expect(referentialOptionOf('/api/banks/3')).toEqual([])
|
||||||
|
expect(referentialOptionOf(null)).toEqual([])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('mapAddressView assemble brouillon + options propres a l\'adresse', () => {
|
||||||
|
const view = mapAddressView({
|
||||||
|
'@id': '/api/client_addresses/18',
|
||||||
|
id: 18,
|
||||||
|
city: 'Châtellerault',
|
||||||
|
sites: [{ '@id': '/api/sites/4', name: 'Chatellerault' }],
|
||||||
|
categories: [{ '@id': '/api/categories/3', name: 'Secteur', code: 'SECTEUR' }],
|
||||||
|
})
|
||||||
|
expect(view.draft.id).toBe(18)
|
||||||
|
expect(view.siteOptions).toEqual([{ value: '/api/sites/4', label: 'Chatellerault' }])
|
||||||
|
expect(view.categoryOptions).toEqual([{ value: '/api/categories/3', label: 'Secteur', code: 'SECTEUR' }])
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('canEditClient', () => {
|
||||||
|
const can = (granted: string[]) => (codes: string[]) => codes.some(c => granted.includes(c))
|
||||||
|
|
||||||
|
it('visible pour manage', () => {
|
||||||
|
expect(canEditClient(can(['commercial.clients.manage']))).toBe(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('visible pour accounting.manage (role Compta)', () => {
|
||||||
|
expect(canEditClient(can(['commercial.clients.accounting.manage']))).toBe(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('masque sans aucune des deux permissions (role Usine)', () => {
|
||||||
|
expect(canEditClient(can(['commercial.clients.view']))).toBe(false)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('showArchiveAction / showRestoreAction', () => {
|
||||||
|
const can = (granted: string[]) => (code: string) => granted.includes(code)
|
||||||
|
|
||||||
|
it('Archiver : visible avec la permission archive ET client non archive', () => {
|
||||||
|
expect(showArchiveAction(can(['commercial.clients.archive']), false)).toBe(true)
|
||||||
|
expect(showArchiveAction(can(['commercial.clients.archive']), true)).toBe(false)
|
||||||
|
expect(showArchiveAction(can([]), false)).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('Restaurer : visible avec la permission archive ET client archive', () => {
|
||||||
|
expect(showRestoreAction(can(['commercial.clients.archive']), true)).toBe(true)
|
||||||
|
expect(showRestoreAction(can(['commercial.clients.archive']), false)).toBe(false)
|
||||||
|
expect(showRestoreAction(can([]), true)).toBe(false)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,321 @@
|
|||||||
|
/**
|
||||||
|
* Helpers purs de l'ecran « Consultation client » (M1 Commercial, lecture seule).
|
||||||
|
*
|
||||||
|
* Mappent le payload `GET /api/clients/{id}` (relations embarquees, cf. groupe
|
||||||
|
* `client:item:read` + `client:read:accounting`) vers les brouillons « plats »
|
||||||
|
* partages avec les blocs reutilisables `ClientContactBlock` / `ClientAddressBlock`
|
||||||
|
* et l'onglet Comptabilite. Ne touchent ni a l'API ni a l'etat reactif : testables
|
||||||
|
* unitairement (cf. clientConsultation.spec.ts).
|
||||||
|
*
|
||||||
|
* Rappels de contrat back (verifies sur l'API reelle) :
|
||||||
|
* - les relations ManyToOne (distributor/broker/tvaMode/paymentType/...) sont
|
||||||
|
* serialisees en OBJETS embarques (avec @id + companyName/code/label), pas en IRI nu ;
|
||||||
|
* - les champs nuls sont OMIS du JSON (skip_null_values) → toujours lire avec `?? null` ;
|
||||||
|
* - les champs comptables et `ribs` sont TOTALEMENT ABSENTS sans permission
|
||||||
|
* accounting.view (gate serveur via ClientReadGroupContextBuilder).
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { formatPhoneFR } from '~/shared/utils/phone'
|
||||||
|
import type {
|
||||||
|
AddressFormDraft,
|
||||||
|
ContactFormDraft,
|
||||||
|
RibFormDraft,
|
||||||
|
} from '~/modules/commercial/types/clientForm'
|
||||||
|
|
||||||
|
/** Reference Hydra embarquee minimale (@id toujours present). */
|
||||||
|
export interface HydraRef {
|
||||||
|
'@id': string
|
||||||
|
[key: string]: unknown
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Une relation peut etre embarquee (objet), un IRI nu (chaine) ou absente. */
|
||||||
|
export type Relation = HydraRef | string | null | undefined
|
||||||
|
|
||||||
|
/** Site embarque dans une adresse (groupe site:read). */
|
||||||
|
export interface SiteRead extends HydraRef {
|
||||||
|
name?: string
|
||||||
|
color?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Categorie embarquee (groupe category:read). */
|
||||||
|
export interface CategoryRead extends HydraRef {
|
||||||
|
code?: string
|
||||||
|
name?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Contact embarque (groupe client_contact:read). */
|
||||||
|
export interface ContactRead extends HydraRef {
|
||||||
|
id: number
|
||||||
|
firstName?: string | null
|
||||||
|
lastName?: string | null
|
||||||
|
jobTitle?: string | null
|
||||||
|
phonePrimary?: string | null
|
||||||
|
phoneSecondary?: string | null
|
||||||
|
email?: string | null
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Adresse embarquee (groupe client_address:read). */
|
||||||
|
export interface AddressRead extends HydraRef {
|
||||||
|
id: number
|
||||||
|
country?: string | null
|
||||||
|
postalCode?: string | null
|
||||||
|
city?: string | null
|
||||||
|
street?: string | null
|
||||||
|
streetComplement?: string | null
|
||||||
|
billingEmail?: string | null
|
||||||
|
isProspect?: boolean
|
||||||
|
isDelivery?: boolean
|
||||||
|
isBilling?: boolean
|
||||||
|
sites?: SiteRead[]
|
||||||
|
categories?: CategoryRead[]
|
||||||
|
// L'embed M2M des contacts d'adresse peut etre un objet (partiel) ou un IRI nu.
|
||||||
|
contacts?: Array<HydraRef | string>
|
||||||
|
}
|
||||||
|
|
||||||
|
/** RIB embarque (groupe client:read:accounting, present ssi accounting.view). */
|
||||||
|
export interface RibRead extends HydraRef {
|
||||||
|
id: number
|
||||||
|
label?: string | null
|
||||||
|
bic?: string | null
|
||||||
|
iban?: string | null
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Client relie (distributeur / courtier) embarque (groupe client:read). */
|
||||||
|
export interface RelatedClientRead extends HydraRef {
|
||||||
|
companyName?: string | null
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Detail d'un client tel que renvoye par `GET /api/clients/{id}`. Tous les
|
||||||
|
* champs sont optionnels : skip_null_values cote serveur et gating accounting
|
||||||
|
* peuvent omettre n'importe quelle cle.
|
||||||
|
*/
|
||||||
|
export interface ClientDetail extends HydraRef {
|
||||||
|
id: number
|
||||||
|
companyName?: string | null
|
||||||
|
firstName?: string | null
|
||||||
|
lastName?: string | null
|
||||||
|
phonePrimary?: string | null
|
||||||
|
phoneSecondary?: string | null
|
||||||
|
email?: string | null
|
||||||
|
triageService?: boolean
|
||||||
|
isArchived?: boolean
|
||||||
|
categories?: CategoryRead[]
|
||||||
|
distributor?: RelatedClientRead | string | null
|
||||||
|
broker?: RelatedClientRead | string | null
|
||||||
|
contacts?: ContactRead[]
|
||||||
|
addresses?: AddressRead[]
|
||||||
|
ribs?: RibRead[]
|
||||||
|
// Onglet Information
|
||||||
|
description?: string | null
|
||||||
|
competitors?: string | null
|
||||||
|
foundedAt?: string | null
|
||||||
|
employeesCount?: number | null
|
||||||
|
revenueAmount?: string | null
|
||||||
|
profitAmount?: string | null
|
||||||
|
directorName?: string | null
|
||||||
|
// Onglet Comptabilite (present ssi accounting.view)
|
||||||
|
siren?: string | null
|
||||||
|
accountNumber?: string | null
|
||||||
|
nTva?: string | null
|
||||||
|
tvaMode?: Relation
|
||||||
|
paymentDelay?: Relation
|
||||||
|
paymentType?: Relation
|
||||||
|
bank?: Relation
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Etat « plat » de l'onglet Comptabilite (miroir lecture du formulaire 1.10). */
|
||||||
|
export interface AccountingDraft {
|
||||||
|
siren: string | null
|
||||||
|
accountNumber: string | null
|
||||||
|
nTva: string | null
|
||||||
|
tvaModeIri: string | null
|
||||||
|
paymentDelayIri: string | null
|
||||||
|
paymentTypeIri: string | null
|
||||||
|
bankIri: string | null
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Relation Distributeur/Courtier resolue pour l'affichage en lecture seule. */
|
||||||
|
export interface ClientRelation {
|
||||||
|
type: 'distributeur' | 'courtier' | null
|
||||||
|
name: string | null
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Option de select ({ value, label }) construite a partir de l'embed. */
|
||||||
|
export interface SelectOption {
|
||||||
|
value: string
|
||||||
|
label: string
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Option de categorie enrichie de son code (compatible CategoryOption des blocs). */
|
||||||
|
export interface CategorySelectOption extends SelectOption {
|
||||||
|
code: string
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Vue d'une adresse pour la consultation : le brouillon + ses options de select
|
||||||
|
* construites a partir de l'embed (sites/categories propres a CETTE adresse).
|
||||||
|
*/
|
||||||
|
export interface AddressView {
|
||||||
|
draft: AddressFormDraft
|
||||||
|
siteOptions: SelectOption[]
|
||||||
|
categoryOptions: CategorySelectOption[]
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Extrait l'IRI d'une relation (objet embarque, IRI nu, ou null si absente). */
|
||||||
|
export function iriOf(relation: Relation): string | null {
|
||||||
|
if (relation === null || relation === undefined) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
if (typeof relation === 'string') {
|
||||||
|
return relation
|
||||||
|
}
|
||||||
|
return relation['@id'] ?? null
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resout la relation Distributeur/Courtier (RG-1.03 : mutuellement exclusives).
|
||||||
|
* Le nom est lu sur l'objet embarque (`companyName`) ; null si la relation est
|
||||||
|
* un IRI nu ou absente.
|
||||||
|
*/
|
||||||
|
export function relationOf(client: ClientDetail): ClientRelation {
|
||||||
|
const nameOf = (rel: RelatedClientRead | string | null | undefined): string | null =>
|
||||||
|
rel && typeof rel === 'object' ? (rel.companyName ?? null) : null
|
||||||
|
|
||||||
|
if (client.distributor) {
|
||||||
|
return { type: 'distributeur', name: nameOf(client.distributor) }
|
||||||
|
}
|
||||||
|
if (client.broker) {
|
||||||
|
return { type: 'courtier', name: nameOf(client.broker) }
|
||||||
|
}
|
||||||
|
return { type: null, name: null }
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Mappe un contact embarque vers un brouillon (telephones formates XX XX XX XX XX). */
|
||||||
|
export function mapContactToDraft(contact: ContactRead): ContactFormDraft {
|
||||||
|
const phoneSecondary = contact.phoneSecondary ?? null
|
||||||
|
return {
|
||||||
|
id: contact.id,
|
||||||
|
iri: contact['@id'] ?? null,
|
||||||
|
firstName: contact.firstName ?? null,
|
||||||
|
lastName: contact.lastName ?? null,
|
||||||
|
jobTitle: contact.jobTitle ?? null,
|
||||||
|
phonePrimary: contact.phonePrimary ? formatPhoneFR(contact.phonePrimary) : null,
|
||||||
|
phoneSecondary: phoneSecondary ? formatPhoneFR(phoneSecondary) : null,
|
||||||
|
email: contact.email ?? null,
|
||||||
|
hasSecondaryPhone: phoneSecondary !== null && phoneSecondary !== '',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Mappe une adresse embarquee vers un brouillon (IRI extraits des sous-collections). */
|
||||||
|
export function mapAddressToDraft(address: AddressRead): AddressFormDraft {
|
||||||
|
return {
|
||||||
|
id: address.id,
|
||||||
|
isProspect: address.isProspect ?? false,
|
||||||
|
isDelivery: address.isDelivery ?? false,
|
||||||
|
isBilling: address.isBilling ?? false,
|
||||||
|
country: address.country ?? 'France',
|
||||||
|
postalCode: address.postalCode ?? null,
|
||||||
|
city: address.city ?? null,
|
||||||
|
street: address.street ?? null,
|
||||||
|
streetComplement: address.streetComplement ?? null,
|
||||||
|
categoryIris: (address.categories ?? []).map(c => c['@id']),
|
||||||
|
siteIris: (address.sites ?? []).map(s => s['@id']),
|
||||||
|
contactIris: (address.contacts ?? []).map(c => (typeof c === 'string' ? c : c['@id'])),
|
||||||
|
billingEmail: address.billingEmail ?? null,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Mappe un RIB embarque vers un brouillon. */
|
||||||
|
export function mapRibToDraft(rib: RibRead): RibFormDraft {
|
||||||
|
return {
|
||||||
|
id: rib.id,
|
||||||
|
label: rib.label ?? null,
|
||||||
|
bic: rib.bic ?? null,
|
||||||
|
iban: rib.iban ?? null,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Mappe les champs comptables du client (scalaires + IRI des referentiels). */
|
||||||
|
export function mapAccountingDraft(client: ClientDetail): AccountingDraft {
|
||||||
|
return {
|
||||||
|
siren: client.siren ?? null,
|
||||||
|
accountNumber: client.accountNumber ?? null,
|
||||||
|
nTva: client.nTva ?? null,
|
||||||
|
tvaModeIri: iriOf(client.tvaMode),
|
||||||
|
paymentDelayIri: iriOf(client.paymentDelay),
|
||||||
|
paymentTypeIri: iriOf(client.paymentType),
|
||||||
|
bankIri: iriOf(client.bank),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Options de categories (value=IRI, label=nom, code) construites depuis l'embed.
|
||||||
|
* Source role-independante : evite de dependre de `GET /categories` (403 pour les
|
||||||
|
* roles metier non-admin), qui laisserait les libelles vides.
|
||||||
|
*/
|
||||||
|
export function categoryOptionsOf(categories: CategoryRead[] | undefined): CategorySelectOption[] {
|
||||||
|
return (categories ?? []).map(c => ({
|
||||||
|
value: c['@id'],
|
||||||
|
label: c.name ?? c.code ?? c['@id'],
|
||||||
|
code: c.code ?? '',
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Options de sites (value=IRI, label=nom) construites depuis l'embed d'une adresse. */
|
||||||
|
export function siteOptionsOf(sites: SiteRead[] | undefined): SelectOption[] {
|
||||||
|
return (sites ?? []).map(s => ({ value: s['@id'], label: s.name ?? s['@id'] }))
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Options de contacts (value=IRI, label=nom complet ou email) depuis l'embed client. */
|
||||||
|
export function contactOptionsOf(contacts: ContactRead[] | undefined): SelectOption[] {
|
||||||
|
return (contacts ?? []).map(c => ({
|
||||||
|
value: c['@id'],
|
||||||
|
label: [c.firstName, c.lastName].filter(Boolean).join(' ') || (c.email ?? c['@id']),
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Liste a une seule option (ou vide) construite depuis un referentiel embarque
|
||||||
|
* (TvaMode / PaymentDelay / PaymentType / Bank) pour alimenter un MalioSelect en
|
||||||
|
* lecture seule. Le libelle vient de l'embed (`label` ou `name`), jamais d'un
|
||||||
|
* `GET` de referentiel — l'affichage reste correct quel que soit le role.
|
||||||
|
*/
|
||||||
|
export function referentialOptionOf(relation: Relation): SelectOption[] {
|
||||||
|
if (!relation || typeof relation === 'string') {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
const label = (relation.label as string | undefined)
|
||||||
|
?? (relation.name as string | undefined)
|
||||||
|
?? relation['@id']
|
||||||
|
return [{ value: relation['@id'], label }]
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Vue d'une adresse (brouillon + options de select propres a l'adresse). */
|
||||||
|
export function mapAddressView(address: AddressRead): AddressView {
|
||||||
|
return {
|
||||||
|
draft: mapAddressToDraft(address),
|
||||||
|
siteOptions: siteOptionsOf(address.sites),
|
||||||
|
categoryOptions: categoryOptionsOf(address.categories),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bouton « Modifier » : visible si l'utilisateur peut editer au moins un onglet
|
||||||
|
* — `manage` (formulaire/onglets metier) OU `accounting.manage` (le role Compta
|
||||||
|
* doit pouvoir ouvrir l'edition pour son onglet Comptabilite). Le readonly fin
|
||||||
|
* par onglet est gere sur l'ecran d'edition (1.12).
|
||||||
|
*/
|
||||||
|
export function canEditClient(canAny: (codes: string[]) => boolean): boolean {
|
||||||
|
return canAny(['commercial.clients.manage', 'commercial.clients.accounting.manage'])
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Bouton « Archiver » : permission archive ET client encore actif. */
|
||||||
|
export function showArchiveAction(can: (code: string) => boolean, isArchived: boolean): boolean {
|
||||||
|
return can('commercial.clients.archive') && !isArchived
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Bouton « Restaurer » : permission archive ET client deja archive. */
|
||||||
|
export function showRestoreAction(can: (code: string) => boolean, isArchived: boolean): boolean {
|
||||||
|
return can('commercial.clients.archive') && isArchived
|
||||||
|
}
|
||||||
@@ -33,6 +33,12 @@ interface ClientRepositoryInterface
|
|||||||
* la liste paginee (ClientProvider) et l'export (ClientExportController)
|
* la liste paginee (ClientProvider) et l'export (ClientExportController)
|
||||||
* partagent strictement la meme logique de selection.
|
* partagent strictement la meme logique de selection.
|
||||||
*
|
*
|
||||||
|
* Contrat = SELECTION uniquement (filtres + tri). Aucun fetch-join to-many :
|
||||||
|
* l'hydratation des collections affichees est une decision de l'appelant
|
||||||
|
* (cf. {@see self::hydrateListCollections()}), pour ne pas imposer le cout
|
||||||
|
* d'un produit cartesien a un consommateur qui ne filtrerait/compterait que
|
||||||
|
* (ERP-100).
|
||||||
|
*
|
||||||
* @param list<string> $categoryCodes
|
* @param list<string> $categoryCodes
|
||||||
* @param list<int> $siteIds
|
* @param list<int> $siteIds
|
||||||
*/
|
*/
|
||||||
@@ -43,4 +49,19 @@ interface ClientRepositoryInterface
|
|||||||
array $siteIds = [],
|
array $siteIds = [],
|
||||||
bool $archivedOnly = false,
|
bool $archivedOnly = false,
|
||||||
): QueryBuilder;
|
): QueryBuilder;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hydrate en lot les collections affichees par le repertoire (categories,
|
||||||
|
* adresses et leurs sites) sur un jeu de clients DEJA charges, via l'identity
|
||||||
|
* map Doctrine (memes instances). A appeler apres une selection bornee (page
|
||||||
|
* courante ou jeu d'export) pour eviter le N+1 a la serialisation, sans
|
||||||
|
* imposer de fetch-join au QueryBuilder de selection (ERP-100).
|
||||||
|
*
|
||||||
|
* Charge les categories et les adresses/sites en DEUX requetes distinctes
|
||||||
|
* (et non un triple fetch-join) pour ne pas multiplier categories x adresses
|
||||||
|
* x sites en un seul produit cartesien.
|
||||||
|
*
|
||||||
|
* @param list<Client> $clients
|
||||||
|
*/
|
||||||
|
public function hydrateListCollections(array $clients): void;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -83,8 +83,13 @@ final class ClientProvider implements ProviderInterface
|
|||||||
// Echappatoire ?pagination=false : collection complete sans Paginator
|
// Echappatoire ?pagination=false : collection complete sans Paginator
|
||||||
// (cf. convention ERP-72 — utile pour un <select> cote front).
|
// (cf. convention ERP-72 — utile pour un <select> cote front).
|
||||||
if (!$this->pagination->isEnabled($operation, $context)) {
|
if (!$this->pagination->isEnabled($operation, $context)) {
|
||||||
// @var list<Client> $result
|
/** @var list<Client> $clients */
|
||||||
return $qb->getQuery()->getResult();
|
$clients = $qb->getQuery()->getResult();
|
||||||
|
// Hydratation batchee des collections affichees (cf. ERP-100) : evite
|
||||||
|
// le N+1 si la serialisation touche categories/sites, sans cartesien.
|
||||||
|
$this->repository->hydrateListCollections($clients);
|
||||||
|
|
||||||
|
return $clients;
|
||||||
}
|
}
|
||||||
|
|
||||||
$limit = $this->pagination->getLimit($operation, $context);
|
$limit = $this->pagination->getLimit($operation, $context);
|
||||||
@@ -93,9 +98,13 @@ final class ClientProvider implements ProviderInterface
|
|||||||
|
|
||||||
$qb->setFirstResult($offset)->setMaxResults($limit);
|
$qb->setFirstResult($offset)->setMaxResults($limit);
|
||||||
|
|
||||||
// fetchJoinCollection: true pour un COUNT correct des que des JOINs
|
// Le QB de selection ne porte plus de fetch-join to-many (ERP-100) : le
|
||||||
// to-many seront ajoutes (sous-collections embarquees en detail).
|
// COUNT est simple, fetchJoinCollection inutile. On materialise la page
|
||||||
return new Paginator(new DoctrinePaginator($qb->getQuery(), fetchJoinCollection: true));
|
// puis on hydrate ses collections en lot (memes entites managees).
|
||||||
|
$paginator = new Paginator(new DoctrinePaginator($qb->getQuery(), fetchJoinCollection: false));
|
||||||
|
$this->repository->hydrateListCollections(iterator_to_array($paginator));
|
||||||
|
|
||||||
|
return $paginator;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -69,6 +69,11 @@ final class ClientExportController
|
|||||||
->getResult()
|
->getResult()
|
||||||
;
|
;
|
||||||
|
|
||||||
|
// Hydratation batchee des categories + adresses/sites (ERP-100) : le QB de
|
||||||
|
// selection ne fetch-join plus, on remplit les collections en 2 requetes
|
||||||
|
// IN bornees plutot que d'hydrater un produit cartesien sur tout le jeu.
|
||||||
|
$this->repository->hydrateListCollections($clients);
|
||||||
|
|
||||||
$withSiren = $this->security->isGranted('commercial.clients.accounting.view');
|
$withSiren = $this->security->isGranted('commercial.clients.accounting.view');
|
||||||
|
|
||||||
$binary = $this->exporter->export(
|
$binary = $this->exporter->export(
|
||||||
|
|||||||
@@ -38,16 +38,12 @@ class DoctrineClientRepository extends ServiceEntityRepository implements Client
|
|||||||
array $siteIds = [],
|
array $siteIds = [],
|
||||||
bool $archivedOnly = false,
|
bool $archivedOnly = false,
|
||||||
): QueryBuilder {
|
): QueryBuilder {
|
||||||
|
// SELECTION uniquement (filtres + tri) : pas de fetch-join to-many ici.
|
||||||
|
// L'hydratation des collections affichees (Catégories / Site(s)) est
|
||||||
|
// deleguee a hydrateListCollections() une fois le jeu borne, pour ne pas
|
||||||
|
// imposer un produit cartesien aux chemins non pagines (export,
|
||||||
|
// ?pagination=false) — ERP-100.
|
||||||
$qb = $this->createQueryBuilder('c')
|
$qb = $this->createQueryBuilder('c')
|
||||||
// Jointures + addSelect pour hydrater en une seule requete les
|
|
||||||
// collections affichees par le Repertoire (colonnes Catégories /
|
|
||||||
// Site(s)) : sans cela, la serialisation declenche un N+1 (une
|
|
||||||
// requete par client, puis par adresse). Le Paginator ORM
|
|
||||||
// (fetchJoinCollection: true, cf. ClientProvider) gere le COUNT
|
|
||||||
// malgre ces jointures to-many.
|
|
||||||
->leftJoin('c.categories', 'cat')->addSelect('cat')
|
|
||||||
->leftJoin('c.addresses', 'addr')->addSelect('addr')
|
|
||||||
->leftJoin('addr.sites', 'site')->addSelect('site')
|
|
||||||
->andWhere('c.deletedAt IS NULL')
|
->andWhere('c.deletedAt IS NULL')
|
||||||
->orderBy('c.companyName', 'ASC')
|
->orderBy('c.companyName', 'ASC')
|
||||||
;
|
;
|
||||||
@@ -66,6 +62,46 @@ class DoctrineClientRepository extends ServiceEntityRepository implements Client
|
|||||||
return $qb;
|
return $qb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function hydrateListCollections(array $clients): void
|
||||||
|
{
|
||||||
|
if ([] === $clients) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ids des clients deja charges (entites managees). On rehydrate leurs
|
||||||
|
// collections via l'identity map : les requetes ci-dessous renvoient les
|
||||||
|
// MEMES instances Client, dont les collections sont alors remplies.
|
||||||
|
$ids = [];
|
||||||
|
foreach ($clients as $client) {
|
||||||
|
$id = $client->getId();
|
||||||
|
if (null !== $id) {
|
||||||
|
$ids[] = $id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ([] === $ids) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1re passe : categories (colonne « Catégories »). Produit c x cat seul.
|
||||||
|
$this->createQueryBuilder('c')
|
||||||
|
->leftJoin('c.categories', 'cat')->addSelect('cat')
|
||||||
|
->where('c.id IN (:ids)')->setParameter('ids', $ids)
|
||||||
|
->getQuery()
|
||||||
|
->getResult()
|
||||||
|
;
|
||||||
|
|
||||||
|
// 2e passe : adresses + sites (colonne « Site(s) », sites portes par les
|
||||||
|
// adresses — RG-1.10). Le join addr -> site reste imbrique mais n'est
|
||||||
|
// plus multiplie par les categories : le cartesien global est casse.
|
||||||
|
$this->createQueryBuilder('c')
|
||||||
|
->leftJoin('c.addresses', 'addr')->addSelect('addr')
|
||||||
|
->leftJoin('addr.sites', 'site')->addSelect('site')
|
||||||
|
->where('c.id IN (:ids)')->setParameter('ids', $ids)
|
||||||
|
->getQuery()
|
||||||
|
->getResult()
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Recherche fuzzy insensible a la casse sur companyName + lastName + email.
|
* Recherche fuzzy insensible a la casse sur companyName + lastName + email.
|
||||||
* Les metacaracteres LIKE (%, _, \) saisis sont echappes pour rester
|
* Les metacaracteres LIKE (%, _, \) saisis sont echappes pour rester
|
||||||
|
|||||||
@@ -6,12 +6,12 @@ namespace App\Shared\Infrastructure\Doctrine;
|
|||||||
|
|
||||||
use App\Shared\Domain\Contract\BlamableInterface;
|
use App\Shared\Domain\Contract\BlamableInterface;
|
||||||
use App\Shared\Domain\Contract\TimestampableInterface;
|
use App\Shared\Domain\Contract\TimestampableInterface;
|
||||||
use DateTimeImmutable;
|
|
||||||
use Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener;
|
use Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener;
|
||||||
use Doctrine\ORM\Event\PrePersistEventArgs;
|
use Doctrine\ORM\Event\PrePersistEventArgs;
|
||||||
use Doctrine\ORM\Event\PreUpdateEventArgs;
|
use Doctrine\ORM\Event\PreUpdateEventArgs;
|
||||||
use Doctrine\ORM\Events;
|
use Doctrine\ORM\Events;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
|
use Symfony\Component\Clock\ClockInterface;
|
||||||
use Symfony\Component\Security\Core\User\UserInterface;
|
use Symfony\Component\Security\Core\User\UserInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -30,12 +30,19 @@ use Symfony\Component\Security\Core\User\UserInterface;
|
|||||||
#[AsDoctrineListener(event: Events::preUpdate)]
|
#[AsDoctrineListener(event: Events::preUpdate)]
|
||||||
final class TimestampableBlamableSubscriber
|
final class TimestampableBlamableSubscriber
|
||||||
{
|
{
|
||||||
public function __construct(private readonly Security $security) {}
|
// L'horloge est injectee (et non un `new DateTimeImmutable()` direct) pour
|
||||||
|
// que les tests puissent figer/avancer le temps de facon deterministe via
|
||||||
|
// ClockSensitiveTrait (cf. ERP-98). En prod, le service `clock` delegue a
|
||||||
|
// l'horloge systeme reelle.
|
||||||
|
public function __construct(
|
||||||
|
private readonly Security $security,
|
||||||
|
private readonly ClockInterface $clock,
|
||||||
|
) {}
|
||||||
|
|
||||||
public function prePersist(PrePersistEventArgs $args): void
|
public function prePersist(PrePersistEventArgs $args): void
|
||||||
{
|
{
|
||||||
$entity = $args->getObject();
|
$entity = $args->getObject();
|
||||||
$now = new DateTimeImmutable();
|
$now = $this->clock->now();
|
||||||
$user = $this->security->getUser();
|
$user = $this->security->getUser();
|
||||||
|
|
||||||
if ($entity instanceof TimestampableInterface) {
|
if ($entity instanceof TimestampableInterface) {
|
||||||
@@ -55,7 +62,7 @@ final class TimestampableBlamableSubscriber
|
|||||||
$user = $this->security->getUser();
|
$user = $this->security->getUser();
|
||||||
|
|
||||||
if ($entity instanceof TimestampableInterface) {
|
if ($entity instanceof TimestampableInterface) {
|
||||||
$entity->setUpdatedAt(new DateTimeImmutable());
|
$entity->setUpdatedAt($this->clock->now());
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($entity instanceof BlamableInterface && $user instanceof UserInterface) {
|
if ($entity instanceof BlamableInterface && $user instanceof UserInterface) {
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ namespace App\Tests\Module\Catalog\Api;
|
|||||||
use App\Module\Catalog\Domain\Entity\Category;
|
use App\Module\Catalog\Domain\Entity\Category;
|
||||||
use App\Module\Core\Domain\Entity\User;
|
use App\Module\Core\Domain\Entity\User;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
|
use Symfony\Component\Clock\ClockInterface;
|
||||||
|
use Symfony\Component\Clock\Test\ClockSensitiveTrait;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tests RG-1.15 / RG-1.16 : le TimestampableBlamableSubscriber doit remplir
|
* Tests RG-1.15 / RG-1.16 : le TimestampableBlamableSubscriber doit remplir
|
||||||
@@ -20,12 +22,39 @@ use DateTimeImmutable;
|
|||||||
* - DELETE : deletedAt rempli ET updatedAt + updatedBy mis a jour (UPDATE
|
* - DELETE : deletedAt rempli ET updatedAt + updatedBy mis a jour (UPDATE
|
||||||
* Doctrine declenche le subscriber)
|
* Doctrine declenche le subscriber)
|
||||||
*
|
*
|
||||||
|
* ERP-98 : ces tests pilotent une horloge mockee (ClockSensitiveTrait) plutot
|
||||||
|
* que de dependre d'un `sleep(1)` reel. Le subscriber lit le service `clock`,
|
||||||
|
* que `self::mockTime()` remplace par un MockClock fige au niveau du process —
|
||||||
|
* ce qui survit aux reboots de kernel entre requetes (POST admin / PATCH bob)
|
||||||
|
* et reste insensible a la derive d'horloge WSL2 a l'origine des flakes.
|
||||||
|
*
|
||||||
* @internal
|
* @internal
|
||||||
*/
|
*/
|
||||||
final class CategoryTimestampableBlamableTest extends AbstractCatalogApiTestCase
|
final class CategoryTimestampableBlamableTest extends AbstractCatalogApiTestCase
|
||||||
{
|
{
|
||||||
|
use ClockSensitiveTrait;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fige l'horloge globale sur l'instant courant DANS LE FUSEAU PHP par
|
||||||
|
* defaut, et la retourne pour la piloter (`sleep()`).
|
||||||
|
*
|
||||||
|
* Subtilite : `self::mockTime()` cree par defaut un MockClock en UTC, or
|
||||||
|
* les colonnes `TIMESTAMP WITHOUT TIME ZONE` round-trippent via le fuseau
|
||||||
|
* PHP (Europe/Paris). Un MockClock UTC decalerait createdAt de l'offset
|
||||||
|
* (2h) au rechargement. On seede donc avec `new DateTimeImmutable()`
|
||||||
|
* (fuseau par defaut), exactement comme le NativeClock en prod.
|
||||||
|
*/
|
||||||
|
private function freezeClock(): ClockInterface
|
||||||
|
{
|
||||||
|
return self::mockTime(new DateTimeImmutable());
|
||||||
|
}
|
||||||
|
|
||||||
public function testCreatedByAdminOnPost(): void
|
public function testCreatedByAdminOnPost(): void
|
||||||
{
|
{
|
||||||
|
// Horloge figee : le subscriber posera createdAt/updatedAt sur cet
|
||||||
|
// instant exact, insensible a tout decalage d'horloge reel.
|
||||||
|
$clock = $this->freezeClock();
|
||||||
|
|
||||||
$type = $this->createCategoryType();
|
$type = $this->createCategoryType();
|
||||||
|
|
||||||
/** @var User $admin */
|
/** @var User $admin */
|
||||||
@@ -33,9 +62,7 @@ final class CategoryTimestampableBlamableTest extends AbstractCatalogApiTestCase
|
|||||||
self::assertNotNull($admin);
|
self::assertNotNull($admin);
|
||||||
$adminId = $admin->getId();
|
$adminId = $admin->getId();
|
||||||
|
|
||||||
$before = new DateTimeImmutable();
|
$before = $clock->now();
|
||||||
// Petit decalage pour absorber les arrondis a la seconde de Postgres.
|
|
||||||
sleep(1);
|
|
||||||
|
|
||||||
$client = $this->createAdminClient();
|
$client = $this->createAdminClient();
|
||||||
$response = $client->request('POST', '/api/categories', [
|
$response = $client->request('POST', '/api/categories', [
|
||||||
@@ -103,6 +130,8 @@ final class CategoryTimestampableBlamableTest extends AbstractCatalogApiTestCase
|
|||||||
|
|
||||||
public function testPatchUpdatesUpdatedFieldsOnly(): void
|
public function testPatchUpdatesUpdatedFieldsOnly(): void
|
||||||
{
|
{
|
||||||
|
$clock = $this->freezeClock();
|
||||||
|
|
||||||
// Etape 1 : creation par admin pour figer createdBy=admin.
|
// Etape 1 : creation par admin pour figer createdBy=admin.
|
||||||
$type = $this->createCategoryType();
|
$type = $this->createCategoryType();
|
||||||
$adminClient = $this->createAdminClient();
|
$adminClient = $this->createAdminClient();
|
||||||
@@ -127,9 +156,9 @@ final class CategoryTimestampableBlamableTest extends AbstractCatalogApiTestCase
|
|||||||
$initialUpdatedAt = $initial->getUpdatedAt();
|
$initialUpdatedAt = $initial->getUpdatedAt();
|
||||||
$initialCreatedById = $initial->getCreatedBy()->getId();
|
$initialCreatedById = $initial->getCreatedBy()->getId();
|
||||||
|
|
||||||
// Decalage temporel suffisant pour que la precision PG (seconde)
|
// Avance deterministe de l'horloge mockee : garantit un updatedAt
|
||||||
// capte un updatedAt different.
|
// strictement superieur cote PG (precision seconde) sans sleep reel.
|
||||||
sleep(1);
|
$clock->sleep(1);
|
||||||
|
|
||||||
// Etape 2 : PATCH par un autre user (manager non-admin) — simule "bob".
|
// Etape 2 : PATCH par un autre user (manager non-admin) — simule "bob".
|
||||||
$manage = $this->createManageClient();
|
$manage = $this->createManageClient();
|
||||||
@@ -180,6 +209,8 @@ final class CategoryTimestampableBlamableTest extends AbstractCatalogApiTestCase
|
|||||||
|
|
||||||
public function testSoftDeleteAlsoUpdatesUpdatedFields(): void
|
public function testSoftDeleteAlsoUpdatesUpdatedFields(): void
|
||||||
{
|
{
|
||||||
|
$clock = $this->freezeClock();
|
||||||
|
|
||||||
// RG-1.16 : le soft delete est un UPDATE Doctrine, donc le subscriber
|
// RG-1.16 : le soft delete est un UPDATE Doctrine, donc le subscriber
|
||||||
// doit aussi avancer updatedAt et updatedBy en plus de poser deletedAt.
|
// doit aussi avancer updatedAt et updatedBy en plus de poser deletedAt.
|
||||||
$type = $this->createCategoryType();
|
$type = $this->createCategoryType();
|
||||||
@@ -202,7 +233,8 @@ final class CategoryTimestampableBlamableTest extends AbstractCatalogApiTestCase
|
|||||||
$initial = $em->getRepository(Category::class)->find($createdId);
|
$initial = $em->getRepository(Category::class)->find($createdId);
|
||||||
$initialUpdatedAt = $initial->getUpdatedAt();
|
$initialUpdatedAt = $initial->getUpdatedAt();
|
||||||
|
|
||||||
sleep(1);
|
// Avance deterministe de l'horloge mockee (cf. testPatch).
|
||||||
|
$clock->sleep(1);
|
||||||
|
|
||||||
// Soft delete par un manager non-admin.
|
// Soft delete par un manager non-admin.
|
||||||
$manage = $this->createManageClient();
|
$manage = $this->createManageClient();
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Tests\Module\Commercial\Api;
|
namespace App\Tests\Module\Commercial\Api;
|
||||||
|
|
||||||
|
use App\Module\Commercial\Domain\Entity\ClientAddress;
|
||||||
|
use App\Module\Sites\Domain\Entity\Site;
|
||||||
use PhpOffice\PhpSpreadsheet\IOFactory;
|
use PhpOffice\PhpSpreadsheet\IOFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -88,6 +90,39 @@ final class ClientExportControllerTest extends AbstractCommercialApiTestCase
|
|||||||
self::assertNotContains('SECTEUR CO', $names);
|
self::assertNotContains('SECTEUR CO', $names);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ERP-100 : depuis le decouplage hydratation/selection, le QueryBuilder de
|
||||||
|
* liste ne fetch-join plus les collections — l'export les recharge en lot via
|
||||||
|
* hydrateListCollections(). Ce test garde que les colonnes « Catégories » et
|
||||||
|
* « Site(s) » restent peuplees (un oubli d'hydratation les rendrait vides
|
||||||
|
* sans erreur).
|
||||||
|
*/
|
||||||
|
public function testExportPopulatesCategoryAndSiteColumns(): void
|
||||||
|
{
|
||||||
|
$client = $this->createAdminClient();
|
||||||
|
$seed = $this->seedClient('Hydrate Co', false, 'DISTRIBUTEUR');
|
||||||
|
|
||||||
|
$em = $this->getEm();
|
||||||
|
$site = $em->getRepository(Site::class)->findOneBy([]);
|
||||||
|
self::assertNotNull($site, 'Aucun site seede : impossible de tester la colonne Site(s).');
|
||||||
|
|
||||||
|
$address = new ClientAddress();
|
||||||
|
$address->setClient($seed);
|
||||||
|
$address->setPostalCode('86100');
|
||||||
|
$address->setCity('Châtellerault');
|
||||||
|
$address->setStreet('1 rue du Test');
|
||||||
|
$address->addSite($site);
|
||||||
|
$em->persist($address);
|
||||||
|
$em->flush();
|
||||||
|
|
||||||
|
$flat = $this->flatten($this->gridFromResponse($client->request('GET', self::EXPORT_URL)->getContent()));
|
||||||
|
|
||||||
|
// Colonne « Catégories » : libelle de la categorie du client (getName()).
|
||||||
|
self::assertStringContainsString('test_cli_cat_distributeur', $flat);
|
||||||
|
// Colonne « Site(s) » : site agrege depuis l'adresse (RG-1.10).
|
||||||
|
self::assertStringContainsString((string) $site->getName(), $flat);
|
||||||
|
}
|
||||||
|
|
||||||
public function testSirenColumnPresentWithAccountingView(): void
|
public function testSirenColumnPresentWithAccountingView(): void
|
||||||
{
|
{
|
||||||
// L'admin bypass le RBAC : il a donc accounting.view -> colonne SIREN.
|
// L'admin bypass le RBAC : il a donc accounting.view -> colonne SIREN.
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ use Doctrine\ORM\Event\PrePersistEventArgs;
|
|||||||
use Doctrine\ORM\Event\PreUpdateEventArgs;
|
use Doctrine\ORM\Event\PreUpdateEventArgs;
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
|
use Symfony\Component\Clock\MockClock;
|
||||||
use Symfony\Component\Security\Core\User\UserInterface;
|
use Symfony\Component\Security\Core\User\UserInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -30,7 +31,7 @@ final class TimestampableBlamableSubscriberTest extends TestCase
|
|||||||
public function testPrePersistWithUser(): void
|
public function testPrePersistWithUser(): void
|
||||||
{
|
{
|
||||||
$user = $this->createStub(UserInterface::class);
|
$user = $this->createStub(UserInterface::class);
|
||||||
$subscriber = new TimestampableBlamableSubscriber($this->securityReturning($user));
|
$subscriber = new TimestampableBlamableSubscriber($this->securityReturning($user), new MockClock());
|
||||||
$entity = new FullAuditableFixture();
|
$entity = new FullAuditableFixture();
|
||||||
|
|
||||||
$subscriber->prePersist($this->prePersistArgs($entity));
|
$subscriber->prePersist($this->prePersistArgs($entity));
|
||||||
@@ -45,7 +46,7 @@ final class TimestampableBlamableSubscriberTest extends TestCase
|
|||||||
|
|
||||||
public function testPrePersistWithoutUser(): void
|
public function testPrePersistWithoutUser(): void
|
||||||
{
|
{
|
||||||
$subscriber = new TimestampableBlamableSubscriber($this->securityReturning(null));
|
$subscriber = new TimestampableBlamableSubscriber($this->securityReturning(null), new MockClock());
|
||||||
$entity = new FullAuditableFixture();
|
$entity = new FullAuditableFixture();
|
||||||
|
|
||||||
$subscriber->prePersist($this->prePersistArgs($entity));
|
$subscriber->prePersist($this->prePersistArgs($entity));
|
||||||
@@ -59,8 +60,13 @@ final class TimestampableBlamableSubscriberTest extends TestCase
|
|||||||
|
|
||||||
public function testPreUpdate(): void
|
public function testPreUpdate(): void
|
||||||
{
|
{
|
||||||
$user = $this->createStub(UserInterface::class);
|
$user = $this->createStub(UserInterface::class);
|
||||||
$subscriber = new TimestampableBlamableSubscriber($this->securityReturning($user));
|
// Horloge figee 1s apres le createdAt simule : updatedAt doit avancer
|
||||||
|
// de facon deterministe, sans dependre de l'heure reelle.
|
||||||
|
$subscriber = new TimestampableBlamableSubscriber(
|
||||||
|
$this->securityReturning($user),
|
||||||
|
new MockClock(new DateTimeImmutable('2020-01-01 10:00:01')),
|
||||||
|
);
|
||||||
|
|
||||||
// On simule une entite deja persistee : createdAt fige dans le passe,
|
// On simule une entite deja persistee : createdAt fige dans le passe,
|
||||||
// createdBy positionne par une creation anterieure.
|
// createdBy positionne par une creation anterieure.
|
||||||
@@ -80,7 +86,7 @@ final class TimestampableBlamableSubscriberTest extends TestCase
|
|||||||
public function testPartialEntityTimestampableOnly(): void
|
public function testPartialEntityTimestampableOnly(): void
|
||||||
{
|
{
|
||||||
$user = $this->createStub(UserInterface::class);
|
$user = $this->createStub(UserInterface::class);
|
||||||
$subscriber = new TimestampableBlamableSubscriber($this->securityReturning($user));
|
$subscriber = new TimestampableBlamableSubscriber($this->securityReturning($user), new MockClock());
|
||||||
$entity = new TimestampableOnlyFixture();
|
$entity = new TimestampableOnlyFixture();
|
||||||
|
|
||||||
// Entite Timestampable mais NON Blamable : seules les dates sont posees,
|
// Entite Timestampable mais NON Blamable : seules les dates sont posees,
|
||||||
|
|||||||
Reference in New Issue
Block a user