From efd43c379168da6188005a579030b273383a8e2e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 11 Sep 2023 13:53:09 +0200
Subject: [PATCH] refactor code after review

---
 .../Controller/SingleTaskController.php               | 11 +++++++----
 .../Repository/SingleTaskRepository.php               |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
index f74669fab..2e2f145ef 100644
--- a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
@@ -278,7 +278,7 @@ final class SingleTaskController extends AbstractController
     ) {
         $this->denyAccessUnlessGranted(TaskVoter::SHOW, null);
 
-        $showMissionTypeFilter = $this->singleTaskRepository->countByDistinctTypes() > 2 ? true : false;
+        $showMissionTypeFilter = $this->singleTaskRepository->countByDistinctTypes() > 1;
 
         $filterOrder = $this->buildFilterOrder(true, $showMissionTypeFilter);
 
@@ -685,12 +685,15 @@ final class SingleTaskController extends AbstractController
         }
 
         if ($includeMissionType) {
-            $missionTypes = $this->singleTaskRepository->findAllTasktypes();
+/*            $missionTypes = $this->singleTaskRepository->findAllTasktypes();
             foreach ($missionTypes as $type) {
                 $arrayOfTypes[] = $type['type'];
-            }
+            }*/
 
-            $filterBuilder->addCheckbox('missionTypePicker', $arrayOfTypes);
+//            $filterBuilder->addCheckbox('missionTypePicker', $arrayOfTypes);
+            $filterBuilder->addCheckbox('missionTypePicker', array_map(
+                fn ($row) => $row['type'], $this->singleTaskRepository->findAllTaskDistinctTypes())
+            );
         }
 
         return $filterBuilder->build();
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
index 53637f35a..9b0f6c87d 100644
--- a/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
@@ -319,7 +319,7 @@ class SingleTaskRepository extends EntityRepository
             ->getSingleScalarResult();
     }
 
-    public function findAllTasktypes()
+    public function findAllTaskDistinctTypes()
     {
         $qb = $this->createQueryBuilder('st')
             ->select('DISTINCT st.type');