fix tests #3610

MTES-MCT · Jan 30, 2025 · 1f5f0d9 · 1f5f0d9
1 parent 1849e8e
commit 1f5f0d9
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 17 deletions.
diff --git a/src/DataFixtures/Loader/LoadSuiviData.php b/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;

diff --git a/src/Entity/Notification.php b/src/Entity/Notification.php
@@ -32,7 +32,7 @@ class Notification
     #[ORM\ManyToOne(targetEntity: Signalement::class)]
     private ?Signalement $signalement;
 
-    #[ORM\ManyToOne(targetEntity: Suivi::class)]
+    #[ORM\ManyToOne(targetEntity: Suivi::class, cascade: ['persist'])]
     #[ORM\JoinColumn(onDelete: 'CASCADE')]
     private ?Suivi $suivi;
 

diff --git a/src/Entity/Tag.php b/src/Entity/Tag.php
@@ -26,7 +26,7 @@ class Tag implements EntityHistoryInterface
     #[Groups(['widget-settings:read'])]
     private ?int $id = null;
 
-    #[ORM\ManyToMany(targetEntity: Signalement::class, mappedBy: 'tags')]
+    #[ORM\ManyToMany(targetEntity: Signalement::class, mappedBy: 'tags', cascade: ['persist'])]
     private Collection $signalements;
 
     #[ORM\Column(type: 'string', length: 255)]

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'], 34];
-        yield 'Search by Date de dernier suivi' => [['dateDernierSuiviDebut' => '2023-04-01', 'dateDernierSuiviFin' => '2023-04-18', 'isImported' => 'oui'], 3];
+        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 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(9, $notificationCount);
+        $this->assertEquals(7, $notificationCount);
     }
 }
diff --git a/tests/Unit/Command/ImportSignalementCommandTest.php b/tests/Unit/Command/ImportSignalementCommandTest.php
@@ -8,7 +8,6 @@
 use App\Service\Import\CsvParser;
 use App\Service\Import\Signalement\SignalementImportLoader;
 use App\Service\UploadHandlerService;
-use Doctrine\Common\EventManager;
 use Doctrine\ORM\EntityManager;
 use League\Flysystem\FilesystemOperator;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
@@ -40,11 +39,6 @@ public function testDisplaySuccessfullyMessage()
             ->with(Territory::class)
             ->willReturn($territoryRepository);
 
-        $eventManager = $this->createMock(EventManager::class);
-        $entityManager->expects($this->atLeast(1))
-            ->method('getEventManager')
-            ->willReturn($eventManager);
-
         $uploadHandlerService = $this->createMock(UploadHandlerService::class);
         $uploadHandlerService->expects($this->once())
             ->method('createTmpFileFromBucket');
@@ -169,11 +163,6 @@ public function testFileDoesNotExist()
             ->with(Territory::class)
             ->willReturn($territoryRepository);
 
-        $eventManager = $this->createMock(EventManager::class);
-        $entityManager->expects($this->atLeast(1))
-            ->method('getEventManager')
-            ->willReturn($eventManager);
-
         $uploadHandlerService = $this->createMock(UploadHandlerService::class);
         $signalementImportLoader = $this->createMock(SignalementImportLoader::class);
         $csvParser = $this->createMock(CsvParser::class);