Merge branch 'develop' into feat/vie-du-bovin

- infrastructure/case : clic ligne → /bovine/{id}, bouton Ajouter retiré, row-clickable ouvert à tous
- infrastructure/bovine.vue supprimée (création/édition de bovin gérée via EDNOTIF)
- bouton précédent de la page Vie du bovin : router.back avec fallback /inventory

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

CHANGELOG.md

@@ -66,8 +66,6 @@ Ajouter dans le fichier .env du frontend
 * [#FER-17] Ecran d'ajout de bovin
 * [#FER-18] Mise à jour du tableau d'arrivage
 * [#FER-26] Passeport du bovin
-* [#FER-27] Fix export inventaire bovin
-* [#FER-25] Ajout un cron pour la synchro de l'inventaire bovin
 
 ### Changed
 

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.103'
+    app.version: '0.0.99'

frontend/pages/bovine/[id].vue

@@ -194,6 +194,7 @@ interface BovineMovementData {
     enteredAt: string
     leftAt: string | null
     buildingCase: BuildingCaseRef | null
+    building: BuildingRef | null
 }
 
 interface BovinePassportData {
@@ -300,7 +301,7 @@ const movementRows = computed(() => {
     const list = bovine.value?.movements ?? []
     return list.map(m => ({
         id: m.id,
-        building: m.buildingCase?.building?.label ?? '—',
+        building: m.buildingCase?.building?.label ?? m.building?.label ?? '—',
         case: m.buildingCase?.caseNumber != null ? `Case ${m.buildingCase.caseNumber}` : '—',
         enteredAt: formatDate(m.enteredAt),
         leftAt: m.leftAt ? formatDate(m.leftAt) : null,

frontend/pages/inventory.vue

@@ -125,7 +125,7 @@
                     {{ formatDate(item.arrivalDate) }}
                 </template>
                 <template #cell-buildingCase.building.label="{ item }">
-                    {{ item.buildingCase?.building?.label ?? '—' }}
+                    {{ item.effectiveBuilding?.label ?? '—' }}
                 </template>
                 <template #cell-buildingCase.caseNumber="{ item }">
                     {{ item.buildingCase?.caseNumber ?? '—' }}

frontend/services/bovine.ts

@@ -9,3 +9,34 @@ export async function createBovine(payload: BovinePayload) {
         toastSuccessKey: 'success.bovine.create'
     })
 }
+
+export async function createBovines(nationalNumbers: string[]): Promise<{ created: BovineData[]; errors: string[] }> {
+    const created: BovineData[] = []
+    const errors: string[] = []
+
+    for (const nationalNumber of nationalNumbers) {
+        try {
+            const bovine = await createBovine({ nationalNumber })
+            if (bovine) {
+                created.push(bovine)
+            }
+        } catch {
+            errors.push(nationalNumber)
+        }
+    }
+
+    return { created, errors }
+}
+
+export async function getBovine(id: number) {
+    const api = useApi()
+    return api.get<BovineData>(`bovines/${id}`)
+}
+
+export async function updateBovine(id: number, payload: BovinePayload) {
+    const api = useApi()
+    return api.patch<BovineData>(`bovines/${id}`, payload, {
+        toastErrorKey: 'errors.bovine.update',
+        toastSuccessKey: 'success.bovine.update'
+    })
+}

frontend/services/dto/bovine-data.ts

@@ -16,6 +16,8 @@ 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
@@ -27,5 +29,9 @@ export interface BovineData {
 
 export type BovinePayload = {
     nationalNumber?: string
+    receivedWeight?: number | null
+    pricePerKg?: number | null
+    arrivalDate?: string | null
     buildingCase?: string | null
+    supplier?: string | null
 }

src/Command/BackfillBovineMovementsCommand.php

@@ -0,0 +1,93 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Command;
+
+use App\Entity\Bovine;
+use App\Entity\BovineMovement;
+use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+use function count;
+
+#[AsCommand(
+    name: 'app:backfill-bovine-movements',
+    description: 'Crée un mouvement initial pour chaque bovin ayant une case ou un bâtiment mais aucun mouvement enregistré.'
+)]
+class BackfillBovineMovementsCommand extends Command
+{
+    private const FLUSH_EVERY = 100;
+
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+    ) {
+        parent::__construct();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $io = new SymfonyStyle($input, $output);
+
+        $bovines = $this->entityManager->createQueryBuilder()
+            ->select('b')
+            ->from(Bovine::class, 'b')
+            ->where('b.buildingCase IS NOT NULL OR b.building IS NOT NULL')
+            ->andWhere('NOT EXISTS (SELECT 1 FROM '.BovineMovement::class.' m WHERE m.bovine = b)')
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $total = count($bovines);
+        if (0 === $total) {
+            $io->success('Aucun bovin à backfiller.');
+
+            return Command::SUCCESS;
+        }
+
+        $io->info(sprintf('%d bovin(s) à backfiller.', $total));
+
+        $now      = new DateTimeImmutable();
+        $created  = 0;
+        $fallback = 0;
+
+        foreach ($bovines as $i => $bovine) {
+            $movement = new BovineMovement();
+            $movement->setBovine($bovine);
+
+            if (null !== $bovine->getBuildingCase()) {
+                $movement->setBuildingCase($bovine->getBuildingCase());
+            } else {
+                $movement->setBuilding($bovine->getBuilding());
+            }
+
+            $enteredAt = $bovine->getArrivalDate();
+            if (null === $enteredAt) {
+                $enteredAt = $now;
+                ++$fallback;
+            }
+            $movement->setEnteredAt($enteredAt);
+
+            $this->entityManager->persist($movement);
+            ++$created;
+
+            if (0 === ($i + 1) % self::FLUSH_EVERY) {
+                $this->entityManager->flush();
+            }
+        }
+
+        $this->entityManager->flush();
+
+        $io->success(sprintf('%d mouvement(s) créé(s).', $created));
+        if ($fallback > 0) {
+            $io->warning(sprintf("%d bovin(s) sans date d'arrivée → enteredAt = maintenant.", $fallback));
+        }
+
+        return Command::SUCCESS;
+    }
+}

src/Command/FeedBovinePricesCommand.php

@@ -0,0 +1,215 @@
+<?php
+
+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;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Throwable;
+
+#[AsCommand(
+    name: 'app:feed-bovine-prices',
+    description: 'Met à jour le poids, le prix au kilo et le fournisseur des bovins existants depuis un fichier XLSX.'
+)]
+final class FeedBovinePricesCommand extends Command
+{
+    public function __construct(
+        private EntityManagerInterface $em,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->addArgument('file', InputArgument::REQUIRED, 'Chemin absolu vers le fichier XLSX')
+            ->addOption('dry-run', null, InputOption::VALUE_NONE, 'Simule sans persister en BDD')
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $io     = new SymfonyStyle($input, $output);
+        $file   = (string) $input->getArgument('file');
+        $dryRun = (bool) $input->getOption('dry-run');
+
+        if (!file_exists($file)) {
+            $io->error(sprintf('Fichier introuvable : %s', $file));
+
+            return Command::FAILURE;
+        }
+
+        $io->title('Feed bovins depuis '.basename($file));
+        if ($dryRun) {
+            $io->warning('Dry-run activé : aucune écriture en BDD.');
+        }
+
+        try {
+            $spreadsheet = IOFactory::load($file);
+        } catch (Throwable $e) {
+            $io->error('Impossible de lire le fichier : '.$e->getMessage());
+
+            return Command::FAILURE;
+        }
+
+        $sheet      = $spreadsheet->getActiveSheet();
+        $highestRow = $sheet->getHighestRow();
+
+        // Pré-chargement des fournisseurs pour des lookups rapides (insensible casse).
+        $supplierByName = [];
+        foreach ($this->em->getRepository(Supplier::class)->findAll() as $supplier) {
+            $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 = [
+            'total'           => 0,
+            'updated'         => 0,
+            'notFound'        => 0,
+            'invalid'         => 0,
+            'supplierMissing' => 0,
+            'buildingMissing' => 0,
+        ];
+        $missingNationalNumbers = [];
+        $missingSuppliers       = [];
+        $missingBuildings       = [];
+
+        $io->progressStart($highestRow);
+        for ($row = 1; $row <= $highestRow; ++$row) {
+            ++$stats['total'];
+
+            $rawNationalNumber = (string) ($sheet->getCell([1, $row])->getValue() ?? '');
+            $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) {
+                ++$stats['invalid'];
+                $io->progressAdvance();
+
+                continue;
+            }
+
+            // Garde : strip "FR" + espace optionnel uniquement s'il est présent.
+            $nationalNumber = preg_replace('/^FR\s*/i', '', $rawNationalNumber);
+
+            $bovine = $bovineRepo->findOneBy(['nationalNumber' => $nationalNumber]);
+            if (null === $bovine) {
+                ++$stats['notFound'];
+                $missingNationalNumbers[] = $nationalNumber;
+                $io->progressAdvance();
+
+                continue;
+            }
+
+            // Lookup supplier (peut être null si introuvable ou colonne vide).
+            $supplier     = null;
+            $supplierName = mb_strtoupper(trim($rawSupplier));
+            if ('' !== $supplierName) {
+                $supplier = $supplierByName[$supplierName] ?? null;
+                if (null === $supplier) {
+                    ++$stats['supplierMissing'];
+                    $missingSuppliers[$supplierName] = ($missingSuppliers[$supplierName] ?? 0) + 1;
+                }
+            }
+
+            $weight = is_numeric($rawWeight) ? (int) $rawWeight : null;
+            $price  = is_numeric($rawPrice) ? (float) $rawPrice : null;
+
+            if (null !== $weight) {
+                $bovine->setReceivedWeight($weight);
+            }
+            if (null !== $price) {
+                $bovine->setPricePerKg($price);
+            }
+            $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();
+        }
+        $io->progressFinish();
+
+        if (!$dryRun) {
+            $this->em->flush();
+        }
+
+        $io->section('Résultats');
+        $io->table(
+            ['Métrique', 'Valeur'],
+            [
+                ['Lignes totales', $stats['total']],
+                ['Bovins mis à jour', $stats['updated']],
+                ['Bovins introuvables', $stats['notFound']],
+                ['Lignes invalides', $stats['invalid']],
+                ['Fournisseurs introuvables (supplier=null)', $stats['supplierMissing']],
+                ['Bâtiments introuvables (building non set)', $stats['buildingMissing']],
+            ]
+        );
+
+        if ([] !== $missingNationalNumbers) {
+            $preview = array_slice($missingNationalNumbers, 0, 10);
+            $io->warning(sprintf(
+                '%d bovin(s) introuvable(s). Aperçu : %s%s',
+                count($missingNationalNumbers),
+                implode(', ', $preview),
+                count($missingNationalNumbers) > 10 ? '…' : '',
+            ));
+        }
+
+        if ([] !== $missingSuppliers) {
+            $list = [];
+            foreach ($missingSuppliers as $name => $count) {
+                $list[] = sprintf('%s (%d)', $name, $count);
+            }
+            $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 {
+            $io->success('Feed terminé avec succès.');
+        }
+
+        return Command::SUCCESS;
+    }
+}

src/Command/SyncBovineInventoryCommand.php

@@ -1,49 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Command;
-
-use App\Service\BovineInventorySyncer;
-use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-use Throwable;
-
-#[AsCommand(
-    name: 'app:sync-bovine-inventory',
-    description: "Synchronise l'inventaire bovin avec EDNOTIF (équivalent du bouton Rafraîchir de l'interface)."
-)]
-final class SyncBovineInventoryCommand extends Command
-{
-    public function __construct(
-        private readonly BovineInventorySyncer $syncer,
-    ) {
-        parent::__construct();
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $io = new SymfonyStyle($input, $output);
-
-        try {
-            $result = $this->syncer->sync();
-        } catch (Throwable $e) {
-            $io->error(sprintf('Échec de la synchronisation : %s', $e->getMessage()));
-
-            return Command::FAILURE;
-        }
-
-        $io->success(sprintf(
-            'Inventaire synchronisé · Créés : %d · Mis à jour : %d · Sortis : %d · Total EDNOTIF : %d',
-            $result->created,
-            $result->updated,
-            $result->exited,
-            $result->total,
-        ));
-
-        return Command::SUCCESS;
-    }
-}

src/Entity/Bovine.php

@@ -96,6 +96,11 @@ 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;
@@ -239,6 +244,28 @@ 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;

src/Entity/BovineMovement.php

@@ -44,6 +44,11 @@ class BovineMovement
     #[ApiProperty(readableLink: true)]
     private ?BuildingCase $buildingCase = null;
 
+    #[ORM\ManyToOne]
+    #[Groups(['bovine:read'])]
+    #[ApiProperty(readableLink: true)]
+    private ?Building $building = null;
+
     #[ORM\Column(type: 'datetime_immutable')]
     #[Groups(['bovine:read', 'bovine_movement:write'])]
     private DateTimeImmutable $enteredAt;
@@ -81,6 +86,18 @@ class BovineMovement
         return $this;
     }
 
+    public function getBuilding(): ?Building
+    {
+        return $this->building;
+    }
+
+    public function setBuilding(?Building $building): static
+    {
+        $this->building = $building;
+
+        return $this;
+    }
+
     public function getEnteredAt(): DateTimeImmutable
     {
         return $this->enteredAt;

src/Service/BovineInventorySyncer.php

@@ -1,138 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service;
-
-use App\ApiResource\BovineSyncInventoryResult;
-use App\Entity\Bovine;
-use App\Entity\BovineType;
-use DateTimeImmutable;
-use Doctrine\ORM\EntityManagerInterface;
-use Malio\EdnotifBundle\Bovin\Api\BovinApiInterface;
-use Malio\EdnotifBundle\Bovin\Dto\AnimalSummaryDto;
-
-final class BovineInventorySyncer
-{
-    /**
-     * @var array<string, BovineType>
-     */
-    private array $bovineTypeCache = [];
-
-    public function __construct(
-        private readonly BovinApiInterface $bovinApi,
-        private readonly EntityManagerInterface $em,
-    ) {}
-
-    public function sync(): BovineSyncInventoryResult
-    {
-        $inventory = $this->bovinApi->getInventory(new DateTimeImmutable('today'));
-
-        $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;
-        }
-
-        $seen = [];
-        foreach ($inventory->animals as $animal) {
-            $nationalNumber = $animal->identification?->bovin?->nationalNumber;
-            if (null === $nationalNumber || '' === $nationalNumber) {
-                continue;
-            }
-            $seen[$nationalNumber] = true;
-
-            if (isset($existingByNationalNumber[$nationalNumber])) {
-                $bovine = $existingByNationalNumber[$nationalNumber];
-                ++$result->updated;
-            } else {
-                $bovine = new Bovine();
-                $bovine->setNationalNumber($nationalNumber);
-                $this->em->persist($bovine);
-                ++$result->created;
-            }
-
-            $this->applyEdnotifData($bovine, $animal);
-            $bovine->setExitedAt(null);
-        }
-
-        $now = new DateTimeImmutable();
-        foreach ($existingByNationalNumber as $nationalNumber => $bovine) {
-            if (isset($seen[$nationalNumber])) {
-                continue;
-            }
-            if (null !== $bovine->getExitedAt()) {
-                continue;
-            }
-            $bovine->setExitedAt($now);
-            ++$result->exited;
-        }
-
-        $this->em->flush();
-
-        return $result;
-    }
-
-    private function applyEdnotifData(Bovine $bovine, AnimalSummaryDto $animal): void
-    {
-        $identification = $animal->identification;
-        if (null !== $identification) {
-            $bovine->setSex($identification->sex);
-            $bovine->setBovineType($this->resolveBovineType($identification->breedType));
-            $bovine->setWorkNumber($identification->workNumber);
-            $bovine->setBirthDate($identification->birthDate?->date);
-
-            $bovine->setMotherNationalNumber($identification->motherCarrier?->bovin?->nationalNumber);
-            $bovine->setMotherBovineType($this->resolveBovineType($identification->motherCarrier?->breedType));
-            $bovine->setFatherNationalNumber($identification->fatherIpg?->bovin?->nationalNumber);
-            $bovine->setFatherBovineType($this->resolveBovineType($identification->fatherIpg?->breedType));
-        }
-
-        $latestEntry = null;
-        $latestExit  = null;
-        foreach ($animal->presencePeriods as $period) {
-            if (null !== $period->entry?->date && (null === $latestEntry || $period->entry->date > $latestEntry)) {
-                $latestEntry = $period->entry->date;
-            }
-            if (null !== $period->exit?->date && (null === $latestExit || $period->exit->date > $latestExit)) {
-                $latestExit = $period->exit->date;
-            }
-        }
-        $bovine->setArrivalDate($latestEntry);
-        $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/Bovin/BovineInventoryExportProvider.php

@@ -18,15 +18,13 @@ use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
-use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
-use Throwable;
 
 /**
  * @implements ProviderInterface<Response>
  */
-final readonly class BovineInventoryExportProvider implements ProviderInterface
+final class BovineInventoryExportProvider implements ProviderInterface
 {
     private const FARM_NAME = 'FERME SCEA LES NAUDS';
 
@@ -72,7 +70,6 @@ final readonly class BovineInventoryExportProvider implements ProviderInterface
     public function __construct(
         private BovineRepository $bovineRepository,
         private RequestStack $requestStack,
-        private LoggerInterface $logger,
     ) {}
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): Response
@@ -256,16 +253,7 @@ final readonly class BovineInventoryExportProvider implements ProviderInterface
         // Lignes de données
         $rowNumber = 5;
         foreach ($bovines as $bovine) {
-            try {
-                $this->writeBovineRow($sheet, $rowNumber, $bovine);
-            } catch (Throwable $e) {
-                $this->logger->warning('Export inventaire bovin : ligne ignorée suite à une erreur.', [
-                    'bovineId'       => $bovine->getId(),
-                    'nationalNumber' => $bovine->getNationalNumber(),
-                    'row'            => $rowNumber,
-                    'exception'      => $e,
-                ]);
-            }
+            $this->writeBovineRow($sheet, $rowNumber, $bovine);
             ++$rowNumber;
         }
 
@@ -288,7 +276,7 @@ final readonly class BovineInventoryExportProvider implements ProviderInterface
         $type     = $bovine->getBovineType();
         $isLim    = self::BREED_CODE_LIMOUSINE === $type?->getCode();
         $isCharo  = self::BREED_CODE_CHAROLAISE === $type?->getCode();
-        $building = $bovine->getBuildingCase()?->getIdBuilding();
+        $building = $bovine->getBuildingCase()?->getIdBuilding() ?? $bovine->getBuilding();
         $code     = $building?->getCode();
 
         $sheet->setCellValue('A'.$row, $isLim ? 'X' : '');
@@ -296,25 +284,22 @@ final readonly class BovineInventoryExportProvider implements ProviderInterface
             ? (int) $bovine->getWorkNumber()
             : ($bovine->getWorkNumber() ?? ''));
         $sheet->setCellValue('C'.$row, $isCharo ? 'X' : '');
-        $national = $bovine->getNationalNumber();
-        $sheet->setCellValue('D'.$row, '' === $national ? '' : 'FR '.$national);
+        $sheet->setCellValue('D'.$row, 'FR '.$bovine->getNationalNumber());
         $sheet->setCellValue('E'.$row, 'B1' === $code ? 'X' : '');
         $sheet->setCellValue('F'.$row, 'B2' === $code ? 'X' : '');
         $sheet->setCellValue('G'.$row, 'B3' === $code ? 'X' : '');
         $sheet->setCellValue('H'.$row, $bovine->getBuildingCase()?->getCaseNumber() ?? '');
         $sheet->setCellValue('I'.$row, $bovine->getSupplier()?->getName() ?? '');
 
-        $birth        = $bovine->getBirthDate();
-        $arrival      = $bovine->getArrivalDate();
-        $birthExcel   = $this->safePhpToExcel($birth);
-        $arrivalExcel = $this->safePhpToExcel($arrival);
-        if (null !== $birthExcel) {
-            $sheet->setCellValue('J'.$row, $birthExcel);
+        $birth   = $bovine->getBirthDate();
+        $arrival = $bovine->getArrivalDate();
+        if (null !== $birth) {
+            $sheet->setCellValue('J'.$row, ExcelDate::PHPToExcel($birth));
         }
-        if (null !== $arrivalExcel) {
-            $sheet->setCellValue('K'.$row, $arrivalExcel);
+        if (null !== $arrival) {
+            $sheet->setCellValue('K'.$row, ExcelDate::PHPToExcel($arrival));
         }
-        if (null !== $birth && null !== $arrival && $birth <= $arrival) {
+        if (null !== $birth && null !== $arrival) {
             $diff = $birth->diff($arrival);
             $sheet->setCellValue('L'.$row, ($diff->y * 12) + $diff->m);
         }
@@ -358,24 +343,6 @@ final readonly class BovineInventoryExportProvider implements ProviderInterface
         }
     }
 
-    /**
-     * Convertit une date PHP en numéro de série Excel, ou null si la date est absente / hors plage Excel (< 1900).
-     */
-    private function safePhpToExcel(?DateTimeImmutable $date): ?float
-    {
-        if (null === $date) {
-            return null;
-        }
-
-        try {
-            $value = ExcelDate::PHPToExcel($date);
-        } catch (Throwable) {
-            return null;
-        }
-
-        return is_float($value) ? $value : null;
-    }
-
     /**
      * Sous-titre dynamique selon les tranches d'âge cochées.
      *

src/State/Bovin/BovineMovementProcessor.php

@@ -28,6 +28,7 @@ final class BovineMovementProcessor implements ProcessorInterface
         $enteredAt = $data->hasEnteredAt() ? $data->getEnteredAt() : new DateTimeImmutable();
         $data->setEnteredAt($enteredAt);
         $data->setLeftAt(null);
+        $data->setBuilding(null);
 
         $bovine = $data->getBovine();
 

src/State/Bovin/BovineSyncInventoryProcessor.php

@@ -7,15 +7,26 @@ namespace App\State\Bovin;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
 use App\ApiResource\BovineSyncInventoryResult;
-use App\Service\BovineInventorySyncer;
+use App\Entity\Bovine;
+use App\Entity\BovineType;
+use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
+use Malio\EdnotifBundle\Bovin\Api\BovinApiInterface;
+use Malio\EdnotifBundle\Bovin\Dto\AnimalSummaryDto;
 
 /**
  * @implements ProcessorInterface<mixed, BovineSyncInventoryResult>
  */
-final readonly class BovineSyncInventoryProcessor implements ProcessorInterface
+final class BovineSyncInventoryProcessor implements ProcessorInterface
 {
+    /**
+     * @var array<string, BovineType>
+     */
+    private array $bovineTypeCache = [];
+
     public function __construct(
-        private BovineInventorySyncer $syncer,
+        private BovinApiInterface $bovinApi,
+        private EntityManagerInterface $em,
     ) {}
 
     public function process(
@@ -24,6 +35,113 @@ final readonly class BovineSyncInventoryProcessor implements ProcessorInterface
         array $uriVariables = [],
         array $context = [],
     ): BovineSyncInventoryResult {
-        return $this->syncer->sync();
+        $inventory = $this->bovinApi->getInventory(new DateTimeImmutable('today'));
+
+        $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;
+        }
+
+        $seen = [];
+        foreach ($inventory->animals as $animal) {
+            $nationalNumber = $animal->identification?->bovin?->nationalNumber;
+            if (null === $nationalNumber || '' === $nationalNumber) {
+                continue;
+            }
+            $seen[$nationalNumber] = true;
+
+            if (isset($existingByNationalNumber[$nationalNumber])) {
+                $bovine = $existingByNationalNumber[$nationalNumber];
+                ++$result->updated;
+            } else {
+                $bovine = new Bovine();
+                $bovine->setNationalNumber($nationalNumber);
+                $this->em->persist($bovine);
+                ++$result->created;
+            }
+
+            $this->applyEdnotifData($bovine, $animal);
+            $bovine->setExitedAt(null);
+        }
+
+        $now = new DateTimeImmutable();
+        foreach ($existingByNationalNumber as $nationalNumber => $bovine) {
+            if (isset($seen[$nationalNumber])) {
+                continue;
+            }
+            if (null !== $bovine->getExitedAt()) {
+                continue;
+            }
+            $bovine->setExitedAt($now);
+            ++$result->exited;
+        }
+
+        $this->em->flush();
+
+        return $result;
+    }
+
+    private function applyEdnotifData(Bovine $bovine, AnimalSummaryDto $animal): void
+    {
+        $identification = $animal->identification;
+        if (null !== $identification) {
+            $bovine->setSex($identification->sex);
+            $bovine->setBovineType($this->resolveBovineType($identification->breedType));
+            $bovine->setWorkNumber($identification->workNumber);
+            $bovine->setBirthDate($identification->birthDate?->date);
+
+            $bovine->setMotherNationalNumber($identification->motherCarrier?->bovin?->nationalNumber);
+            $bovine->setMotherBovineType($this->resolveBovineType($identification->motherCarrier?->breedType));
+            $bovine->setFatherNationalNumber($identification->fatherIpg?->bovin?->nationalNumber);
+            $bovine->setFatherBovineType($this->resolveBovineType($identification->fatherIpg?->breedType));
+        }
+
+        $latestEntry = null;
+        $latestExit  = null;
+        foreach ($animal->presencePeriods as $period) {
+            if (null !== $period->entry?->date && (null === $latestEntry || $period->entry->date > $latestEntry)) {
+                $latestEntry = $period->entry->date;
+            }
+            if (null !== $period->exit?->date && (null === $latestExit || $period->exit->date > $latestExit)) {
+                $latestExit = $period->exit->date;
+            }
+        }
+        $bovine->setArrivalDate($latestEntry);
+        $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;
     }
 }