feat : Expedition dev back-end WIP

feat : mise à jour du bon de réception WIP
2026-02-04 16:58:55 +01:00 · 2026-02-03 17:34:35 +01:00 · 2026-02-03 17:32:39 +01:00 · 2026-02-03 17:16:47 +01:00 · 2026-02-03 17:16:19 +01:00
33 changed files with 729 additions and 1108 deletions
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PhpCSFixerValidationInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-  </profile>
-</component>
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -15,6 +15,7 @@
  <component name="PhpCSFixer">
    <phpcsfixer_settings>
      <PhpCSFixerConfiguration tool_path="$PROJECT_DIR$/vendor/bin/php-cs-fixer" />
+      <phpcs_fixer_by_interpreter asDefaultInterpreter="true" interpreter_id="990ff521-e6e9-4080-9cc9-228367d597f9" tool_path="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\vendor\bin\php-cs-fixer" timeout="30000" />
    </phpcsfixer_settings>
  </component>
  <component name="PhpCodeSniffer">
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,15 +4,20 @@
    <option name="autoReloadType" value="SELECTIVE" />
  </component>
  <component name="ChangeListManager">
-    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)">
+    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : Expedition dev back-end">
+      <change afterPath="$PROJECT_DIR$/migrations/Version20260204101625.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/migrations/Version20260204102423.php" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/components/reception/reception-bovine-received.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/reception/reception-bovine-received.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/components/reception/reception-form.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/reception/reception-form.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/components/reception/reception-product-received.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/reception/reception-product-received.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/services/dto/reception-data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/services/dto/reception-data.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Entity/Reception.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Reception.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Entity/ReceptionBovine.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/ReceptionBovine.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/makefile" beforeDir="false" afterPath="$PROJECT_DIR$/makefile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/migrations/Version20260203152543.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Address.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Address.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/BovinShipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/BovinShipment.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/BovineTypeShipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/ShipmentType.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Carrier.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Carrier.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Customer.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Customer.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Shipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Shipment.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Vehicle.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Vehicle.php" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -25,18 +30,17 @@
  </component>
  <component name="CopilotPersistence">
    <persistenceIdMap>
-      <entry key="_//wsl.localhost/Ubuntu-24.04/home/kevin/Stage/Ferme" value="381AhnCm9yPeOiWgMObKHhtgv2C" />
+      <entry key="_//wsl.localhost/Ubuntu-24.04/home/matte/Ferme" value="381AhnCm9yPeOiWgMObKHhtgv2C" />
    </persistenceIdMap>
  </component>
  <component name="EmbeddingIndexingInfo">
    <option name="cachedIndexableFilesCount" value="151" />
-    <option name="fileBasedEmbeddingIndicesEnabled" value="true" />
  </component>
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
      <list>
-        <option value="Vue Composition API Component" />
        <option value="TypeScript File" />
+        <option value="Vue Composition API Component" />
      </list>
    </option>
  </component>
@@ -48,6 +52,9 @@
    </option>
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/src/Entity/BovinType.php" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
+  </component>
  <component name="McpProjectServerCommands">
    <commands />
    <urls />
@@ -61,7 +68,7 @@
      </server>
    </servers>
  </component>
-  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="C:/php-8.4.3/php.exe">
+  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="C:/php/php.exe">
    <include_path>
      <path value="$PROJECT_DIR$/vendor/psr/log" />
      <path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
@@ -224,37 +231,49 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.MCP Project settings loaded&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;feat/256-reception-etape-3-bovin&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/home/sroy/Documents/test/Ferme&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;configurable.tailwindcss&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.MCP Project settings loaded": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
+    "com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true",
+    "database.data.extractors.current.export.id": "Comma-separated (CSV)_id",
+    "database.data.extractors.current.id": "Comma-separated (CSV)_id",
+    "git-widget-placeholder": "feat/271-expedition-etape-1",
+    "junie.onboarding.icon.badge.shown": "true",
+    "last_opened_file_path": "//wsl.localhost/Ubuntu-24.04/home/matte/Ferme/frontend/services",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "preferences.keymap",
+    "to.speed.mode.migration.done": "true",
+    "ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
+    "vue.rearranger.settings.migration": "true"
  },
-  &quot;keyToStringList&quot;: {
-    &quot;DatabaseDriversLRU&quot;: [
-      &quot;postgresql&quot;
+  "keyToStringList": {
+    "DatabaseDriversLRU": [
+      "postgresql"
    ],
-    &quot;com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File&quot;: [
-      &quot;TEXT&quot;
+    "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
+      "TEXT"
    ],
-    &quot;vue.recent.templates&quot;: [
-      &quot;Vue Composition API Component&quot;
+    "vue.recent.templates": [
+      "Vue Composition API Component"
    ]
  }
-}</component>
+}]]></component>
  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\frontend\services" />
+      <recent name="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\frontend\services\dto" />
+      <recent name="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\frontend\stores" />
+      <recent name="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\frontend\pages\shipment" />
+      <recent name="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\frontend\components\shipment" />
+    </key>
    <key name="MoveFile.RECENT_KEYS">
      <recent name="\\wsl.localhost\Ubuntu-24.04\home\m-tristan\workspace\Ferme" />
      <recent name="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\templates" />
@@ -296,18 +315,10 @@
      <workItem from="1770055690365" duration="370000" />
      <workItem from="1770056515646" duration="21000" />
      <workItem from="1770102495553" duration="2280000" />
-      <workItem from="1770195604082" duration="90000" />
-      <workItem from="1770195718952" duration="215000" />
-      <workItem from="1770195959162" duration="18915000" />
-      <workItem from="1770274844804" duration="3940000" />
-    </task>
-    <task id="LOCAL-00001" summary="feat : Ajout de pinia, création de la table weight et reception mise en place du système de step pour les receptions (WIP)">
-      <option name="closed" value="true" />
-      <created>1768237763998</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1768237763998</updated>
+      <workItem from="1770125858721" duration="10606000" />
+      <workItem from="1770188542722" duration="1032000" />
+      <workItem from="1770189650316" duration="5784000" />
+      <workItem from="1770195538424" duration="16730000" />
    </task>
    <task id="LOCAL-00002" summary="feat : Ajout de zod, création d'un composant de chargement loading-dots.vue et finalisation du flow d'une reception">
      <option name="closed" value="true" />
@@ -669,31 +680,39 @@
      <option name="project" value="LOCAL" />
      <updated>1769782099473</updated>
    </task>
-    <task id="LOCAL-00047" summary="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)">
+    <task id="LOCAL-00047" summary="feat : mise à jour du bon de réception wip">
      <option name="closed" value="true" />
-      <created>1770131226364</created>
+      <created>1770135384363</created>
      <option name="number" value="00047" />
      <option name="presentableId" value="LOCAL-00047" />
      <option name="project" value="LOCAL" />
-      <updated>1770131226364</updated>
+      <updated>1770135384363</updated>
    </task>
-    <task id="LOCAL-00048" summary="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)">
+    <task id="LOCAL-00048" summary="feat : mise à jour du bon de réception WIP">
      <option name="closed" value="true" />
-      <created>1770206668867</created>
+      <created>1770135408267</created>
      <option name="number" value="00048" />
      <option name="presentableId" value="LOCAL-00048" />
      <option name="project" value="LOCAL" />
-      <updated>1770206668867</updated>
+      <updated>1770135408267</updated>
    </task>
-    <task id="LOCAL-00049" summary="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)">
+    <task id="LOCAL-00049" summary="feat : mise à jour du bon de réception WIP">
      <option name="closed" value="true" />
-      <created>1770217875423</created>
+      <created>1770136359244</created>
      <option name="number" value="00049" />
      <option name="presentableId" value="LOCAL-00049" />
      <option name="project" value="LOCAL" />
-      <updated>1770217875423</updated>
+      <updated>1770136359244</updated>
    </task>
-    <option name="localTasksCounter" value="50" />
+    <task id="LOCAL-00050" summary="feat : mise à jour du bon de réception WIP">
+      <option name="closed" value="true" />
+      <created>1770136475283</created>
+      <option name="number" value="00050" />
+      <option name="presentableId" value="LOCAL-00050" />
+      <option name="project" value="LOCAL" />
+      <updated>1770136475283</updated>
+    </task>
+    <option name="localTasksCounter" value="51" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -743,7 +762,6 @@
    </option>
  </component>
  <component name="VcsManagerConfiguration">
-    <MESSAGE value="fix : correction du path URI pour la création d'un poids dans une réception" />
    <MESSAGE value="feat : Ajout du bundle Monolog pour la gestion des logs" />
    <MESSAGE value="fix : affiche plus détail dans les logs en recette/prod" />
    <MESSAGE value="fix : modification du script de déploiement pour corriger le problème d'écriture des logs de prod" />
@@ -767,16 +785,17 @@
    <MESSAGE value="feat : ajout de colonne pour les Supplier, Address et modification du numéro de réception" />
    <MESSAGE value="feat : ajout de colonne pour les Supplier, Address. Modification du numéro de réception et ajout de fixtures" />
    <MESSAGE value="feat : mise à jour du bon de réception" />
