fix tests with fixtures #3610

MTES-MCT · Jan 30, 2025 · 278d57c · 278d57c
1 parent ee1aaf8
commit 278d57c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 22 deletions.
diff --git a/src/DataFixtures/Loader/LoadSuiviData.php b/src/DataFixtures/Loader/LoadSuiviData.php
@@ -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
+            signalement: $signalement,
+            description: $row['description'],
+            type: $row['type'],
+            isPublic: $row['is_public'],
+            user: $createdBy,
+            createdAt: $createdAt,
+            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())
-        );
-        if (isset($row['created_by'])) {
-            $suivi->setCreatedBy($this->userRepository->findOneBy(['email' => $row['created_by']]));
-        }
         $manager->persist($suivi);
     }
 

diff --git a/src/Manager/SuiviManager.php b/src/Manager/SuiviManager.php
@@ -42,18 +42,22 @@ public function createSuivi(
         int $type,
         bool $isPublic = false,
         ?User $user = null,
+        ?\DateTimeImmutable $createdAt = null,
         ?string $context = null,
         bool $sendMail = true,
         bool $flush = true,
     ): Suivi {
         $suivi = (new Suivi())
-        ->setCreatedBy($user)
-        ->setSignalement($signalement)
-        ->setDescription($this->htmlSanitizer->sanitize($description))
-        ->setType($type)
-        ->setIsPublic($isPublic)
-        ->setContext($context)
-        ->setSendMail($sendMail);
+            ->setCreatedBy($user)
+            ->setSignalement($signalement)
+            ->setDescription($this->htmlSanitizer->sanitize($description))
+            ->setType($type)
+            ->setIsPublic($isPublic)
+            ->setContext($context)
+            ->setSendMail($sendMail);
+        if (!empty($createdAt)) {
+            $suivi->setCreatedAt($createdAt);
+        }
         if ($flush) {
             $this->save($suivi);
         }

diff --git a/tests/Functional/Controller/Back/SignalementListControllerTest.php b/tests/Functional/Controller/Back/SignalementListControllerTest.php
@@ -188,8 +188,8 @@ public function provideNewFilterSearch(): \Generator
         yield 'Search by Procédure estimée' => [['procedure' => 'rsd', 'isImported' => 'oui'], 7];
         yield 'Search by Partenaires affectés' => [['partenaires' => ['5'], 'isImported' => 'oui'], 2];
         yield 'Search by Statut de la visite' => [['visiteStatus' => 'Planifiée', 'isImported' => 'oui'], 5];
-        yield 'Search by Type de dernier suivi' => [['typeDernierSuivi' => 'automatique', 'isImported' => 'oui'], 33];
-        yield 'Search by Date de dernier suivi' => [['dateDernierSuiviDebut' => '2023-04-01', 'dateDernierSuiviFin' => '2023-04-18', 'isImported' => 'oui'], 2];
+        yield 'Search by Type de dernier suivi' => [['typeDernierSuivi' => 'automatique', 'isImported' => 'oui'], 34];
+        yield 'Search by Date de dernier suivi' => [['dateDernierSuiviDebut' => '2023-04-01', 'dateDernierSuiviFin' => '2023-04-18', 'isImported' => 'oui'], 3];
         yield 'Search by Statut de l\'affectation' => [['statusAffectation' => 'refuse', 'isImported' => 'oui'], 1];
         yield 'Search by Score criticite' => [['criticiteScoreMin' => 5, 'criticiteScoreMax' => 6, 'isImported' => 'oui'], 9];
         yield 'Search by Declarant' => [['typeDeclarant' => 'locataire', 'isImported' => 'oui'], 47];

diff --git a/tests/Functional/Service/Notification/NotificationCounterTest.php b/tests/Functional/Service/Notification/NotificationCounterTest.php
@@ -27,6 +27,6 @@ public function testCountUnseenNotification(): void
 
         $user = $userRepository->findOneBy(['email' => '[email protected]']);
         $notificationCount = (new NotificationCounter($notificationRepository))->countUnseenNotification($user);
-        $this->assertEquals(7, $notificationCount);
+        $this->assertEquals(9, $notificationCount);
     }
 }