fix tests with fixtures #3610

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

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/EventSubscriber/SuiviCreatedSubscriber.php b/src/EventSubscriber/SuiviCreatedSubscriber.php
@@ -32,13 +32,15 @@ public function onSuiviCreated(SuiviCreatedEvent $event): void
         }
 
         if (Signalement::STATUS_DRAFT === $suivi->getSignalement()->getStatut()
-                || Signalement::STATUS_CLOSED === $suivi->getSignalement()->getStatut()
                 || Signalement::STATUS_ARCHIVED === $suivi->getSignalement()->getStatut()) {
             return;
         }
 
         if (Suivi::CONTEXT_NOTIFY_USAGER_ONLY !== $suivi->getContext()) {
-            $this->notificationAndMailSender->sendNewSuiviToAdminsAndPartners($suivi);
+            $this->notificationAndMailSender->sendNewSuiviToAdminsAndPartners(
+                suivi: $suivi,
+                sendEmail: (Signalement::STATUS_CLOSED !== $suivi->getSignalement()->getStatut())
+            );
         }
 
         if ($suivi->getSendMail()

diff --git a/src/Service/NotificationAndMailSender.php b/src/Service/NotificationAndMailSender.php
@@ -56,9 +56,9 @@ public function sendNewAffectation(Affectation $affectation): void
         $this->send($mailerType, $recipients);
     }
 
-    public function sendNewSuiviToAdminsAndPartners(Suivi $suivi): void
+    public function sendNewSuiviToAdminsAndPartners(Suivi $suivi, bool $sendEmail): void
     {
-        $mailerType = NotificationMailerType::TYPE_NEW_COMMENT_BACK;
+        $mailerType = $sendEmail ? NotificationMailerType::TYPE_NEW_COMMENT_BACK : null;
         $this->suivi = $suivi;
         $this->signalement = $suivi->getSignalement();
         $territory = $this->signalement->getTerritory();
@@ -102,7 +102,7 @@ public function sendNewSuiviToUsagers(Suivi $suivi): void
         }
     }
 
-    private function send(NotificationMailerType $notificationMailerType, ArrayCollection $recipients, bool $isInAppNotificationCreated = false): void
+    private function send(?NotificationMailerType $notificationMailerType, ArrayCollection $recipients, bool $isInAppNotificationCreated = false): void
     {
         if ($isInAppNotificationCreated) {
             foreach ($recipients as $user) {
@@ -113,7 +113,9 @@ private function send(NotificationMailerType $notificationMailerType, ArrayColle
             $this->entityManager->flush();
         }
 
-        $this->sendMail($recipients, $notificationMailerType);
+        if ($notificationMailerType) {
+            $this->sendMail($recipients, $notificationMailerType);
+        }
     }
 
     private function createInAppNotification($user): void
@@ -223,13 +225,12 @@ private function isUserNotified(Partner $partner, User $user): bool
         // - the user must be active and not an admin
         // - if entity is Affectation
         // - if entity is Suivi: we check that the partner of the user is different from the partner of the user who created the suivi
-        // TODO: activate when suivi is out of ActivityListener
-        /*if ($entity instanceof Suivi) {
-            $suiviPartner = $entity->getCreatedBy()?->getPartnerInTerritory($entity->getSignalement()->getTerritory());
-        }*/
+        if (!empty($this->suivi)) {
+            $suiviPartner = $this->suivi->getCreatedBy()?->getPartnerInTerritory($this->suivi->getSignalement()->getTerritory());
+        }
 
         return User::STATUS_ACTIVE === $user->getStatut()
             && !$user->isSuperAdmin() && !$user->isTerritoryAdmin()
-            && (!empty($this->affectation)/* || ($entity->getCreatedBy() && $partner !== $suiviPartner) */);
+            && (!empty($this->affectation) || ($this->suivi->getCreatedBy() && $partner !== $suiviPartner));
     }
 }