-    <MESSAGE value="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)" />
-    <option name="LAST_COMMIT_MESSAGE" value="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)" />
+    <MESSAGE value="feat : mise à jour du bon de réception wip" />
+    <MESSAGE value="feat : mise à jour du bon de réception WIP" />
+    <option name="LAST_COMMIT_MESSAGE" value="feat : mise à jour du bon de réception WIP" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
-        <line-breakpoint enabled="true" type="php">
-          <url>file://$PROJECT_DIR$/src/Entity/ReceptionPelletBuilding.php</url>
-          <line>6</line>
-          <option name="timeStamp" value="3" />
+        <line-breakpoint enabled="true" type="javascript">
+          <url>file://$PROJECT_DIR$/frontend/stores/reception.ts</url>
+          <properties lambdaOrdinal="-1" />
+          <option name="timeStamp" value="2" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
--- a/frontend/components/reception/reception-bovine-received.vue
+++ b/frontend/components/reception/reception-bovine-received.vue
@@ -1,203 +0,0 @@
-<template>
-    <div
-        v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"
-        class="flex flex-col items-center gap-16">
-        <h1 class="text-4xl uppercase font-bold">Sélection des marchandises réceptionnnées</h1>
-        <div
-            class="flex flex-row gap-8 items-center">
-            <div
-                v-for="type in bovineType"
-                :key="type.id"
-                class="mt-8 flex flex-row mb-2 gap-6">
-                <UiNumberInput
-                    :label="type.label"
-                    :code="type.code"
-                    v-model="bovineQuantities[String(type.id)]"
-                    :placeholder="0"
-                    :min="0"
-                    :max="10"
-                />
-            </div>
-            <div
-                class="mt-8 flex flex-row mb-2 gap-6">
-                <UiNumberInput
-                    label="Autres"
-                    v-model="otherQuantity"
-                />
-            </div>
-        </div>
-        <button
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            @click="goNext"
-        >Peser
-        </button>
-    </div>
-</template>
-<script setup lang="ts">
-import type {BovineTypeData} from "~/services/dto/bovine-type-data";
-import {getBovineTypeList} from "~/services/bovine-type";
-import {MERCHANDISE_TYPE_CODES, RECEPTION_TYPE_CODES} from "~/utils/constants";
-import {useReceptionStore} from '~/stores/reception'
-import {
-    createReceptionBovine,
-    deleteReceptionBovine,
-    getReceptionBovineList,
-    updateReceptionBovine
-} from "~/services/reception-bovine";
-import {computed, onMounted, reactive, ref, watch} from "vue";
-
-const isLoadingBovineType = ref(false)
-const bovineType = ref<BovineTypeData[]>([])
-const receptionStore = useReceptionStore()
-const bovineQuantities = reactive<Record<string, number | null>>({})
-const otherQuantity = ref<number | null>(0)
-const receptionId = computed(() => receptionStore.current?.id ?? null)
-const receptionIri = computed(() =>
-    receptionId.value ? `/api/receptions/${receptionId.value}` : null
-)
-const toast = useToast()
-const nuxtApp = useNuxtApp()
-const i18n = nuxtApp.$i18n as { t: (key: string) => string } |
-    undefined
-const t = (key: string) => (i18n?.t ? String(i18n.t(key)) : key)
-const totalBovineQuantity = computed(() => {
-    const baseTotal = Object.values(bovineQuantities).reduce((sum, value) => {
-        const n = typeof value === 'number' ? value : 0
-        return sum + n
-    }, 0)
-    const other = typeof otherQuantity.value === 'number' ? otherQuantity.value : 0
-    return baseTotal + other
-})
-const loadBovineType = async () => {
-    isLoadingBovineType.value = true
-    try {
-        bovineType.value = await getBovineTypeList()
-    } finally {
-        isLoadingBovineType.value = false
-    }
-}
-
-onMounted(async () => {
-    await loadBovineType()
-})
-
-watch(
-    () => receptionId.value,
-    async (id) => {
-        if (!id || !receptionIri.value) {
-            return
-        }
-
-        const selectionMap: Record<string, number | null> = {}
-        for (const type of bovineType.value) {
-            selectionMap[String(type.id)] = 0
-        }
-
-        const existing = await getReceptionBovineList(receptionIri.value)
-        for (const selection of existing) {
-            const bovineTypeId = String(selection.bovineType.id)
-            selectionMap[bovineTypeId] = selection.quantity ?? 0
-        }
-
-        for (const key of Object.keys(bovineQuantities)) {
-            delete bovineQuantities[key]
-        }
-        Object.assign(bovineQuantities, selectionMap)
-
-        const existingOther = receptionStore.current?.bovineDetail
-        const parsedOther =
-            typeof existingOther === 'string' && existingOther.trim() !== ''
-                ? Number(existingOther)
-                : 0
-        otherQuantity.value = Number.isFinite(parsedOther) ? parsedOther : 0
-    },
-    {immediate: true}
-)
-
-async function syncBovineSelections(receptionIri: string) {
-    const existing = await getReceptionBovineList(receptionIri)
-    const existingMap = new Map<string, { id: number; quantity: number | null }>()
-    for (const selection of existing) {
-        const bovineTypeId = String(selection.bovineType.id)
-        existingMap.set(bovineTypeId, {
-            id: selection.id,
-            quantity: selection.quantity ?? 0
-        })
-    }
-
-    // Supprime les entrées supprimées ou modifiées
-    for (const [bovineTypeId, entry] of existingMap.entries()) {
-        const selectedQuantity = bovineQuantities[bovineTypeId] ?? 0
-        if (!selectedQuantity) {
-            await deleteReceptionBovine(entry.id)
-            existingMap.delete(bovineTypeId)
-            continue
-        }
-
-        if (selectedQuantity !== entry.quantity) {
-            await updateReceptionBovine(entry.id, {quantity: selectedQuantity})
-            existingMap.set(bovineTypeId, {
-                id: entry.id,
-                quantity: selectedQuantity
-            })
-        }
-    }
-
-    // Crée les entrées manquantes
-    for (const [bovineTypeId, quantity] of Object.entries(bovineQuantities)) {
-        if (!quantity) {
-            continue
-        }
-        if (existingMap.has(bovineTypeId)) {
-            // Déjà à jour
-            continue
-        }
-        await createReceptionBovine({
-            reception: receptionIri,
-            bovineType: `/api/bovine_types/${bovineTypeId}`,
-            quantity
-        })
-    }
-}
-const hasNegativeQuantity = computed(() => {
-    const anyNegativeInTypes =
-        Object.values(bovineQuantities).some((value) => {
-            return typeof value === 'number' && value < 0
-        })
-
-    const otherNegative =
-        typeof otherQuantity.value === 'number' &&
-        otherQuantity.value < 0
-
-    return anyNegativeInTypes || otherNegative
-})
-async function goNext() {
-    if (!receptionStore.current || !receptionIri.value) {
-        return
-    }
-    if (hasNegativeQuantity.value) {
-        toast.error({
-            title: 'Erreur',
-            message: ("La quantité de bovins ne peut pas être négative.")
-        })
-        return
-    }
-    // Le 52 à vérifier
-    if (totalBovineQuantity.value > 52) {
-        toast.error({
-            title: 'Erreur',
-            message: ('Le total des bovins ne peut pas dépasser 52.')
-        })
-        return
-    }
-    const nextStep = receptionStore.current.currentStep + 1
-    await syncBovineSelections(receptionIri.value)
-
-    await receptionStore.updateReception(receptionStore.current.id, {
-        merchandiseType: null,
-        merchandiseDetail: null,
-        bovineDetail: otherQuantity.value ? String(otherQuantity.value) : null,
-        currentStep: nextStep
-    })
-}
-</script>
--- a/frontend/components/reception/reception-form.vue
+++ b/frontend/components/reception/reception-form.vue
@@ -142,8 +142,7 @@ import type {DriverData} from '~/services/dto/driver-data'
 import {getDriverList} from '~/services/driver'
 import type {VehicleData} from '~/services/dto/vehicle-data'
 import {getVehicleList} from '~/services/vehicle'
-import {RECEPTION_TYPE_CODES, SUPLLIER_CODE} from "~/utils/constants";
-import {deleteReceptionBovine, getReceptionBovineList} from "~/services/reception-bovine";
+import {SUPLLIER_CODE} from "~/utils/constants";

 type ReceptionFormData = {
    licensePlate: string
@@ -222,16 +221,6 @@ const filteredVehicles = computed<VehicleData[]>(() => {
            (!form.truckId || String(vehicle.truck?.id) === form.truckId)
    )
 })
