Merge branch 'tasks_mission_type_filter' into 'master'

Add filter to tasks based on mission type (AMLI)

See merge request Chill-Projet/chill-bundles!588

.changes/unreleased/Fixed-20230821-115738.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Reimplement the mission type filter on tasks, only for instances that have a
+  config parameter indicating true for this.
+time: 2023-08-21T11:57:38.273630026+02:00
+custom:
+  Issue: ""

src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php

@@ -26,6 +26,7 @@ use Chill\TaskBundle\Event\TaskEvent;
 use Chill\TaskBundle\Event\UI\UIEvent;
 use Chill\TaskBundle\Form\SingleTaskType;
 use Chill\TaskBundle\Repository\SingleTaskAclAwareRepositoryInterface;
+use Chill\TaskBundle\Repository\SingleTaskRepository;
 use Chill\TaskBundle\Repository\SingleTaskStateRepository;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
 use LogicException;
@@ -48,42 +49,18 @@ use function array_merge;
 
 final class SingleTaskController extends AbstractController
 {
-    private CenterResolverDispatcherInterface $centerResolverDispatcher;
-
-    private EventDispatcherInterface $eventDispatcher;
-
-    private FilterOrderHelperFactoryInterface $filterOrderHelperFactory;
-
-    private LoggerInterface $logger;
-
-    private PaginatorFactory $paginatorFactory;
-
-    private SingleTaskAclAwareRepositoryInterface $singleTaskAclAwareRepository;
-
-    private TimelineBuilder $timelineBuilder;
-
-    private TranslatorInterface $translator;
-
     public function __construct(
-        CenterResolverDispatcherInterface $centerResolverDispatcher,
+        private CenterResolverDispatcherInterface $centerResolverDispatcher,
-        PaginatorFactory $paginatorFactory,
+        private PaginatorFactory $paginatorFactory,
-        SingleTaskAclAwareRepositoryInterface $singleTaskAclAwareRepository,
+        private SingleTaskAclAwareRepositoryInterface $singleTaskAclAwareRepository,
-        TranslatorInterface $translator,
+        private TranslatorInterface $translator,
-        EventDispatcherInterface $eventDispatcher,
+        private EventDispatcherInterface $eventDispatcher,
-        TimelineBuilder $timelineBuilder,
+        private TimelineBuilder $timelineBuilder,
-        LoggerInterface $logger,
+        private LoggerInterface $logger,
-        FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
+        private FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
-        private SingleTaskStateRepository $singleTaskStateRepository
+        private SingleTaskStateRepository $singleTaskStateRepository,
-    ) {
+        private SingleTaskRepository $singleTaskRepository
-        $this->eventDispatcher = $eventDispatcher;
+    ) {}
-        $this->timelineBuilder = $timelineBuilder;
-        $this->logger = $logger;
-        $this->translator = $translator;
-        $this->centerResolverDispatcher = $centerResolverDispatcher;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->singleTaskAclAwareRepository = $singleTaskAclAwareRepository;
-        $this->filterOrderHelperFactory = $filterOrderHelperFactory;
-    }
 
     /**
      * @Route(
@@ -300,7 +277,9 @@ final class SingleTaskController extends AbstractController
     ) {
         $this->denyAccessUnlessGranted(TaskVoter::SHOW, null);
 
-        $filterOrder = $this->buildFilterOrder();
+        $showMissionTypeFilter = $this->singleTaskRepository->countByDistinctTypes() > 1;
+
+        $filterOrder = $this->buildFilterOrder(true, $showMissionTypeFilter);
 
         $filteredUsers = $filterOrder->getUserPickerData('userPicker');
 
@@ -308,9 +287,15 @@ final class SingleTaskController extends AbstractController
             $filterOrder->getCheckboxData('status'),
             array_map(static fn ($i) => 'state_' . $i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
         );
+
+        if ($showMissionTypeFilter) {
+            $types = $filterOrder->getCheckboxData('missionTypePicker');
+        }
+
         $nb = $this->singleTaskAclAwareRepository->countByAllViewable(
             $filterOrder->getQueryString(),
             $flags,
+            $types ?? [],
             $filteredUsers
         );
         $paginator = $this->paginatorFactory->create($nb);
@@ -319,6 +304,7 @@ final class SingleTaskController extends AbstractController
             $tasks = $this->singleTaskAclAwareRepository->findByAllViewable(
                 $filterOrder->getQueryString(),
                 $flags,
+                $types ?? [],
                 $filteredUsers,
                 $paginator->getCurrentPageFirstItemNumber(),
                 $paginator->getItemsPerPage(),
@@ -669,7 +655,7 @@ final class SingleTaskController extends AbstractController
         return $form;
     }
 
-    private function buildFilterOrder($includeFilterByUser = true): FilterOrderHelper
+    private function buildFilterOrder($includeFilterByUser = true, $includeMissionType = false): FilterOrderHelper
     {
         $statuses = ['no-alert', 'warning', 'alert'];
         $statusTrans = [
@@ -677,6 +663,7 @@ final class SingleTaskController extends AbstractController
             'Tasks near deadline',
             'Tasks over deadline',
         ];
+        $arrayOfTypes = [];
 
         $filterBuilder = $this->filterOrderHelperFactory
             ->create(self::class)
@@ -696,6 +683,16 @@ final class SingleTaskController extends AbstractController
                 ->addUserPicker('userPicker', 'Filter by user', ['multiple' => true, 'required' => false]);
         }
 
+        if ($includeMissionType) {
+            $filterBuilder->addCheckbox(
+                'missionTypePicker',
+                array_map(
+                    fn ($row) => $row['type'],
+                    $this->singleTaskRepository->findAllTaskDistinctTypes()
+                )
+            );
+        }
+
         return $filterBuilder->build();
     }
 

src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php

@@ -52,6 +52,7 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
     public function buildBaseQuery(
         ?string $pattern = null,
         ?array $flags = [],
+        ?array $types = [],
         ?array $users = []
     ): QueryBuilder {
         $qb = $this->em->createQueryBuilder();
@@ -77,8 +78,12 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
             if ($orXUser->count() > 0) {
                 $qb->andWhere($orXUser);
             }
+        }
 
-            return $qb;
+        if (null !== $types && count($types) > 0) {
+            $qb->andWhere($qb->expr()->in('t.type', ':types'));
+
+            $qb->setParameter('types', $types);
         }
 
         if (null !== $flags && count($flags) > 0) {
@@ -203,9 +208,10 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
     public function countByAllViewable(
         ?string $pattern = null,
         ?array $flags = [],
+        ?array $types = [],
         ?array $users = []
     ): int {
-        $qb = $this->buildBaseQuery($pattern, $flags, $users);
+        $qb = $this->buildBaseQuery($pattern, $flags, $types, $users);
 
         return $this
             ->addACLGlobal($qb)
@@ -251,12 +257,13 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
     public function findByAllViewable(
         ?string $pattern = null,
         ?array $flags = [],
+        ?array $types = [],
         ?array $users = [],
         ?int $start = 0,
         ?int $limit = 50,
         ?array $orderBy = []
     ): array {
-        $qb = $this->buildBaseQuery($pattern, $flags, $users);
+        $qb = $this->buildBaseQuery($pattern, $flags, $types, $users);
         $qb = $this->addACLGlobal($qb);
 
         return $this->getResult($qb, $start, $limit, $orderBy);

src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php

@@ -19,6 +19,7 @@ interface SingleTaskAclAwareRepositoryInterface
     public function countByAllViewable(
         ?string $pattern = null,
         ?array $flags = [],
+        ?array $types = [],
         ?array $users = []
     ): int;
 
@@ -39,6 +40,7 @@ interface SingleTaskAclAwareRepositoryInterface
     public function findByAllViewable(
         ?string $pattern = null,
         ?array $flags = [],
+        ?array $types = [],
         ?array $users = [],
         ?int $start = 0,
         ?int $limit = 50,

src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php

@@ -306,4 +306,28 @@ class SingleTaskRepository extends EntityRepository
             ->add($qb->expr()->isNull('st.endDate'))
             ->add($qb->expr()->isNull('st.warningInterval'));
     }
+
+    public function countByDistinctTypes()
+    {
+        $qb = $this->createQueryBuilder('st')
+            ->select('COUNT(DISTINCT st.type)');
+
+        $this->buildQuery($qb, []);
+
+        return (int) $qb
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
+    public function findAllTaskDistinctTypes()
+    {
+        $qb = $this->createQueryBuilder('st')
+            ->select('DISTINCT st.type');
+
+        $this->buildQuery($qb, []);
+
+        return $qb
+            ->getQuery()
+            ->getResult();
+    }
 }