feat : ordre d'affichage configurable sur les bâtiments

- Colonne display_order ajoutée à Building avec migration
- Seed des valeurs par code : B3 -> 1, B2 -> 2, B1 -> 3, ZT -> 4
- ApiResource trie par displayOrder ASC puis id (NULLs en fin de liste)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

README.md

@@ -193,14 +193,12 @@ Pas de ligne d'en-tête, 4 colonnes dans cet ordre :
 | B | Fournisseur | Texte libre, casse ignorée | `TERRENA` |
 | C | Poids à l'arrivée (kg) | Entier | `368` |
 | D | Prix au kilo | Décimal | `5.7` |
-| E | Code bâtiment (optionnel) | `B1`, `B2`, `B3`, `ZT` (casse ignorée) | `B2` |
 
 ### Comportement
 
 - **Numéro national** : le préfixe `FR` (avec ou sans espace) est retiré s'il est présent. Sinon la valeur est utilisée telle quelle.
 - **Bovin introuvable** en BDD → ligne ignorée, log warning à la fin avec aperçu.
 - **Fournisseur introuvable** en BDD → le bovin est mis à jour quand même avec `supplier = null`, log warning.
-- **Bâtiment** (colonne E) : recherché par `code` (insensible casse). Set uniquement si le bovin n'a pas déjà une `buildingCase` assignée (la case prime sur le bâtiment direct côté affichage). Si code introuvable → log warning, champ non set.
 - **Cellules `weight` / `price` vides ou non numériques** → champ non modifié.
 - La commande est **idempotente** : peut être relancée sans effet de bord.
 
@@ -239,4 +237,3 @@ rm /tmp/feed_bovin.xlsx                                                # nettoya
 - Bovins introuvables (avec aperçu des 10 premiers numéros)
 - Lignes invalides (numéro national vide)
 - Fournisseurs introuvables (avec liste et compte par nom)
-- Bâtiments introuvables (avec liste des codes inconnus)

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.90'
+    app.version: '0.0.89'

frontend/composables/useBovineColumns.ts

@@ -7,77 +7,41 @@ export interface BovineColumn {
     width?: string
 }
 
-export interface UseBovineColumnsOptions {
-    /**
-     * 'inventory' (par défaut) : colonnes complètes incluant Bâtiment + Case.
-     * 'case' : pas de Bâtiment ni Case (déjà dans le titre de la page),
-     * largeurs élargies pour combler l'espace.
-     */
-    variant?: 'inventory' | 'case'
-}
-
 /**
  * Définition partagée des colonnes des tableaux bovins (inventory + case).
- * Variants distincts pour chaque écran et chaque rôle (admin/user) afin de
- * pouvoir ajuster les largeurs indépendamment.
+ * Deux définitions distinctes admin/user pour pouvoir ajuster les largeurs
+ * indépendamment selon le contexte.
  */