-const selectedReceptionType = computed(() =>
-    receptionTypes.value.find((type) => String(type.id) === form.receptionTypeId) ?? null
-)
-
-const clearReceptionBovines = async (receptionIri: string) => {
-    const existing = await getReceptionBovineList(receptionIri)
-    for (const selection of existing) {
-        await deleteReceptionBovine(selection.id)
-    }
-}

 // Hydrate le formulaire depuis la réception en cours
 watch(
@@ -471,9 +460,6 @@ async function validate() {
    const normalizedTruckId = form.truckId.trim()
    const normalizedCarrierId = form.carrierId.trim()
    const normalizedDriverId = form.driverId.trim()
-    const previousTypeCode = receptionStore.current.receptionType?.code ?? null
-    const nextTypeCode = selectedReceptionType.value?.code ?? null
-    const receptionIri = `/api/receptions/${receptionStore.current.id}`
    const receptionTypeIri = normalizedReceptionTypeId
        ? `/api/reception_types/${normalizedReceptionTypeId}`
        : null
@@ -522,12 +508,7 @@ async function validate() {
        }
        return
    }
-    if (
-        previousTypeCode === RECEPTION_TYPE_CODES.BOVINS &&
-        nextTypeCode === RECEPTION_TYPE_CODES.MERCHANDISES
-    ) {
-        await clearReceptionBovines(receptionIri)
-    }
+
    const nextStep = receptionStore.current.currentStep + 1
    await receptionStore.updateReception(receptionStore.current.id, {
        currentStep: nextStep,
--- a/frontend/components/reception/reception-product-received.vue
+++ b/frontend/components/reception/reception-product-received.vue
@@ -1,10 +1,10 @@
 <template>
    <div class="flex flex-col items-center gap-16">
-        <!--        @TODO voir pour séparer dans un composant au moment de l'implémentation des Bovins      -->
+<!--        @TODO voir pour séparer dans un composant au moment de l'implémentation des Bovins      -->
        <div
            v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"
            class="flex flex-col gap-16 items-center w-full">
-            <h1 class="text-4xl uppercase font-bold">Sélection des marchandises réceptionnnées</h1>
+            <h1 class="text-4xl uppercase font-bold">Sélectionner des marchandises réceptionnnées</h1>
            <UiSelect
                id="merchandise-type"
                v-model="selectedMerchandiseTypeId"
@@ -12,6 +12,7 @@
                :options="merchandiseTypes.map((type) => ({ value: String(type.id), label: type.label }))"
                wrapper-class="w-[550px]"
            />
+
            <div
                v-if="selectedMerchandiseTypeId && isAutres"
                class="flex flex-col w-full max-w-[550px]"
@@ -68,27 +69,25 @@
        <button
            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
            @click="goNext"
-        >Peser
-        </button>
+        >Peser</button>
    </div>
 </template>

 <script setup lang="ts">
-import {computed, onMounted, ref} from 'vue'
-import {getBuildingList} from '~/services/building'
-import {getMerchandiseTypeList} from '~/services/merchandise-type'
-import type {MerchandiseTypeData} from '~/services/dto/merchandise-type-data'
-import type {BuildingData} from '~/services/dto/building-data'
-import type {PelletTypeData} from '~/services/dto/pellet-type-data'
-import {getPelletTypeList} from '~/services/pellet-type'
+import { computed, onMounted, ref } from 'vue'
+import { getBuildingList } from '~/services/building'
+import { getMerchandiseTypeList } from '~/services/merchandise-type'
+import type { MerchandiseTypeData } from '~/services/dto/merchandise-type-data'
+import type { BuildingData } from '~/services/dto/building-data'
+import type { PelletTypeData } from '~/services/dto/pellet-type-data'
+import { getPelletTypeList } from '~/services/pellet-type'
 import {
    createReceptionPelletBuilding,
    deleteReceptionPelletBuilding,
    getReceptionPelletBuildingList
 } from '~/services/reception-pellet-building'
-import {useReceptionStore} from '~/stores/reception'
-import {MERCHANDISE_TYPE_CODES, RECEPTION_TYPE_CODES} from '~/utils/constants'
-import ReceptionBovineReceived from "~/components/reception/reception-bovine-received.vue";
+import { useReceptionStore } from '~/stores/reception'
+import { MERCHANDISE_TYPE_CODES, RECEPTION_TYPE_CODES } from '~/utils/constants'

 const receptionStore = useReceptionStore()
 const merchandiseTypes = ref<MerchandiseTypeData[]>([])
@@ -99,7 +98,6 @@ const selectedBuildingIds = ref<string[]>([])
 const selectedPelletBuildingIds = ref<Record<string, string[]>>({})
 const merchandiseDetail = ref('')

-
 // Extrait l'ID d'une relation depuis un IRI ou un objet complet.
 const getRelationId = (value: unknown): string | null => {
    if (!value) {
@@ -175,6 +173,7 @@ onMounted(async () => {
    }
    selectedPelletBuildingIds.value = selectionMap
 })
+
 // Enregistre les sélections et passe à l'étape suivante
 async function goNext() {
    if (!receptionStore.current) {
@@ -192,8 +191,6 @@ async function goNext() {
        buildings: isGranule.value
            ? []
            : selectedBuildingIds.value.map((id) => `/api/buildings/${id}`),
-        bovineDetail: null,
-        bovinesTypes: null,
        currentStep: nextStep
    })

@@ -211,6 +208,7 @@ async function clearPelletSelections(receptionIri: string) {
        await deleteReceptionPelletBuilding(selection.id)
    }
 }
+
 // Synchronise les associations granulés/bâtiments avec l'état du formulaire
 async function syncPelletSelections(receptionIri: string) {
    const existing = await getReceptionPelletBuildingList(receptionIri)
@@ -229,7 +227,7 @@ async function syncPelletSelections(receptionIri: string) {
    const desiredEntries: Array<{ pelletTypeId: string; buildingId: string }> = []
    for (const [pelletTypeId, buildingIds] of Object.entries(selectedPelletBuildingIds.value)) {
        for (const buildingId of buildingIds) {
-            desiredEntries.push({pelletTypeId, buildingId})
+            desiredEntries.push({ pelletTypeId, buildingId })
        }
    }

--- a/frontend/components/ui/UiNumberInput.vue
+++ b/frontend/components/ui/UiNumberInput.vue
@@ -1,84 +0,0 @@
-<template>
-    <div :class="['flex flex-row items-center gap-2', wrapperClass]">
-        <label
-            v-if="label"
-            :for="id"
-            class="text-xl text-bold flex items-center gap-2"
-            :class="labelClass"
-        >
-            <span
-                v-if="label">
-                {{ label }}
-            </span>
-            <span
-                v-if="code" class="text-neutral-600">
-                ({{ code }})
-            </span>
-        </label>
-        <input
-            :id="id"
-            type="number"
-            :value="modelValue ?? ''"
-            :min="min"
-            :max="max"
-            :step="step"
-            :disabled="disabled"
-            v-bind="attrs"
-            class="border-b border-black text-xl bg-transparent w-48"
-            :class="[
-                isEmpty ? 'text-neutral-400' : 'text-black',
-                disabled ? 'cursor-not-allowed' : 'cursor-text',
-                inputClass
-            ]"
-            @input="onInput"
-        >
-    </div>
-</template>
-
-<script setup lang="ts">
-import {computed, useAttrs} from 'vue'
-
-defineOptions({inheritAttrs: false})
-
-const props = withDefaults(
-    defineProps<{
-        id?: string
-        label?: string
-        code?: string
-        modelValue: number | string | null | undefined
-        min?: number | string
-        max?: number | string
-        step?: number | string
-        disabled?: boolean
-        wrapperClass?: string
-        labelClass?: string
-        inputClass?: string
-    }>(),
-    {
-        min: undefined,
-        max: undefined,
-        step: undefined,
-        disabled: false,
-        wrapperClass: '',
-        labelClass: '',
-        inputClass: ''
-    }
-)
-
-const emit = defineEmits<{
-    (event: 'update:modelValue', value: number | null): void
-}>()
-
-const attrs = useAttrs()
-const isEmpty = computed(() => props.modelValue === null || props.modelValue === undefined || props.modelValue === '')
-
-const onInput = (event: Event) => {
-    const target = event.target as HTMLInputElement
-    if (target.value === '') {
-        emit('update:modelValue', null)
-        return
-    }
-    const numeric = Number(target.value)
-    emit('update:modelValue', Number.isNaN(numeric) ? null : numeric)
-}
-</script>
--- a/frontend/i18n/locales/fr.json
+++ b/frontend/i18n/locales/fr.json
@@ -1,72 +1,64 @@
 {
-    "errors": {
-        "http": {
-            "get": "Impossible de récupérer les données.",
-            "post": "Impossible de créer la ressource.",
-            "put": "Impossible de mettre à jour la ressource.",
-            "patch": "Impossible de mettre à jour la ressource.",
-            "delete": "Impossible de supprimer la ressource."
-        },
-        "reception": {
-            "list": "Impossible de récupérer la liste des réceptions.",
-            "fetch": "Impossible de récupérer la réception.",
-            "create": "Impossible de créer la réception.",
-            "update": "Impossible de mettre à jour la réception.",
-            "weigh": "Impossible de récupérer la pesée."
-        },
-        "receptionType": {
-            "list": "Impossible de récupérer la liste des types de réception."
-        },
-        "merchandiseType": {
-            "list": "Impossible de récupérer la liste des types de marchandises."
-        },
-        "building": {
-            "list": "Impossible de récupérer la liste des bâtiments."
-        },
-        "pelletType": {
-            "list": "Impossible de récupérer la liste des types de granulés."
-        },
-        "receptionPelletBuilding": {
-            "list": "Impossible de récupérer la liste des dépôts de granulés.",
-            "create": "Impossible d'enregistrer le dépôt de granulés.",
-            "delete": "Impossible de supprimer le dépôt de granulés."
-        },
-        "receptionBovine": {
-            "list": "Impossible de récupérer la liste des bovins de la réception.",
-            "create": "Impossible d'enregistrer le bovin.",
-            "delete": "Impossible de supprimer le bovin."
-        },
-        "supplier": {
-            "list": "Impossible de récupérer la liste des fournisseurs."
-        },
-        "truck": {
-            "list": "Impossible de récupérer la liste des camions."
-        },
-        "bovin": {
-            "list": "Impossible de récupérer la liste des races de bovins."
-        },
-        "carrier": {
-            "list": "Impossible de récupérer la liste des transporteurs."
-        },
-        "driver": {
-            "list": "Impossible de récupérer la liste des chauffeurs."
-        },
-        "vehicle": {
-            "list": "Impossible de récupérer la liste des immatriculations."
-        },
-        "auth": {
-            "login": "Identifiants invalides.",
-            "users": "Impossible de récupérer les utilisateurs.",
-            "logout": "Impossible de se déconnecter."
-        }
+  "errors": {
+    "http": {
+      "get": "Impossible de récupérer les données.",
+      "post": "Impossible de créer la ressource.",
+      "put": "Impossible de mettre à jour la ressource.",
+      "patch": "Impossible de mettre à jour la ressource.",
+      "delete": "Impossible de supprimer la ressource."
    },
-    "success": {
-        "reception": {
-            "update": "Réception mise à jour avec succès."
-        },
-        "auth": {
-            "login": "Connexion réussie.",
-            "logout": "Déconnexion réussie."
-        }
+    "reception": {
+      "list": "Impossible de récupérer la liste des réceptions.",
+      "fetch": "Impossible de récupérer la réception.",
+      "create": "Impossible de créer la réception.",
+      "update": "Impossible de mettre à jour la réception.",
+      "weigh": "Impossible de récupérer la pesée."
+    },
+    "receptionType": {
+      "list": "Impossible de récupérer la liste des types de réception."
+    },
+    "merchandiseType": {
+      "list": "Impossible de récupérer la liste des types de marchandises."
+    },
+    "building": {
+      "list": "Impossible de récupérer la liste des bâtiments."
+    },
+    "pelletType": {
+      "list": "Impossible de récupérer la liste des types de granulés."
+    },
+    "receptionPelletBuilding": {
+      "list": "Impossible de récupérer la liste des dépôts de granulés.",
+      "create": "Impossible d'enregistrer le dépôt de granulés.",
+      "delete": "Impossible de supprimer le dépôt de granulés."
+    },
+    "supplier": {
+      "list": "Impossible de récupérer la liste des fournisseurs."
+    },
+    "truck": {
+      "list": "Impossible de récupérer la liste des camions."
+    },
+    "carrier": {
+      "list": "Impossible de récupérer la liste des transporteurs."
+    },
+    "driver": {
+      "list": "Impossible de récupérer la liste des chauffeurs."
+    },
+    "vehicle": {
+      "list": "Impossible de récupérer la liste des immatriculations."
+    },
+    "auth": {
+      "login": "Identifiants invalides.",
+      "users": "Impossible de récupérer les utilisateurs.",
+      "logout": "Impossible de se déconnecter."
    }
+  },
+  "success": {
+    "reception": {
+      "update": "Réception mise à jour avec succès."
+    },
+    "auth": {
+      "login": "Connexion réussie.",
+      "logout": "Déconnexion réussie."
+    }
+  }
 }
--- a/frontend/pages/reception/[[id]].vue
+++ b/frontend/pages/reception/[[id]].vue
@@ -16,12 +16,7 @@
        </div>
        <ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
        <ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>
-        <ReceptionProductReceived
-            v-if="storeReception?.currentStep === 2 &&
-            receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"/>
-        <ReceptionBovineReceived
-            v-if="storeReception?.currentStep === 2 &&
-            receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"/>
+        <ReceptionProductReceived v-if="storeReception?.currentStep === 2"/>
        <ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
    </div>
 </template>
@@ -30,7 +25,6 @@
 import {useReceptionStore} from '~/stores/reception'
 import {storeToRefs} from 'pinia'
 import {RECEPTION_STEP_LABELS} from '~/constants/steps'
-import {RECEPTION_TYPE_CODES} from "~/utils/constants";

 const route = useRoute()
 const router = useRouter()
--- a/frontend/services/bovine-type.ts
+++ b/frontend/services/bovine-type.ts
@@ -1,23 +0,0 @@
-import { useApi } from '~/composables/useApi'
-import type {BovineTypeData} from "~/services/dto/bovine-type-data";
-
-export type BovineTypeListResponse =
-    | BovineTypeData[]
-    | { 'hydra:member'?: BovineTypeData[] }
-
-export async function getBovineTypeList(): Promise<BovineTypeData[]> {
-    const api = useApi()
-    const response = await api.get<BovineTypeListResponse>('bovine_types', {}, {
-        toastErrorKey: 'errors.bovin.list'
-    })
-
-    if (Array.isArray(response)) {
-        return response
-    }
-
-    if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
-        return response['hydra:member']
-    }
-
-    return []
-}
--- a/frontend/services/dto/bovine-type-data.ts
+++ b/frontend/services/dto/bovine-type-data.ts
@@ -1,5 +0,0 @@
-export interface BovineTypeData{
-    id: number
-    label: string
-    code: string
-}
--- a/frontend/services/dto/reception-bovine-data.ts
+++ b/frontend/services/dto/reception-bovine-data.ts
@@ -1,8 +0,0 @@
-import type {BovineTypeData} from "~/services/dto/bovine-type-data";
-
-export interface ReceptionBovineTypeData{
-    id: number
-    quantity : number
-    reception?: string
-    bovineType: BovineTypeData
-}
--- a/frontend/services/dto/reception-data.ts
+++ b/frontend/services/dto/reception-data.ts
@@ -8,7 +8,6 @@ import type { AddressData } from '~/services/dto/address-data'
 import type { TruckData } from '~/services/dto/truck-data'
 import type { CarrierData } from '~/services/dto/carrier-data'
 import type { DriverData } from '~/services/dto/driver-data'
-import type {BovineTypeData} from "~/services/dto/bovine-type-data";

 export interface ReceptionData {
    id: number
@@ -21,9 +20,7 @@ export interface ReceptionData {
    receptionType?: ReceptionTypeData | null
    merchandiseType?: MerchandiseTypeData | null
    merchandiseDetail?: string | null
-    bovineDetail?: string | null
    buildings?: BuildingData[] | null
-    bovinesTypes?: BovineTypeData[] | null
    pelletBuildings?: ReceptionPelletBuildingData[] | null
    user?: UserData | null
    supplier?: SupplierData | null
@@ -49,9 +46,7 @@ export type ReceptionPayload = {
    receptionType?: string | null
    merchandiseType?: string | null
    merchandiseDetail?: string | null
-    bovineDetail?: string | null
    buildings?: string[] | null
-    bovinesTypes?: string[] | null
    user?: string | null
    supplier?: string | null
    address?: string | null
--- a/frontend/services/reception-bovine.ts
+++ b/frontend/services/reception-bovine.ts
@@ -1,59 +0,0 @@
-import { useApi } from '~/composables/useApi'
-import type { ReceptionBovineTypeData } from '~/services/dto/reception-bovine-data'
-
-export type ReceptionBovineListResponse =
-    | ReceptionBovineTypeData[]
-    | { 'hydra:member'?: ReceptionBovineTypeData[] }
-
-export type ReceptionBovinePayload = {
-    quantity: number
-    reception: string
-    bovineType: string
-}
-
-export async function getReceptionBovineList(
-    receptionIri: string
-): Promise<ReceptionBovineTypeData[]> {
-    const api = useApi()
-    const response = await api.get<ReceptionBovineListResponse>(
-        'reception_bovines',
-        { reception: receptionIri },
-        {
-            toastErrorKey: 'errors.receptionBovine.list'
-        }
-    )
-
-    if (Array.isArray(response)) {
-        return response
-    }
-    if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
-        return response['hydra:member']
-    }
-    return []
-}
-
-export async function createReceptionBovine(
-    payload: ReceptionBovinePayload
-): Promise<ReceptionBovineTypeData> {
-    const api = useApi()
-    return api.post<ReceptionBovineTypeData>('reception_bovines', payload, {
-        toastErrorKey: 'errors.receptionBovine.create'
-    })
-}
-
-export async function deleteReceptionBovine(id: number): Promise<void> {
-    const api = useApi()
-    await api.delete<void>(`reception_bovines/${id}`, {}, {
-        toastErrorKey: 'errors.receptionBovine.delete'
-    })
-}
-
-export async function updateReceptionBovine(
-    id: number,
-    payload: Partial<ReceptionBovinePayload>
-): Promise<ReceptionBovineTypeData> {
-    const api = useApi()
-    return api.patch<ReceptionBovineTypeData>(`reception_bovines/${id}`, payload, {
-        toastErrorKey: 'errors.receptionBovine.update'
-    })
-}
--- a/frontend/utils/constants.ts
+++ b/frontend/utils/constants.ts
@@ -1,6 +1,5 @@
 export const RECEPTION_TYPE_CODES = {
-    MERCHANDISES: 'MARCHANDISES',
-    BOVINS: 'BOVINS'
+    MERCHANDISES: 'MARCHANDISES'
 } as const

 export const MERCHANDISE_TYPE_CODES = {
--- a/2
+++ b/2
@@ -79,7 +79,7 @@ migration-migrate:
 	$(SYMFONY_CONSOLE) --no-interaction doctrine:migrations:migrate --allow-no-migration

 fixtures:
-	$(SYMFONY_CONSOLE) doctrine:fixtures:load
+	$(SYMFONY_CONSOLE) --no-interaction doctrine:fixtures:load

 # Attention, supprime votre bdd local
 db-reset:
--- a/migrations/Version20260203123833.php
+++ b/migrations/Version20260203123833.php
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20260203123833 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TABLE bovine_type (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, label VARCHAR(120) NOT NULL, code VARCHAR(50) NOT NULL, PRIMARY KEY (id))');
-        $this->addSql('CREATE TABLE reception_bovine (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, quantity INT NOT NULL, reception_id INT DEFAULT NULL, bovine_type_id INT NOT NULL, PRIMARY KEY (id))');
-        $this->addSql('CREATE INDEX IDX_636B9DB97C14DF52 ON reception_bovine (reception_id)');
-        $this->addSql('CREATE INDEX IDX_636B9DB97899F32E ON reception_bovine (bovine_type_id)');
-        $this->addSql('ALTER TABLE reception_bovine ADD CONSTRAINT FK_636B9DB97C14DF52 FOREIGN KEY (reception_id) REFERENCES reception (id)');
-        $this->addSql('ALTER TABLE reception_bovine ADD CONSTRAINT FK_636B9DB97899F32E FOREIGN KEY (bovine_type_id) REFERENCES bovine_type (id) NOT DEFERRABLE');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE reception_bovine DROP CONSTRAINT FK_636B9DB97C14DF52');
-        $this->addSql('ALTER TABLE reception_bovine DROP CONSTRAINT FK_636B9DB97899F32E');
-        $this->addSql('DROP TABLE bovine_type');
-        $this->addSql('DROP TABLE reception_bovine');
-    }
-}
--- a/migrations/Version20260204101625.php
+++ b/migrations/Version20260204101625.php
@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260204101625 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE TABLE bovin_shipment (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, nb_bovin_send INT NOT NULL, shipment_id INT DEFAULT NULL, shipment_type_id INT DEFAULT NULL, PRIMARY KEY (id))');
+        $this->addSql('CREATE INDEX IDX_7049F4507BE036FC ON bovin_shipment (shipment_id)');
+        $this->addSql('CREATE INDEX IDX_7049F4502EE48A36 ON bovin_shipment (shipment_type_id)');
+        $this->addSql('CREATE TABLE customer (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, label VARCHAR(255) NOT NULL, code VARCHAR(255) NOT NULL, PRIMARY KEY (id))');
+        $this->addSql('CREATE TABLE customer_address (customer_id INT NOT NULL, address_id INT NOT NULL, PRIMARY KEY (customer_id, address_id))');
+        $this->addSql('CREATE INDEX IDX_1193CB3F9395C3F3 ON customer_address (customer_id)');
+        $this->addSql('CREATE INDEX IDX_1193CB3FF5B7AF75 ON customer_address (address_id)');
+        $this->addSql('CREATE TABLE shipment (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, licence_plate VARCHAR(255) NOT NULL, identification_number VARCHAR(20) DEFAULT NULL, current_step INT DEFAULT 0 NOT NULL, is_valid BOOLEAN NOT NULL, shipment_date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, carrier_id INT DEFAULT NULL, vehicle_id INT DEFAULT NULL, truck_id INT DEFAULT NULL, customer_id INT DEFAULT NULL, PRIMARY KEY (id))');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_2CB20DC347639A5 ON shipment (identification_number)');
+        $this->addSql('CREATE INDEX IDX_2CB20DC21DFC797 ON shipment (carrier_id)');
+        $this->addSql('CREATE INDEX IDX_2CB20DC545317D1 ON shipment (vehicle_id)');
+        $this->addSql('CREATE INDEX IDX_2CB20DCC6957CCE ON shipment (truck_id)');
+        $this->addSql('CREATE INDEX IDX_2CB20DC9395C3F3 ON shipment (customer_id)');
+        $this->addSql('CREATE TABLE shipment_type (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, label VARCHAR(255) NOT NULL, code VARCHAR(255) NOT NULL, PRIMARY KEY (id))');
+        $this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT FK_7049F4507BE036FC FOREIGN KEY (shipment_id) REFERENCES shipment (id)');
+        $this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT FK_7049F4502EE48A36 FOREIGN KEY (shipment_type_id) REFERENCES shipment_type (id)');
+        $this->addSql('ALTER TABLE customer_address ADD CONSTRAINT FK_1193CB3F9395C3F3 FOREIGN KEY (customer_id) REFERENCES customer (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE customer_address ADD CONSTRAINT FK_1193CB3FF5B7AF75 FOREIGN KEY (address_id) REFERENCES address (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC21DFC797 FOREIGN KEY (carrier_id) REFERENCES carrier (id) NOT DEFERRABLE');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC545317D1 FOREIGN KEY (vehicle_id) REFERENCES vehicle (id)');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DCC6957CCE FOREIGN KEY (truck_id) REFERENCES truck (id) NOT DEFERRABLE');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC9395C3F3 FOREIGN KEY (customer_id) REFERENCES customer (id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT FK_7049F4507BE036FC');
+        $this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT FK_7049F4502EE48A36');
+        $this->addSql('ALTER TABLE customer_address DROP CONSTRAINT FK_1193CB3F9395C3F3');
+        $this->addSql('ALTER TABLE customer_address DROP CONSTRAINT FK_1193CB3FF5B7AF75');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC21DFC797');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC545317D1');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DCC6957CCE');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC9395C3F3');
+        $this->addSql('DROP TABLE bovin_shipment');
+        $this->addSql('DROP TABLE customer');
+        $this->addSql('DROP TABLE customer_address');
+        $this->addSql('DROP TABLE shipment');
+        $this->addSql('DROP TABLE shipment_type');
+    }
+}
--- a/migrations/Version20260204102423.php
+++ b/migrations/Version20260204102423.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260204102423 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT fk_2cb20dc545317d1');
+        $this->addSql('DROP INDEX idx_2cb20dc545317d1');
+        $this->addSql('ALTER TABLE shipment DROP vehicle_id');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE shipment ADD vehicle_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT fk_2cb20dc545317d1 FOREIGN KEY (vehicle_id) REFERENCES vehicle (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX idx_2cb20dc545317d1 ON shipment (vehicle_id)');
+    }
+}
--- a/migrations/Version20260204141406.php
+++ b/migrations/Version20260204141406.php
@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20260204141406 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE reception_bovine ALTER quantity SET DEFAULT 0');
-        $this->addSql('CREATE UNIQUE INDEX uniq_reception_bovine_type ON reception_bovine (reception_id, bovine_type_id)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('DROP INDEX uniq_reception_bovine_type');
-        $this->addSql('ALTER TABLE reception_bovine ALTER quantity DROP DEFAULT');
-    }
-}
--- a/migrations/Version20260205070819.php
+++ b/migrations/Version20260205070819.php
@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20260205070819 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE reception ADD bovine_detail VARCHAR(255) DEFAULT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE reception DROP bovine_detail');
-    }
-}
--- a/src/Entity/Address.php
+++ b/src/Entity/Address.php
@@ -35,27 +35,27 @@ class Address
    private ?int $id = null;

    #[ORM\Column(length: 120)]
