fixes based on comments #3610

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

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/EventSubscriber/SuiviCreatedSubscriber.php b/src/EventSubscriber/SuiviCreatedSubscriber.php
@@ -31,8 +31,13 @@ public function onSuiviCreated(SuiviCreatedEvent $event): void
             return;
         }
 
-        if (Suivi::CONTEXT_NOTIFY_USAGER_ONLY !== $suivi->getContext()
-                && Signalement::STATUS_CLOSED !== $suivi->getSignalement()->getStatut()) {
+        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);
         }
 

diff --git a/src/Service/NotificationAndMailSender.php b/src/Service/NotificationAndMailSender.php
@@ -86,7 +86,7 @@ public function sendNewSuiviToUsagers(Suivi $suivi): void
         $this->suivi = $suivi;
         $this->signalement = $suivi->getSignalement();
         $recipients = new ArrayCollection($this->signalement->getMailUsagers());
-        if (!$recipients->isEmpty() && Signalement::STATUS_CLOSED !== $this->signalement->getStatut()) {
+        if (!$recipients->isEmpty()) {
             $recipients->removeElement($suivi->getCreatedBy()?->getEmail());
             foreach ($recipients as $recipient) {
                 $this->notificationMailerRegistry->send(