[QA] Suppression de ActivityListener

src/Command/ImportSignalementCommand.php

@@ -3,12 +3,10 @@
 namespace App\Command;
 
 use App\Entity\Territory;
-use App\EventListener\ActivityListener;
 use App\Service\Import\CsvParser;
 use App\Service\Import\Signalement\SignalementImportLoader;
 use App\Service\UploadHandlerService;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Events;
 use Doctrine\ORM\NonUniqueResultException;
 use League\Flysystem\FilesystemException;
 use League\Flysystem\FilesystemOperator;
@@ -57,8 +55,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return Command::FAILURE;
         }
 
-        $this->removeEventListener();
-
         $fromFile = 'csv/signalement_'.$territoryZip.'.csv';
         $toFile = $this->parameterBag->get('uploads_tmp_dir').'signalement.csv';
         if (!$this->fileStorage->fileExists($fromFile)) {
@@ -107,19 +103,4 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         return Command::SUCCESS;
     }
-
-    private function removeEventListener(): void
-    {
-        $eventManager = $this->entityManager->getEventManager();
-
-        $eventsToCheck = [Events::onFlush, Events::preRemove];
-
-        foreach ($eventsToCheck as $event) {
-            foreach ($eventManager->getListeners($event) as $listener) {
-                if ($listener instanceof ActivityListener) {
-                    $eventManager->removeEventListener([$event], $listener);
-                }
-            }
-        }
-    }
 }

src/Controller/Back/SignalementActionController.php

@@ -134,7 +134,7 @@ public function addSuiviSignalement(
 
             $this->addFlash('success', 'Suivi publié avec succès !');
         } else {
-            $this->addFlash('error', 'Une erreur est survenue lors de la publication.');
+            $this->addFlash('error', 'Une erreur de jeton est survenue lors de la publication.');
         }
 
         return $this->redirect(

src/DataFixtures/Loader/LoadSuiviData.php

@@ -35,7 +35,6 @@ public function load(ObjectManager $manager): void
 
         $second = 1;
         foreach ($signalements as $signalement) {
-            $createdAtUpdated = $signalement->getCreatedAt()->modify('+'.$second.' second');
             $suivi = $this->suiviManager->createSuivi(
                 user: $this->userRepository->findOneBy(['email' => $this->parameterBag->get('user_system_email')]),
                 signalement: $signalement,
@@ -44,6 +43,7 @@ public function load(ObjectManager $manager): void
                 isPublic: true,
                 flush: false,
             );
+            $createdAtUpdated = $signalement->getCreatedAt()->modify('+'.$second.' second');
             $suivi->setCreatedAt($createdAtUpdated);
             $manager->persist($suivi);
             ++$second;
@@ -63,20 +63,23 @@ public function load(ObjectManager $manager): void
     public function loadSuivi(ObjectManager $manager, array $row): void
     {
         $signalement = $this->signalementRepository->findOneBy(['reference' => $row['signalement']]);
+        $createdBy = isset($row['created_by']) ? $this->userRepository->findOneBy(['email' => $row['created_by']]) : null;
+        $createdAt = new \DateTimeImmutable();
+        if (isset($row['created_at'])) {
+            $createdAt = new \DateTimeImmutable($row['created_at']);
+        } elseif (Suivi::TYPE_USAGER_POST_CLOTURE === $row['type']) {
+            $createdAt = $signalement->getClosedAt()->modify('+3 days');
+        }
+
         $suivi = $this->suiviManager->createSuivi(
-            signalement : $signalement,
-            description : $row['description'],
-            type : $row['type'],
-            isPublic : $row['is_public'],
-            flush: false
-        );
-        $suivi->setCreatedAt(
-            isset($row['created_at']) ? new \DateTimeImmutable($row['created_at']) :
-            (Suivi::TYPE_USAGER_POST_CLOTURE === $row['type'] ? $signalement->getClosedAt()->modify('+3 days') : new \DateTimeImmutable())
+            signalement: $signalement,
+            description: $row['description'],
+            type: $row['type'],
+            isPublic: $row['is_public'],
+            user: $createdBy,
+            createdAt: $createdAt,
+            flush: false,
         );
-        if (isset($row['created_by'])) {
-            $suivi->setCreatedBy($this->userRepository->findOneBy(['email' => $row['created_by']]));
-        }
         $manager->persist($suivi);
     }
 

src/Event/SuiviCreatedEvent.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Event;
+
+use App\Entity\Suivi;
+use Symfony\Contracts\EventDispatcher\Event;
+
+class SuiviCreatedEvent extends Event
+{
+    public const NAME = 'suivi.created';
+
+    public function __construct(private Suivi $suivi)
+    {
+    }
+
+    public function getSuivi(): ?Suivi
+    {
+        return $this->suivi;
+    }
+}