-    #[Groups(['address:read', 'supplier:read', 'reception:read'])]
+    #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read'])]
    private string $label = '';

    #[ORM\Column(length: 180)]
-    #[Groups(['address:read', 'supplier:read', 'reception:read'])]
+    #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read'])]
    private string $street = '';

    #[ORM\Column(name: 'street2', length: 180, nullable: true)]
-    #[Groups(['address:read', 'supplier:read', 'reception:read'])]
+    #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read'])]
    private ?string $street2 = null;

    #[ORM\Column(name: 'postal_code', length: 20)]
-    #[Groups(['address:read', 'supplier:read', 'reception:read'])]
+    #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read'])]
    private string $postalCode = '';

    #[ORM\Column(length: 120)]
-    #[Groups(['address:read', 'supplier:read', 'reception:read'])]
+    #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read'])]
    private string $city = '';

    #[ORM\Column(name: 'country_code', length: 2)]
-    #[Groups(['address:read', 'supplier:read'])]
+    #[Groups(['address:read', 'supplier:read', 'customer:read'])]
    private string $countryCode = '';

    /**
--- a/src/Entity/BovinShipment.php
+++ b/src/Entity/BovinShipment.php
@@ -0,0 +1,101 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\GetCollection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'bovin_shipment')]
+#[ApiResource(
+    operations: [
+        new Get(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['bovin-shipment:read']],
+        ),
+        new GetCollection(
+            normalizationContext: ['groups' => ['bovin-shipment:read']],
+        ),
+
+        //        new Get(
+        //            uriTemplate: '/receptions/weigh',
+        //            openapi: new OpenApiOperation(
+        //                summary: 'Fetch the current weight reading',
+        //                description: 'Queries the pont-bascule and returns the weight data.',
+        //            ),
+        //            normalizationContext: ['groups' => ['reception:weigh:read']],
+        //            output: PontBasculeReading::class,
+        //            provider: ReceptionWeighingProvider::class,
+        //        ),
+        //        new Get(
+        //            uriTemplate: '/receptions/{id}/receipt',
+        //            requirements: ['id' => '\d+'],
+        //            openapi: new OpenApiOperation(
+        //                summary: 'Render a reception receipt',
+        //                description: 'Returns a PDF receipt for the reception.',
+        //            ),
+        //            output: false,
+        //            provider: ReceptionReceiptProvider::class,
+        //        ),
+    ],
+)]
+class BovinShipment
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    #[Groups(['shipment:read', 'bovine-shipment:read'])]
+    private ?int $id = null;
+
+    #[ORM\ManyToOne(inversedBy: 'shipment_types')]
+    #[Groups(['bovine-shipment:read'])]
+    private ?Shipment $shipment = null;
+
+    #[ORM\ManyToOne]
+    #[Groups(['shipment:read', 'bovine-shipment:read'])]
+    private ?ShipmentType $shipmentType = null;
+
+    #[ORM\Column]
+    #[Groups(['shipment:read', 'bovine-shipment:read'])]
+    private ?int $nbBovinSend = null;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getShipment(): ?Shipment
+    {
+        return $this->shipment;
+    }
+
+    public function setShipment(?Shipment $shipment): void
+    {
+        $this->shipment = $shipment;
+    }
+
+    public function getShipmentType(): ?ShipmentType
+    {
+        return $this->shipmentType;
+    }
+
+    public function setShipmentType(?ShipmentType $shipmentType): void
+    {
+        $this->shipmentType = $shipmentType;
+    }
+
+    public function getNbBovinSend(): ?int
+    {
+        return $this->nbBovinSend;
+    }
+
+    public function setNbBovinSend(?int $nbBovinSend): void
+    {
+        $this->nbBovinSend = $nbBovinSend;
+    }
+}
--- a/src/Entity/Carrier.php
+++ b/src/Entity/Carrier.php
@@ -29,15 +29,15 @@ class Carrier
    #[ORM\Id]
    #[ORM\GeneratedValue]
    #[ORM\Column]
-    #[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read'])]
+    #[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read', 'shipment:read'])]
    private ?int $id = null;

    #[ORM\Column(length: 180)]
-    #[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read'])]
+    #[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read', 'shipment:read'])]
    private string $name = '';

    #[ORM\Column(length: 30, nullable: true)]
-    #[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read'])]
+    #[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read', 'shipment:read'])]
    private ?string $code = null;

    public function getId(): ?int
--- a/src/Entity/Customer.php
+++ b/src/Entity/Customer.php
@@ -0,0 +1,94 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\GetCollection;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'customer')]
+#[ApiResource(
+    operations: [
+        new Get(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['customer:read']],
+        ),
+        new GetCollection(
+            normalizationContext: ['groups' => ['customer:read']],
+        ),
+    ],
+    security: "is_granted('ROLE_USER')",
+)]
+class Customer
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    #[Groups(['shipment:read', 'customer:read'])]
+    private ?int $id = null;
+
+    #[ORM\Column(length: 255)]
+    #[Groups(['customer:read', 'shipment:read'])]
+    private ?string $label = null;
+
+    #[ORM\Column(length: 255)]
+    #[Groups(['customer:read', 'shipment:read'])]
+    private ?string $code = null;
+
+    /**
+     * @var Collection<int, Address>
+     */
+    #[ORM\ManyToMany(targetEntity: Address::class, inversedBy: 'customers')]
+    #[ORM\JoinTable(name: 'customer_address')]
+    #[Groups(['customer:read'])]
+    #[ApiProperty(readableLink: true)]
+    private Collection $addresses;
+
+    public function __construct()
+    {
+        $this->addresses = new ArrayCollection();
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getLabel(): ?string
+    {
+        return $this->label;
+    }
+
+    public function setLabel(?string $label): void
+    {
+        $this->label = $label;
+    }
+
+    public function getCode(): ?string
+    {
+        return $this->code;
+    }
+
+    public function setCode(?string $code): void
+    {
+        $this->code = $code;
+    }
+
+    public function getAddresses(): Collection
+    {
+        return $this->addresses;
+    }
+
+    public function setAddresses(Collection $addresses): void
+    {
+        $this->addresses = $addresses;
+    }
+}
--- a/src/Entity/Reception.php
+++ b/src/Entity/Reception.php
@@ -72,27 +72,27 @@ class Reception
    #[ORM\Id]
    #[ORM\GeneratedValue]
    #[ORM\Column]
