[Bot] add committees count into primo notification (#11278)

parti-renaissance · Jan 8, 2025 · f36c9c1 · f36c9c1
1 parent 2275e4c
commit f36c9c1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/features/api/user.feature b/features/api/user.feature
@@ -50,7 +50,7 @@ Feature:
                     "committee": {
                         "type": "committee",
                         "name": "En Marche Paris 8",
-                        "assembly_committees_count": 0,
+                        "assembly_committees_count": 2,
                         "can_change_committee": true,
                         "members_count": 0,
                         "message": null,

diff --git a/src/Adhesion/Handler/SendNewPrimoCotisationNotificationCommandHandler.php b/src/Adhesion/Handler/SendNewPrimoCotisationNotificationCommandHandler.php
@@ -8,6 +8,7 @@
 use App\Entity\Adherent;
 use App\Entity\Geo\Zone;
 use App\Repository\AdherentRepository;
+use App\Repository\CommitteeRepository;
 use App\Utils\StringCleaner;
 use App\ValueObject\Genders;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
@@ -21,6 +22,7 @@ class SendNewPrimoCotisationNotificationCommandHandler
 {
     public function __construct(
         private readonly AdherentRepository $adherentRepository,
+        private readonly CommitteeRepository $committeeRepository,
         private readonly ChatterInterface $chatter,
         private readonly UrlGeneratorInterface $urlGenerator,
         private readonly string $telegramChatIdPrimoAdhesion,
@@ -75,6 +77,10 @@ public function __invoke(SendNewPrimoCotisationNotificationCommand $command): vo
 
         $zoneLines = StringCleaner::escapeMarkdown(implode("\n", $zoneLines));
 
+        if (!$committeeMembership) {
+            $zoneLines = "\n_".(($committeesInAdherentZone = \count($this->committeeRepository->findInAdherentZone($adherent))) ? $committeesInAdherentZone.' comité(s) dans l\'Assemblée' : 'Aucun comité dans l\'Assemblée').'_';
+        }
+
         $smsSubscriber = $adherent->hasSmsSubscriptionType() ? '✅' : '❌';
         $emailSubscriber = $adherent->isEmailSubscribed() ? '✅' : '❌';
 

diff --git a/src/Repository/CommitteeRepository.php b/src/Repository/CommitteeRepository.php
@@ -297,7 +297,7 @@ public function findInZones(array $zones, bool $withZoneParents = true): array
 
     public function findInAdherentZone(Adherent $adherent): array
     {
-        return $this->findInZones($adherent->getParentZonesOfType($adherent->isForeignResident() ? Zone::CUSTOM : Zone::DEPARTMENT));
+        return $this->findInZones([$adherent->getAssemblyZone()]);
     }
 
     public function findCommitteesForHost(Adherent $adherent): array