-export const useBovineColumns = (options: UseBovineColumnsOptions = {}) => {
+export const useBovineColumns = () => {
     const auth = useAuthStore()
 
-    const adminColumnsInventory: BovineColumn[] = [
+    const adminColumns: BovineColumn[] = [
         { key: 'nationalNumber', label: 'N° National', width: '80px' },
         { key: 'workNumber', label: 'N° Travail', width: '60px' },
         { key: 'sex', label: 'Sexe', width: '70px' },
         { key: 'birthDate', label: 'Né le', width: '72px' },
         { key: 'age', label: 'Age', width: '110px' },
-        { key: 'bovineType.label', label: 'Race', width: '90px' },
+        { key: 'breedCode', label: 'Race', width: '70px' },
         { key: 'buildingCase.building.label', label: 'Bâtiment', width: '1fr' },
         { key: 'buildingCase.caseNumber', label: 'Case', width: '42px' },
         { key: 'arrivalDate', label: 'Entrée le', width: '90px' },
         { key: 'pricePerKg', label: 'Prix/kg', width: '65px' },
-        { key: 'finalPrice', label: 'Prix total', width: '80px' }
+        { key: 'finalPrice', label: 'Prix total', width: '100px' }
     ]
 
-    const userColumnsInventory: BovineColumn[] = [
+    const userColumns: BovineColumn[] = [
         { key: 'nationalNumber', label: 'N° National', width: '80px' },
         { key: 'workNumber', label: 'N° Travail', width: '60px' },
         { key: 'sex', label: 'Sexe', width: '70px' },
         { key: 'birthDate', label: 'Né le', width: '72px' },
         { key: 'age', label: 'Age', width: '110px' },
-        { key: 'bovineType.label', label: 'Race', width: '1fr' },
-        { key: 'buildingCase.building.label', label: 'Bâtiment', width: '120px' },
+        { key: 'breedCode', label: 'Race', width: '70px' },
+        { key: 'buildingCase.building.label', label: 'Bâtiment', width: '1fr' },
         { key: 'buildingCase.caseNumber', label: 'Case', width: '42px' },
         { key: 'arrivalDate', label: 'Entrée le', width: '90px' }
     ]
 
-    const adminColumnsCase: BovineColumn[] = [
-        { key: 'nationalNumber', label: 'N° National', width: '110px' },
-        { key: 'workNumber', label: 'N° Travail', width: '85px' },
-        { key: 'sex', label: 'Sexe', width: '90px' },
-        { key: 'birthDate', label: 'Né le', width: '100px' },
-        { key: 'age', label: 'Age', width: '90px' },
-        { key: 'bovineType.label', label: 'Race', width: '1fr' },
-        { key: 'arrivalDate', label: 'Entrée le', width: '110px' },
-        { key: 'pricePerKg', label: 'Prix/kg', width: '85px' },
-        { key: 'finalPrice', label: 'Prix total', width: '105px' }
-    ]
-
-    const userColumnsCase: BovineColumn[] = [
-        { key: 'nationalNumber', label: 'N° National', width: '130px' },
-        { key: 'workNumber', label: 'N° Travail', width: '100px' },
-        { key: 'sex', label: 'Sexe', width: '110px' },
-        { key: 'birthDate', label: 'Né le', width: '140px' },
-        { key: 'age', label: 'Age', width: '130px' },
-        { key: 'bovineType.label', label: 'Race', width: '1fr' },
-        { key: 'arrivalDate', label: 'Entrée le', width: '170px' }
-    ]
-
-    const columns = computed<BovineColumn[]>(() => {
-        if (options.variant === 'case') {
-            return auth.isAdmin ? adminColumnsCase : userColumnsCase
-        }
-        return auth.isAdmin ? adminColumnsInventory : userColumnsInventory
-    })
+    const columns = computed<BovineColumn[]>(() => auth.isAdmin ? adminColumns : userColumns)
 
     return { columns }
 }

frontend/pages/infrastructure/case.vue

@@ -94,13 +94,19 @@
                 <template #header-finalPrice>
                     <UiTextInput :model-value="''" placeholder="Prix total" size="compact" disabled />
                 </template>
-                <template #header-bovineType.label>
+                <template #header-breedCode>
                     <UiTextInput
-                        v-model="filters['bovineType.label']"
+                        v-model="filters.breedCode"
                         placeholder="Race"
                         size="compact"
                     />
                 </template>
+                <template #header-buildingCase.building.label>
+                    <UiTextInput :model-value="''" placeholder="Bâtiment" size="compact" disabled />
+                </template>
+                <template #header-buildingCase.caseNumber>
+                    <UiTextInput :model-value="''" placeholder="Case" size="compact" disabled />
+                </template>
                 <template #header-arrivalDate>
                     <UiDateMaskedInput v-model="arrivalDateFilter" size="compact" placeholder="Entrée le" />
                 </template>
@@ -118,6 +124,12 @@
                 <template #cell-arrivalDate="{ item }">
                     {{ formatDate(item.arrivalDate) }}
                 </template>
+                <template #cell-buildingCase.building.label="{ item }">
+                    {{ item.buildingCase?.building?.label ?? '—' }}
+                </template>
+                <template #cell-buildingCase.caseNumber="{ item }">
+                    {{ item.buildingCase?.caseNumber ?? '—' }}
+                </template>
                 <template #cell-pricePerKg="{ item }">
                     {{ formatPrice(item.pricePerKg) }}
                 </template>
@@ -184,7 +196,7 @@ const { items, totalItems, page, perPage, filters, loading, reload } =
             buildingCase: '',
             nationalNumber: '',
             workNumber: '',
-            'bovineType.label': '',
+            breedCode: '',
             sex: '',
             'arrivalDate[after]': '',
             'arrivalDate[strictly_before]': '',
@@ -222,7 +234,7 @@ const singleDateFilter = (afterKey: string, beforeKey: string) =>
 const arrivalDateFilter = singleDateFilter('arrivalDate[after]', 'arrivalDate[strictly_before]')
 const birthDateFilter = singleDateFilter('birthDate[after]', 'birthDate[strictly_before]')
 
-const { columns } = useBovineColumns({ variant: 'case' })
+const { columns } = useBovineColumns()
 
 const title = computed(() => {
     if (!buildingCase.value) return ''

frontend/pages/inventory.vue

@@ -83,9 +83,9 @@
                 <template #header-birthDate>
                     <UiDateMaskedInput v-model="birthDateFilter" size="compact" placeholder="Né le" />
                 </template>
-                <template #header-bovineType.label>
+                <template #header-breedCode>
                     <UiTextInput
-                        v-model="filters['bovineType.label']"
+                        v-model="filters.breedCode"
                         placeholder="Race"
                         size="compact"
                     />
@@ -123,7 +123,7 @@
                     {{ formatDate(item.arrivalDate) }}
                 </template>
                 <template #cell-buildingCase.building.label="{ item }">
-                    {{ item.effectiveBuilding?.label ?? '—' }}
+                    {{ item.buildingCase?.building?.label ?? '—' }}
                 </template>
                 <template #cell-buildingCase.caseNumber="{ item }">
                     {{ item.buildingCase?.caseNumber ?? '—' }}
@@ -236,7 +236,7 @@ const { items, totalItems, page, perPage, filters, loading, reload } =
             'exists[exitedAt]': 'false',
             nationalNumber: '',
             workNumber: '',
-            'bovineType.label': '',
+            breedCode: '',
             sex: '',
             'arrivalDate[after]': '',
             'arrivalDate[strictly_before]': '',

frontend/services/dto/bovine-data.ts

@@ -1,10 +1,6 @@
-export interface BovineBuildingRef {
-    label: string
-}
-
 export interface BovineBuildingCaseRef {
     caseNumber: number | null
-    building: BovineBuildingRef | null
+    building: { label: string } | null
 }
 
 export interface BovineData {
@@ -16,12 +12,10 @@ export interface BovineData {
     arrivalDate: string | null
     exitDate: string | null
     buildingCase: BovineBuildingCaseRef | null
-    building: BovineBuildingRef | null
-    effectiveBuilding: BovineBuildingRef | null
     supplier: string | null
     workNumber: string | null
     birthDate: string | null
-    bovineType: { id: number; label: string; code: string } | null
+    breedCode: string | null
     sex: string | null
     ageMonths: number | null
     exitedAt: string | null

migrations/Version20260428061801.php

@@ -1,35 +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 Version20260428061801 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 bovine ADD building_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE bovine ADD CONSTRAINT FK_2068337F4D2A7E12 FOREIGN KEY (building_id) REFERENCES building (id)');
-        $this->addSql('CREATE INDEX IDX_2068337F4D2A7E12 ON bovine (building_id)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE bovine DROP CONSTRAINT FK_2068337F4D2A7E12');
-        $this->addSql('DROP INDEX IDX_2068337F4D2A7E12');
-        $this->addSql('ALTER TABLE bovine DROP building_id');
-    }
-}

migrations/Version20260428065800.php

@@ -1,50 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Bascule de Bovine.breed_code (string) vers une relation Bovine.bovine_type_id (FK).
- * Ajoute au passage les BovineType manquants (Aubrac=14, Croisé=39, Blonde d'aquitaine=79).
- */
-final class Version20260428065800 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Migration breedCode -> relation BovineType + ajout des races manquantes.';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // 1. Insertion des BovineType manquants (idempotent via NOT EXISTS).
-        $this->addSql("INSERT INTO bovine_type (label, code) SELECT 'Aubrac', '14' WHERE NOT EXISTS (SELECT 1 FROM bovine_type WHERE code = '14')");
-        $this->addSql("INSERT INTO bovine_type (label, code) SELECT 'Croisé', '39' WHERE NOT EXISTS (SELECT 1 FROM bovine_type WHERE code = '39')");
-        $this->addSql("INSERT INTO bovine_type (label, code) SELECT 'Blonde d''aquitaine', '79' WHERE NOT EXISTS (SELECT 1 FROM bovine_type WHERE code = '79')");
-
-        // 2. Ajout de la colonne FK + index.
-        $this->addSql('ALTER TABLE bovine ADD bovine_type_id INT DEFAULT NULL');
-        $this->addSql('CREATE INDEX IDX_2068337F7899F32E ON bovine (bovine_type_id)');
-
-        // 3. Backfill : associe chaque bovin à son BovineType via le code.
-        $this->addSql('UPDATE bovine SET bovine_type_id = (SELECT id FROM bovine_type WHERE bovine_type.code = bovine.breed_code) WHERE breed_code IS NOT NULL');
-
-        // 4. Contrainte de clé étrangère (après backfill pour éviter une violation transitoire).
-        $this->addSql('ALTER TABLE bovine ADD CONSTRAINT FK_2068337F7899F32E FOREIGN KEY (bovine_type_id) REFERENCES bovine_type (id)');
-
-        // 5. Drop de l'ancienne colonne string.
-        $this->addSql('ALTER TABLE bovine DROP breed_code');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE bovine ADD breed_code VARCHAR(20) DEFAULT NULL');
-        $this->addSql('UPDATE bovine SET breed_code = (SELECT code FROM bovine_type WHERE bovine_type.id = bovine.bovine_type_id) WHERE bovine_type_id IS NOT NULL');
-        $this->addSql('ALTER TABLE bovine DROP CONSTRAINT FK_2068337F7899F32E');
-        $this->addSql('DROP INDEX IDX_2068337F7899F32E');
-        $this->addSql('ALTER TABLE bovine DROP bovine_type_id');
-    }
-}

src/Command/FeedBovinePricesCommand.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Command;
 
 use App\Entity\Bovine;
-use App\Entity\Building;
 use App\Entity\Supplier;
 use Doctrine\ORM\EntityManagerInterface;
 use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -72,12 +71,6 @@ final class FeedBovinePricesCommand extends Command
             $supplierByName[mb_strtoupper($supplier->getName())] = $supplier;
         }
 
-        // Pré-chargement des bâtiments par code (insensible casse).
-        $buildingByCode = [];
-        foreach ($this->em->getRepository(Building::class)->findAll() as $building) {
-            $buildingByCode[mb_strtoupper($building->getCode())] = $building;
-        }
-
         $bovineRepo = $this->em->getRepository(Bovine::class);
 
         $stats = [
@@ -86,11 +79,9 @@ final class FeedBovinePricesCommand extends Command
             'notFound'        => 0,
             'invalid'         => 0,
             'supplierMissing' => 0,
-            'buildingMissing' => 0,
         ];
         $missingNationalNumbers = [];
         $missingSuppliers       = [];
-        $missingBuildings       = [];
 
         $io->progressStart($highestRow);
         for ($row = 1; $row <= $highestRow; ++$row) {
@@ -100,7 +91,6 @@ final class FeedBovinePricesCommand extends Command
             $rawSupplier       = (string) ($sheet->getCell([2, $row])->getValue() ?? '');
             $rawWeight         = $sheet->getCell([3, $row])->getValue();
             $rawPrice          = $sheet->getCell([4, $row])->getValue();
-            $rawBuilding       = (string) ($sheet->getCell([5, $row])->getValue() ?? '');
 
             $rawNationalNumber = trim($rawNationalNumber);
             if ('' === $rawNationalNumber) {
@@ -144,18 +134,6 @@ final class FeedBovinePricesCommand extends Command
             }
             $bovine->setSupplier($supplier);
 
-            // Bâtiment direct : on n'écrase pas une affectation à une case existante.
-            $buildingCode = mb_strtoupper(trim($rawBuilding));
-            if ('' !== $buildingCode && null === $bovine->getBuildingCase()) {
-                $building = $buildingByCode[$buildingCode] ?? null;
-                if (null !== $building) {
-                    $bovine->setBuilding($building);
-                } else {
-                    ++$stats['buildingMissing'];
-                    $missingBuildings[$buildingCode] = ($missingBuildings[$buildingCode] ?? 0) + 1;
-                }
-            }
-
             ++$stats['updated'];
             $io->progressAdvance();
         }
@@ -174,7 +152,6 @@ final class FeedBovinePricesCommand extends Command
                 ['Bovins introuvables', $stats['notFound']],
                 ['Lignes invalides', $stats['invalid']],
                 ['Fournisseurs introuvables (supplier=null)', $stats['supplierMissing']],
-                ['Bâtiments introuvables (building non set)', $stats['buildingMissing']],
             ]
         );
 
@@ -196,14 +173,6 @@ final class FeedBovinePricesCommand extends Command
             $io->warning('Fournisseurs introuvables (bovins rattachés en null) : '.implode(', ', $list));
         }
 