-    #[Groups(['reception:read', 'reception-bovine:read'])]
+    #[Groups(['reception:read'])]
    private ?int $id = null;

    #[ORM\Column(length: 20, nullable: true)]
-    #[Groups(['reception:read', 'reception:write', 'reception-bovine:read'])]
+    #[Groups(['reception:read', 'reception:write'])]
    private ?string $licensePlate = null;

    #[ORM\Column(length: 20, unique: true, nullable: true)]
-    #[Groups(['reception:read', 'reception-bovine:read'])]
+    #[Groups(['reception:read'])]
    private ?string $identificationNumber = null;

    #[ORM\Column(options: ['default' => 0])]
-    #[Groups(['reception:read', 'reception:write', 'reception-bovine:read'])]
+    #[Groups(['reception:read', 'reception:write'])]
    private int $currentStep = 0;

    #[ORM\Column(options: ['default' => false])]
-    #[Groups(['reception:read', 'reception:write', 'reception-bovine:read'])]
+    #[Groups(['reception:read', 'reception:write'])]
    private bool $isValid = false;

    #[ORM\Column(name: 'date_reception', type: 'datetime_immutable')]
-    #[Groups(['reception:read', 'reception:write', 'reception-bovine:read'])]
+    #[Groups(['reception:read', 'reception:write'])]
    #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
    private ?DateTimeImmutable $receptionDate = null;

