fixed showing too much troop participants without troop

SkautDevs · Nov 25, 2023 · 25cf76d · 25cf76d
1 parent 8f2321d
commit 25cf76d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/Participant/Admin/AdminController.php b/src/Participant/Admin/AdminController.php
@@ -544,7 +544,9 @@ public function showTroopManagement(Request $request, Response $response, Event
                 [UserStatus::Open],
                 $event,
             ),
-            'troopParticipants' => $this->troopParticipantRepository->getAllWithoutTroop(),
+            'troopParticipants' => $this->troopParticipantRepository->getAllWithoutTroop(
+                $event,
+            ),
             'caTl' => $event->getEventType()->getContentArbiterTroopLeader(),
             'caTp' => $event->getEventType()->getContentArbiterTroopParticipant(),
         ]);

diff --git a/src/Participant/Troop/TroopParticipantRepository.php b/src/Participant/Troop/TroopParticipantRepository.php
@@ -65,15 +65,16 @@ public function getFromUser(User $user): TroopParticipant
     /**
      * @return TroopParticipant[]
      */
-    public function getAllWithoutTroop(): array
+    public function getAllWithoutTroop(Event $event): array
     {
         $troopParticipants = $this->findBy([
             'role' => ParticipantRole::TroopParticipant,
             'patrol_leader_id' => new Relation(null, 'IS'),
         ]);
 
-        $troopParticipants = array_filter($troopParticipants, function (TroopParticipant $tp): bool {
-            return $tp->troopLeader === null;
+        $troopParticipants = array_filter($troopParticipants, function (TroopParticipant $tp) use ($event): bool {
+            // TODO optimalize event filter
+            return $tp->troopLeader === null && $tp->getUserButNotNull()->event->id === $event->id;
         });
 
         return $troopParticipants;