[Visites] Notifications aux autres partenaires affectés

src/EventSubscriber/InterventionAbortedSubscriber.php

@@ -56,6 +56,7 @@ public function onInterventionAborted(Event $event): void
                 suivi: $suivi,
                 currentUser: $currentUser,
                 notificationMailerType: NotificationMailerType::TYPE_VISITE_ABORTED_TO_PARTNER,
+                notifyOtherAffectedPartners: true,
             );
         }
     }

src/EventSubscriber/InterventionCanceledSubscriber.php

@@ -60,6 +60,7 @@ public function onInterventionCanceled(Event $event): void
                 suivi: $suivi,
                 currentUser: $currentUser,
                 notificationMailerType: null,
+                notifyOtherAffectedPartners: true,
             );
         }
     }

src/EventSubscriber/InterventionConfirmedSubscriber.php

@@ -82,6 +82,7 @@ public function onInterventionConfirmed(Event $event): void
                 suivi: $suivi,
                 currentUser: $currentUser,
                 notificationMailerType: NotificationMailerType::TYPE_VISITE_CONFIRMED_TO_PARTNER,
+                notifyOtherAffectedPartners: true,
             );
         }
     }

src/EventSubscriber/InterventionCreatedSubscriber.php

@@ -51,6 +51,7 @@ public function onInterventionCreated(InterventionCreatedEvent $event): void
             suivi: $suivi,
             currentUser: $event->getUser(),
             notificationMailerType: null,
+            notifyOtherAffectedPartners: true,
         );
     }
 

src/EventSubscriber/InterventionRescheduledSubscriber.php

@@ -59,6 +59,7 @@ public function onInterventionRescheduled(InterventionRescheduledEvent $event):
                 suivi: $suivi,
                 currentUser: $event->getUser(),
                 notificationMailerType: null,
+                notifyOtherAffectedPartners: true,
             );
         }
     }

src/Manager/SignalementManager.php

@@ -13,6 +13,7 @@
 use App\Dto\Request\Signalement\SituationFoyerRequest;
 use App\Dto\SignalementAffectationListView;
 use App\Entity\Affectation;
+use App\Entity\Enum\AffectationStatus;
 use App\Entity\Enum\MotifCloture;
 use App\Entity\Enum\ProfileDeclarant;
 use App\Entity\Enum\ProprioType;
@@ -261,6 +262,23 @@ public function findEmailsAffectedToSignalement(Signalement $signalement): array
         return array_merge($sendTo, $partnersEmail);
     }
 
+    public function findUsersAffectedToSignalement(
+        Signalement $signalement,
+        AffectationStatus $statusAffectation,
+        Partner $partnerToExclude
+    ): array {
+        $list = [];
+        $affectations = $signalement->getAffectations();
+        foreach ($affectations as $affectation) {
+            $partner = $affectation->getPartner();
+            if ((!$partnerToExclude || $partnerToExclude != $partner) && $affectation->getStatut() === $statusAffectation->value) {
+                $list = array_merge($list, $partner->getUsers()->toArray());
+            }
+        }
+
+        return array_unique($list, \SORT_REGULAR);
+    }
+
     public function updateFromSignalementQualification(
         SignalementQualification $signalementQualification,
         QualificationNDERequest $qualificationNDERequest

src/Service/Signalement/VisiteNotifier.php

@@ -3,12 +3,14 @@
 namespace App\Service\Signalement;
 
 use App\Entity\Affectation;
+use App\Entity\Enum\AffectationStatus;
 use App\Entity\Enum\Qualification;
 use App\Entity\Intervention;
 use App\Entity\Suivi;
 use App\Entity\User;
 use App\Factory\NotificationFactory;
 use App\Factory\SuiviFactory;
+use App\Manager\SignalementManager;
 use App\Manager\SuiviManager;
 use App\Repository\UserRepository;
 use App\Service\Mailer\NotificationMail;
@@ -21,6 +23,7 @@ class VisiteNotifier
 {
     public function __construct(
         private EntityManagerInterface $entityManager,
+        private SignalementManager $signalementManager,
         private SuiviFactory $suiviFactory,
         private SuiviManager $suiviManager,
         private NotificationFactory $notificationFactory,
@@ -53,16 +56,26 @@ public function notifyAgents(
         ?NotificationMailerType $notificationMailerType,
         bool $notifyAdminTerritory = true,
         ?Affectation $affectation = null,
+        bool $notifyOtherAffectedPartners = false,
     ): void {
         if ($intervention) {
-            $listUsersPartner = $intervention->getPartner() && $intervention->getPartner() != $currentUser?->getPartner() ?
+            $listUsersToNotify = [];
+            $listUsersPartner = $intervention->getPartner() && $intervention->getPartner() != $currentUser?->getPartner() && !$notifyOtherAffectedPartners ?
                 $intervention->getPartner()->getUsers()->toArray() : [];
             if ($notifyAdminTerritory) {
                 $listUsersTerritoryAdmin = $this->userRepository->findActiveTerritoryAdmins($intervention->getSignalement()->getTerritory(), $intervention->getSignalement()->getInseeOccupant());
                 $listUsersToNotify = array_unique(array_merge($listUsersTerritoryAdmin, $listUsersPartner), \SORT_REGULAR);
             } else {
                 $listUsersToNotify = $listUsersPartner;
             }
+            if ($notifyOtherAffectedPartners) {
+                $listAffected = $this->signalementManager->findUsersAffectedToSignalement(
+                    $intervention->getSignalement(),
+                    AffectationStatus::STATUS_ACCEPTED,
+                    $intervention->getPartner()
+                );
+                $listUsersToNotify = array_unique(array_merge($listUsersToNotify, $listAffected), \SORT_REGULAR);
+            }
         } else {
             $listUsersToNotify = $affectation->getPartner()->getUsers();
         }

tests/Functional/Controller/Back/SignalementVisitesControllerTest.php

@@ -111,6 +111,6 @@ public function testAddPastVisiteNotDone(): void
         );
 
         $this->assertResponseRedirects('/bo/signalements/'.$signalement->getUuid());
-        $this->assertEmailCount(3);
+        $this->assertEmailCount(2);
     }
 }

tests/Functional/Manager/InterventionManagerTest.php

@@ -106,7 +106,7 @@ public function testCreatePastVisiteFromRequest(): void
                 $intervention->getConcludeProcedure()
             ));
 
-        $this->assertEmailCount(3);
+        $this->assertEmailCount(2);
     }
 
     /**

tests/Functional/Service/Signalement/VisiteNotifierTest.php

@@ -6,6 +6,7 @@
 use App\Entity\Signalement;
 use App\Factory\NotificationFactory;
 use App\Factory\SuiviFactory;
+use App\Manager\SignalementManager;
 use App\Manager\SuiviManager;
 use App\Repository\SignalementRepository;
 use App\Repository\UserRepository;
@@ -22,6 +23,7 @@ protected function setUp(): void
     {
         $kernel = self::bootKernel();
         $entityManager = $kernel->getContainer()->get('doctrine')->getManager();
+        $signalementManager = static::getContainer()->get(SignalementManager::class);
         $suiviFactory = static::getContainer()->get(SuiviFactory::class);
         $suiviManager = static::getContainer()->get(SuiviManager::class);
         $notificationFactory = static::getContainer()->get(NotificationFactory::class);
@@ -30,6 +32,7 @@ protected function setUp(): void
 
         $this->visiteNotifier = new VisiteNotifier(
             $entityManager,
+            $signalementManager,
             $suiviFactory,
             $suiviManager,
             $notificationFactory,