@@ -168,20 +168,6 @@ class Reception
    #[ApiProperty(readableLink: true)]
    private ?Driver $driver = null;

-    /**
-     * @var Collection<int, ReceptionBovine>
-     */
-    #[ORM\OneToMany(targetEntity: ReceptionBovine::class, mappedBy: 'reception', cascade: ['persist', 'remove'], orphanRemoval: true)]
-    #[Assert\Range(
-        min: 0
-    )]
-    #[Groups(['reception:read', 'reception:write'])]
-    private Collection $bovines_types;
-
-    #[ORM\Column(length: 255, nullable: true)]
-    #[Groups(['reception:read', 'reception:write'])]
-    private ?string $bovineDetail = null;
-
    public function __construct(
        ?DateTimeImmutable $receptionDate = null,
    ) {
@@ -189,7 +175,6 @@ class Reception
        $this->weights         = new ArrayCollection();
        $this->buildings       = new ArrayCollection();
        $this->pelletBuildings = new ArrayCollection();
-        $this->bovines_types   = new ArrayCollection();
    }

    public function getId(): ?int
@@ -484,46 +469,4 @@ class Reception
            )
        ;
    }
-
-    /**
-     * @return Collection<int, ReceptionBovine>
-     */
-    public function getBovinesTypes(): Collection
-    {
-        return $this->bovines_types;
-    }
-
-    public function addBovinesType(ReceptionBovine $bovinesType): static
-    {
-        if (!$this->bovines_types->contains($bovinesType)) {
-            $this->bovines_types->add($bovinesType);
-            $bovinesType->setReception($this);
-        }
-
-        return $this;
-    }
-
-    public function removeBovinesType(ReceptionBovine $bovinesType): static
-    {
-        if ($this->bovines_types->removeElement($bovinesType)) {
-            // set the owning side to null (unless already changed)
-            if ($bovinesType->getReception() === $this) {
-                $bovinesType->setReception(null);
-            }
-        }
-
-        return $this;
-    }
-
-    public function getBovineDetail(): ?string
-    {
-        return $this->bovineDetail;
-    }
-
-    public function setBovineDetail(?string $bovineDetail): static
-    {
-        $this->bovineDetail = $bovineDetail;
-
-        return $this;
-    }
 }