-        if ([] !== $missingBuildings) {
-            $list = [];
-            foreach ($missingBuildings as $code => $count) {
-                $list[] = sprintf('%s (%d)', $code, $count);
-            }
-            $io->warning('Bâtiments introuvables (champ non renseigné) : '.implode(', ', $list));
-        }
-
         if ($dryRun) {
             $io->success('Dry-run terminé. Relance sans --dry-run pour persister.');
         } else {

src/Command/SeedCommand.php

@@ -476,12 +476,9 @@ class SeedCommand extends Command
     private function seedBovineTypes(): void
     {
         $bovineTypes = [
-            ['label' => 'Aubrac', 'code' => '14'],
             ['label' => 'Limousine', 'code' => '34'],
             ['label' => 'Charolaise', 'code' => '38'],
-            ['label' => 'Croisé', 'code' => '39'],
             ['label' => 'Parthenaise', 'code' => '71'],
-            ['label' => "Blonde d'aquitaine", 'code' => '79'],
         ];
         foreach ($bovineTypes as $type) {
             $this->upsertByCode(BovineType::class, $type['code'], static function (BovineType $entity) use ($type) {

src/DataFixtures/ReferenceFixtures.php

@@ -77,12 +77,9 @@ class ReferenceFixtures extends Fixture
         }
 
         $bovineTypes = [
-            ['label' => 'Aubrac', 'code' => '14'],
             ['label' => 'Limousine', 'code' => '34'],
             ['label' => 'Charolaise', 'code' => '38'],
-            ['label' => 'Croisé', 'code' => '39'],
             ['label' => 'Parthenaise', 'code' => '71'],
-            ['label' => "Blonde d'aquitaine", 'code' => '79'],
         ];
         foreach ($bovineTypes as $type) {
             $bovineType = new BovineType()

src/Entity/Bovine.php

@@ -27,13 +27,12 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 #[ORM\Table(name: 'bovine')]
 #[ORM\UniqueConstraint(name: 'uniq_bovine_national_number', columns: ['national_number'])]
 #[ApiFilter(SearchFilter::class, properties: [
-    'nationalNumber'   => 'ipartial',
-    'workNumber'       => 'ipartial',
-    'bovineType.label' => 'ipartial',
-    'bovineType.code'  => 'ipartial',
-    'sex'              => 'exact',
-    'buildingCase'     => 'exact',
-    'receivedWeight'   => 'exact',
+    'nationalNumber' => 'ipartial',
+    'workNumber'     => 'ipartial',
+    'breedCode'      => 'ipartial',
+    'sex'            => 'exact',
+    'buildingCase'   => 'exact',
+    'receivedWeight' => 'exact',
 ])]
 #[ApiFilter(DateFilter::class, properties: ['arrivalDate', 'birthDate', 'exitDate'])]
 #[ApiFilter(ExistsFilter::class, properties: ['exitedAt'])]
@@ -94,11 +93,6 @@ class Bovine
     #[ApiProperty(readableLink: true)]
     private ?BuildingCase $buildingCase = null;
 
-    #[ORM\ManyToOne]
-    #[Groups(['bovine:read'])]
-    #[ApiProperty(readableLink: true)]
-    private ?Building $building = null;
-
     #[ORM\ManyToOne]
     #[Groups(['bovine:read', 'bovine:write', 'building_case:read'])]
     private ?Supplier $supplier = null;
@@ -112,10 +106,9 @@ class Bovine
     #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
     private ?DateTimeImmutable $birthDate = null;
 
-    #[ORM\ManyToOne]
+    #[ORM\Column(length: 20, nullable: true)]
     #[Groups(['bovine:read', 'building_case:read'])]
-    #[ApiProperty(readableLink: true)]
-    private ?BovineType $bovineType = null;
+    private ?string $breedCode = null;
 
     #[ORM\Column(length: 1, nullable: true)]
     #[Groups(['bovine:read', 'building_case:read'])]
@@ -211,28 +204,6 @@ class Bovine
         return $this;
     }
 
-    public function getBuilding(): ?Building
-    {
-        return $this->building;
-    }
-
-    public function setBuilding(?Building $building): static
-    {
-        $this->building = $building;
-
-        return $this;
-    }
-
-    /**
-     * Bâtiment effectif d'un bovin : la case affectée si elle existe (logique
-     * historique), sinon le bâtiment direct (fed depuis l'XLSX initial).
-     */
-    #[Groups(['bovine:read', 'building_case:read'])]
-    public function getEffectiveBuilding(): ?Building
-    {
-        return $this->buildingCase?->getIdBuilding() ?? $this->building;
-    }
-
     public function getSupplier(): ?Supplier
     {
         return $this->supplier;
@@ -269,14 +240,14 @@ class Bovine
         return $this;
     }
 
-    public function getBovineType(): ?BovineType
+    public function getBreedCode(): ?string
     {
-        return $this->bovineType;
+        return $this->breedCode;
     }
 
-    public function setBovineType(?BovineType $bovineType): static
+    public function setBreedCode(?string $breedCode): static
     {
-        $this->bovineType = $bovineType;
+        $this->breedCode = $breedCode;
 
         return $this;
     }

src/Entity/BovineType.php

@@ -51,11 +51,11 @@ class BovineType
     private ?int $id = null;
 
     #[ORM\Column(length: 120)]
-    #[Groups(['bovine-type:read', 'bovine-type:write', 'reception:read', 'reception-bovine:read', 'bovine:read', 'building_case:read'])]
+    #[Groups(['bovine-type:read', 'bovine-type:write', 'reception:read', 'reception-bovine:read'])]
     private ?string $label = null;
 
     #[ORM\Column(length: 50)]
-    #[Groups(['bovine-type:read', 'bovine-type:write', 'reception:read', 'reception-bovine:read', 'bovine:read', 'building_case:read'])]
+    #[Groups(['bovine-type:read', 'bovine-type:write', 'reception:read', 'reception-bovine:read'])]
     private ?string $code = null;
 
     public function getId(): ?int

src/State/Bovin/BovineInventoryExportProvider.php

@@ -155,7 +155,7 @@ final class BovineInventoryExportProvider implements ProviderInterface
             $this->formatSex($bovine->getSex()),
             $this->formatDate($bovine->getBirthDate()),
             $bovine->getAgeMonths(),
-            $bovine->getBovineType()?->getLabel(),
+            $bovine->getBreedCode(),
             $bovine->getBuildingCase()?->getIdBuilding()?->getLabel(),
             $bovine->getBuildingCase()?->getCaseNumber(),
             $this->formatDate($bovine->getArrivalDate()),

src/State/Bovin/BovineSyncInventoryProcessor.php

@@ -8,7 +8,6 @@ use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
 use App\ApiResource\BovineSyncInventoryResult;
 use App\Entity\Bovine;
-use App\Entity\BovineType;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Malio\EdnotifBundle\Bovin\Api\BovinApiInterface;
@@ -19,11 +18,6 @@ use Malio\EdnotifBundle\Bovin\Dto\AnimalSummaryDto;
  */
 final class BovineSyncInventoryProcessor implements ProcessorInterface
 {
-    /**
-     * @var array<string, BovineType>
-     */
-    private array $bovineTypeCache = [];
-
     public function __construct(
         private BovinApiInterface $bovinApi,
         private EntityManagerInterface $em,
@@ -40,13 +34,6 @@ final class BovineSyncInventoryProcessor implements ProcessorInterface
         $result        = new BovineSyncInventoryResult();
         $result->total = count($inventory->animals);
 
-        $this->bovineTypeCache = [];
-        foreach ($this->em->getRepository(BovineType::class)->findAll() as $bovineType) {
-            if (null !== $bovineType->getCode()) {
-                $this->bovineTypeCache[$bovineType->getCode()] = $bovineType;
-            }
-        }
-
         $existingByNationalNumber = [];
         foreach ($this->em->getRepository(Bovine::class)->findAll() as $bovine) {
             $existingByNationalNumber[$bovine->getNationalNumber()] = $bovine;
@@ -96,7 +83,7 @@ final class BovineSyncInventoryProcessor implements ProcessorInterface
         $identification = $animal->identification;
         if (null !== $identification) {
             $bovine->setSex($identification->sex);
-            $bovine->setBovineType($this->resolveBovineType($identification->breedType));
+            $bovine->setBreedCode($identification->breedType);
             $bovine->setWorkNumber($identification->workNumber);
             $bovine->setBirthDate($identification->birthDate?->date);
         }
@@ -115,28 +102,4 @@ final class BovineSyncInventoryProcessor implements ProcessorInterface
         $bovine->setExitDate($latestExit);
         $bovine->refreshAgeMonths();
     }
-
-    /**
-     * Trouve un BovineType existant par code, sinon en crée un placeholder
-     * que l'admin pourra renommer dans /admin/bovin/bovin-list.
-     */
-    private function resolveBovineType(?string $code): ?BovineType
-    {
-        if (null === $code || '' === $code) {
-            return null;
-        }
-
-        if (isset($this->bovineTypeCache[$code])) {
-            return $this->bovineTypeCache[$code];
-        }
-
-        $bovineType = new BovineType();
-        $bovineType->setCode($code);
-        $bovineType->setLabel(sprintf('À renommer (%s)', $code));
-        $this->em->persist($bovineType);
-
-        $this->bovineTypeCache[$code] = $bovineType;
-
-        return $bovineType;
-    }
 }

src/State/Building/BuildingCaseWeightsReportProvider.php

@@ -65,7 +65,7 @@ final readonly class BuildingCaseWeightsReportProvider implements ProviderInterf
                 continue;
             }
 
-            $breedCode = $bovine->getBovineType()?->getCode();
+            $breedCode = $bovine->getBreedCode();
             if (null === $headerBreedCode && null !== $breedCode) {
                 $headerBreedCode = $breedCode;
             }