--- a/src/Entity/ReceptionBovine.php
+++ b/src/Entity/ReceptionBovine.php
@@ -1,109 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Entity;
-
-use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
-use ApiPlatform\Metadata\ApiFilter;
-use ApiPlatform\Metadata\ApiProperty;
-use ApiPlatform\Metadata\ApiResource;
-use ApiPlatform\Metadata\Delete;
-use ApiPlatform\Metadata\Get;
-use ApiPlatform\Metadata\GetCollection;
-use ApiPlatform\Metadata\Patch;
-use ApiPlatform\Metadata\Post;
-use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Serializer\Attribute\Groups;
-
-#[ORM\Entity]
-#[ApiFilter(SearchFilter::class, properties: ['reception' => 'exact'])]
-#[ORM\UniqueConstraint(name: 'uniq_reception_bovine_type', columns: ['reception_id', 'bovine_type_id'])]
-#[ApiResource(
-    operations: [
-        new Get(
-            requirements: ['id' => '\d+'],
-            normalizationContext: ['groups' => ['reception-bovine:read']],
-        ),
-        new GetCollection(
-            normalizationContext: ['groups' => ['reception-bovine:read']],
-        ),
-        new Post(
-            normalizationContext: ['groups' => ['reception-bovine:read']],
-            denormalizationContext: ['groups' => ['reception-bovine:write']],
-        ),
-        new Patch(
-            normalizationContext: ['groups' => ['reception-bovine:read']],
-            denormalizationContext: ['groups' => ['reception-bovine:write']],
-        ),
-        new Delete(),
-    ],
-    security: "is_granted('ROLE_USER')",
-)]
-class ReceptionBovine
-{
-    #[ORM\Id]
-    #[ORM\GeneratedValue]
-    #[ORM\Column]
-    #[Groups(['reception-bovine:read', 'reception:read'])]
-
-    private ?int $id = null;
-
-    #[ORM\ManyToOne(inversedBy: 'bovines_types')]
-    #[Groups(['reception-bovine:read', 'reception-bovine:write'])]
-    private ?Reception $reception = null;
-
-    #[ORM\ManyToOne]
-    #[ORM\JoinColumn(nullable: false)]
-    #[Groups(['reception-bovine:read', 'reception-bovine:write', 'reception:read'])]
-    #[ApiProperty(readableLink: true)]
-    private ?BovineType $bovineType = null;
-
-    #[ORM\Column(options: ['default' => 0])]
-    #[Assert\Range(
-        min: 0
-    )]
-    #[Groups(['reception-bovine:read', 'reception-bovine:write', 'reception:read'])]
-    private ?int $quantity = null;
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getReception(): ?Reception
-    {
-        return $this->reception;
-    }
-
-    public function setReception(?Reception $reception): static
-    {
-        $this->reception = $reception;
-
-        return $this;
-    }
-
-    public function getBovineType(): ?BovineType
-    {
-        return $this->bovineType;
-    }
-
-    public function setBovineType(?BovineType $bovineType): static
-    {
-        $this->bovineType = $bovineType;
-
-        return $this;
-    }
-
-    public function getQuantity(): ?int
-    {
-        return $this->quantity;
-    }
-
-    public function setQuantity(int $quantity): static
-    {
-        $this->quantity = $quantity;
-
-        return $this;
-    }
-}
--- a/src/Entity/Shipment.php
+++ b/src/Entity/Shipment.php
@@ -0,0 +1,244 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\GetCollection;
+use ApiPlatform\Metadata\Patch;
+use ApiPlatform\Metadata\Post;
+use DateTimeImmutable;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Context;
+use Symfony\Component\Serializer\Attribute\Groups;
+use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'shipment')]
+#[ApiResource(
+    operations: [
+        new Get(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['shipment:read']],
+        ),
+        new GetCollection(
+            normalizationContext: ['groups' => ['shipment:read']],
+        ),
+        new Post(
+            normalizationContext: ['groups' => ['shipment:read']],
+            denormalizationContext: ['groups' => ['shipment:write']],
+        ),
+        new Patch(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['shipment:read']],
+            denormalizationContext: ['groups' => ['shipment:write']],
+        ),
+        //        new Get(
+        //            uriTemplate: '/shipments/weigh',
+        //            openapi: new OpenApiOperation(
+        //                summary: 'Fetch the current weight reading',
+        //                description: 'Queries the pont-bascule and returns the weight data.',
+        //            ),
+        //            normalizationContext: ['groups' => ['shipment:weigh:read']],
+        //            output: PontBasculeReading::class,
+        //            provider: shipmentWeighingProvider::class,
+        //        ),
+        //        new Get(
+        //            uriTemplate: '/shipments/{id}/receipt',
+        //            requirements: ['id' => '\d+'],
+        //            openapi: new OpenApiOperation(
+        //                summary: 'Render a shipment receipt',
+        //                description: 'Returns a PDF receipt for the shipment.',
+        //            ),
+        //            output: false,
+        //            provider: shipmentReceiptProvider::class,
+        //        ),
+    ],
+)]
+class Shipment
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    #[Groups(['shipment:read'])]
+    private ?int $id = null;
+
+    #[ORM\Column(length: 255)]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private ?string $licencePlate = null;
+
+    #[ORM\Column(length: 20, unique: true, nullable: true)]
+    #[Groups(['shipment:read'])]
+    private ?string $identificationNumber = null;
+
+    #[ORM\Column(options: ['default' => 0])]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private int $currentStep = 0;
+
+    #[ORM\Column]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private ?bool $isValid = null;
+
+    #[ORM\Column(name: 'shipment_date', type: 'datetime_immutable')]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
+    private ?DateTimeImmutable $shipmentDate = null;
+
+    #[ORM\ManyToOne]
+    #[ORM\JoinColumn(nullable: true)]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    #[ApiProperty(readableLink: true)]
+    private ?Carrier $carrier = null;
+
+    #[ORM\ManyToOne]
+    #[ORM\JoinColumn(nullable: true)]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    #[ApiProperty(readableLink: true)]
+    private ?Truck $truck = null;
+
+    #[ORM\ManyToOne]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private ?Customer $customer = null;
+
+    /**
+     * @var Collection<int, BovinShipment>
+     */
+    #[ORM\OneToMany(targetEntity: BovinShipment::class, mappedBy: 'shipment')]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private Collection $bovinShipments;
+
+    public function __construct(Collection $bovinShipments)
+    {
+        $this->bovinShipments = $bovinShipments;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getLicencePlate(): ?string
+    {
+        return $this->licencePlate;
+    }
+
+    public function setLicencePlate(?string $licencePlate): void
+    {
+        $this->licencePlate = $licencePlate;
+    }
+
+    public function getIdentificationNumber(): ?string
+    {
+        return $this->identificationNumber;
+    }
+
+    public function setIdentificationNumber(?string $identificationNumber): void
+    {
+        $this->identificationNumber = $identificationNumber;
+    }
+
+    public function getCurrentStep(): int
+    {
+        return $this->currentStep;
+    }
+
+    public function setCurrentStep(int $currentStep): void
+    {
+        $this->currentStep = $currentStep;
+    }
+
+    public function getIsValid(): ?bool
+    {
+        return $this->isValid;
+    }
+
+    public function setIsValid(?bool $isValid): void
+    {
+        $this->isValid = $isValid;
+    }
+
+    public function getShipmentDate(): ?DateTimeImmutable
+    {
+        return $this->shipmentDate;
+    }
+
+    public function setShipmentDate(?DateTimeImmutable $shipmentDate): void
+    {
+        $this->shipmentDate = $shipmentDate;
+    }
+
+    public function getCarrier(): ?Carrier
+    {
+        return $this->carrier;
+    }
+
+    public function setCarrier(?Carrier $carrier): void
+    {
+        $this->carrier = $carrier;
+    }
+
+    public function getVehicle(): ?Vehicle
+    {
+        return $this->vehicle;
+    }
+
+    public function setVehicle(?Vehicle $vehicle): void
+    {
+        $this->vehicle = $vehicle;
+    }
+
+    public function getTruck(): ?Truck
+    {
+        return $this->truck;
+    }
+
+    public function setTruck(?Truck $truck): void
+    {
+        $this->truck = $truck;
+    }
+
+    public function getCustomer(): ?Customer
+    {
+        return $this->customer;
+    }
+
+    public function setCustomer(?Customer $customer): void
+    {
+        $this->customer = $customer;
+    }
+
+    public function getBovinShipments(): Collection
+    {
+        return $this->bovinShipments;
+    }
+
+    public function setBovinShipments(Collection $bovinShipments): void
+    {
+        $this->bovinShipments = $bovinShipments;
+    }
+
+    public function addPelletBuilding(BovinShipment $bovinShipments): self
+    {
+        if (!$this->bovinShipments->contains($bovinShipments)) {
+            $this->bovinShipments->add($bovinShipments);
+            $bovinShipments->setReception($this);
+        }
+
+        return $this;
+    }
+
+    public function removePelletBuilding(BovinShipment $bovinShipments): self
+    {
+        if ($this->bovinShipments->removeElement($bovinShipments)) {
+            if ($bovinShipments->getReception() === $this) {
+                $bovinShipments->setReception(null);
+            }
+        }
+
+        return $this;
+    }
+}
--- a/src/Entity/ShipmentType.php
+++ b/src/Entity/ShipmentType.php
@@ -11,32 +11,33 @@ use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Groups;

 #[ORM\Entity]
+#[ORM\Table(name: 'shipment_type')]
 #[ApiResource(
    operations: [
        new Get(
            requirements: ['id' => '\d+'],
-            normalizationContext: ['groups' => ['bovine-type:read']],
+            normalizationContext: ['groups' => ['shipment-type:read']],
        ),
        new GetCollection(
-            normalizationContext: ['groups' => ['bovine-type:read']],
+            normalizationContext: ['groups' => ['shipment-type:read']],
        ),
    ],
    security: "is_granted('ROLE_USER')",
 )]
-class BovineType
+class ShipmentType
 {
    #[ORM\Id]
    #[ORM\GeneratedValue]
    #[ORM\Column]
-    #[Groups(['bovine-type:read', 'reception:read', 'reception-bovine:read'])]
+    #[Groups(['shipment-type:read', 'shipment:read'])]
    private ?int $id = null;

-    #[ORM\Column(length: 120)]
-    #[Groups(['bovine-type:read', 'reception:read', 'reception-bovine:read'])]
+    #[ORM\Column(length: 255)]
+    #[Groups(['shipment-type:read', 'shipment:read'])]
    private ?string $label = null;

-    #[ORM\Column(length: 50)]
-    #[Groups(['bovine-type:read', 'reception:read', 'reception-bovine:read'])]
+    #[ORM\Column(length: 255)]
+    #[Groups(['shipment-type:read', 'shipment:read'])]
    private ?string $code = null;

    public function getId(): ?int
@@ -61,7 +62,7 @@ class BovineType
        return $this->code;
    }

-    public function setCode(string $code): static
+    public function setCode(string $code): self
    {
        $this->code = $code;

--- a/src/Repository/BovineTypeRepository.php
+++ b/src/Repository/BovineTypeRepository.php
@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Repository;
-
-use App\Entity\BovineType;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
-
-/**
- * @extends ServiceEntityRepository<BovineType>
- */
-class BovineTypeRepository extends ServiceEntityRepository
-{
-    public function __construct(ManagerRegistry $registry)
-    {
-        parent::__construct($registry, BovineType::class);
-    }
-
-    //    /**
-    //     * @return BovineType[] Returns an array of BovineType objects
-    //     */
-    //    public function findByExampleField($value): array
-    //    {
-    //        return $this->createQueryBuilder('b')
-    //            ->andWhere('b.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->orderBy('b.id', 'ASC')
-    //            ->setMaxResults(10)
-    //            ->getQuery()
-    //            ->getResult()
-    //        ;
-    //    }
-
-    //    public function findOneBySomeField($value): ?BovineType
-    //    {
-    //        return $this->createQueryBuilder('b')
-    //            ->andWhere('b.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->getQuery()
-    //            ->getOneOrNullResult()
-    //        ;
-    //    }
-}
--- a/src/Repository/ReceptionBovineRepository.php
+++ b/src/Repository/ReceptionBovineRepository.php
@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Repository;
-
-use App\Entity\ReceptionBovine;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
-
-/**
- * @extends ServiceEntityRepository<ReceptionBovine>
- */
-class ReceptionBovineRepository extends ServiceEntityRepository
-{
-    public function __construct(ManagerRegistry $registry)
-    {
-        parent::__construct($registry, ReceptionBovine::class);
-    }
-
-    //    /**
-    //     * @return ReceptionBovine[] Returns an array of ReceptionBovine objects
-    //     */
-    //    public function findByExampleField($value): array
-    //    {
-    //        return $this->createQueryBuilder('r')
-    //            ->andWhere('r.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->orderBy('r.id', 'ASC')
-    //            ->setMaxResults(10)
-    //            ->getQuery()
-    //            ->getResult()
-    //        ;
-    //    }
-
-    //    public function findOneBySomeField($value): ?ReceptionBovine
-    //    {
-    //        return $this->createQueryBuilder('r')
-    //            ->andWhere('r.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->getQuery()
-    //            ->getOneOrNullResult()
-    //        ;
-    //    }
-}
--- a/tests/BovinIdentificationProviderTest.php
+++ b/tests/BovinIdentificationProviderTest.php
@@ -1,102 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Tests\State;
-
-use ApiPlatform\Metadata\Operation;
-use App\State\BovinIdentificationProvider;
-use DateTimeImmutable;
-use Malio\EdnotifBundle\Bovin\Api\BovinApiInterface;
-use Malio\EdnotifBundle\Bovin\Dto\AnimalFileDto;
-use Malio\EdnotifBundle\Bovin\Dto\BovinIdentificationDto;
-use Malio\EdnotifBundle\Bovin\Dto\BovinRef;
-use Malio\EdnotifBundle\Bovin\Dto\DateValueDto;
-use Malio\EdnotifBundle\Bovin\Dto\ExploitationRef;
-use Malio\EdnotifBundle\Bovin\Dto\MovementDto;
-use Malio\EdnotifBundle\Bovin\Dto\ParentInfoDto;
-use Malio\EdnotifBundle\Bovin\Dto\PresencePeriodDto;
-use Malio\EdnotifBundle\Shared\Dto\StandardResponseDto;
-use PHPUnit\Framework\TestCase;
-
-/**
- * @internal
- */
-final class BovinIdentificationProviderTest extends TestCase
-{
-    public function testReturnsNullWhenNumeroNationalMissing(): void
-    {
-        $api = $this->createMock(BovinApiInterface::class);
-        $api->expects(self::never())->method('getAnimalFile');
-
-        $provider = new BovinIdentificationProvider($api);
-
-        $result = $provider->provide($this->createStub(Operation::class), []);
-
-        self::assertNull($result);
-    }
-
-    public function testMapsIdentificationAndPresencePeriods(): void
-    {
-        $api = $this->createMock(BovinApiInterface::class);
-
-        $identification = new BovinIdentificationDto(
-            bovin: new BovinRef('FR', 'IGNORED'),
-            sex: 'F',
-            breedType: 'LIM',
-            birthDate: new DateValueDto(new DateTimeImmutable('2024-01-02'), 'Y'),
-            workNumber: 'W123',
-            isFilie: true,
-            motherCarrier: new ParentInfoDto(new BovinRef('FR', 'MOM1'), 'CHA'),
-            fatherIpg: new ParentInfoDto(new BovinRef('FR', 'DAD1'), 'BBB'),
-            birthExploitation: new ExploitationRef('FR', 'EXP1'),
-        );
-
-        $presencePeriods = [
-            new PresencePeriodDto(
-                new MovementDto(new DateTimeImmutable('2024-03-01'), 'ENTRY', null),
-                new MovementDto(new DateTimeImmutable('2024-03-10'), 'EXIT', null),
-            ),
-        ];
-
-        $animalFile = new AnimalFileDto(
-            new StandardResponseDto(true, null),
-            $identification,
-            $presencePeriods,
-            null
-        );
-
-        $api->expects(self::once())
-            ->method('getAnimalFile')
-            ->with('FR123', 'FR')
-            ->willReturn($animalFile)
-        ;
-
-        $provider = new BovinIdentificationProvider($api);
-
-        $result = $provider->provide(
-            $this->createStub(Operation::class),
-            ['numeroNational' => 'FR123']
-        );
-
-        self::assertNotNull($result);
-        self::assertSame('FR123', $result->numeroNational);
-        self::assertSame('F', $result->sex);
-        self::assertSame('LIM', $result->breedType);
-        self::assertSame('W123', $result->workNumber);
-        self::assertSame('2024-01-02', $result->birthDate);
-        self::assertSame('Y', $result->birthDateCompletenessFlag);
-        self::assertTrue($result->isFilie);
-        self::assertSame('MOM1', $result->motherNationalNumber);
-        self::assertSame('CHA', $result->motherBreedType);
-        self::assertSame('DAD1', $result->fatherNationalNumber);
-        self::assertSame('BBB', $result->fatherBreedType);
-        self::assertSame('EXP1', $result->birthExploitationNumber);
-
-        self::assertCount(1, $result->presencePeriods);
-        self::assertSame('2024-03-01', $result->presencePeriods[0]->entryDate);
-        self::assertSame('ENTRY', $result->presencePeriods[0]->entryCause);
-        self::assertSame('2024-03-10', $result->presencePeriods[0]->exitDate);
-        self::assertSame('EXIT', $result->presencePeriods[0]->exitCause);
-    }
-}
--- a/tests/State/MeProviderTest.php
+++ b/tests/State/MeProviderTest.php
@@ -1,48 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Tests\State;
-
-use ApiPlatform\Metadata\Operation;
-use App\Entity\User;
-use App\State\MeProvider;
-use PHPUnit\Framework\TestCase;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
-
-/**
- * @internal
- */
-final class MeProviderTest extends TestCase
-{
-    public function testProvideReturnUser(): void
-    {
-        $user = new User();
-
-        $security = $this->createStub(Security::class);
-        $security->method('getUser')->willReturn($user);
-
-        $provider = new MeProvider($security);
-
-        $result = $provider->provide($this->createStub(Operation::class));
-
-        self::assertSame($user, $result);
-        self::assertInstanceOf(User::class, $result);
-    }
-
-    public function testProvideThrowAccessDeniedException(): void
-    {
-        $user = null;
-
-        $security = $this->createStub(Security::class);
-        $security->method('getUser')->willReturn($user);
-
-        $provider = new MeProvider($security);
-
-        $this->expectException(AccessDeniedException::class);
-        $this->expectExceptionMessage('User not authenticated.');
-
-        $provider->provide($this->createStub(Operation::class));
-    }
-}
Author	SHA1	Message	Date
Matteo	ba4375f609	feat : Expedition dev back-end WIP	2026-02-04 16:58:55 +01:00
Matteo	e249d44e78	feat : mise à jour du bon de réception WIP	2026-02-03 17:34:35 +01:00
Matteo	e8189a4d04	feat : mise à jour du bon de réception WIP	2026-02-03 17:32:39 +01:00
Matteo	081c2ef403	feat : mise à jour du bon de réception WIP	2026-02-03 17:16:47 +01:00
Matteo	5fd2ab8470	feat : mise à jour du bon de réception wip	2026-02-03 17:16:19 +01:00