factorisation et nettoyage

MTES-MCT · Jan 23, 2025 · 3709721 · 3709721
1 parent 6c47413
commit 3709721
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 968 deletions.
diff --git a/src/Controller/Aid/AidController.php b/src/Controller/Aid/AidController.php
@@ -315,7 +315,6 @@ public function exportList(
 
         $aidParams = [
             'showInSearch' => true,
-            'selectComplete' => true,
         ];
 
         $aidParams = array_merge($aidParams, $aidSearchFormService->convertAidSearchClassToAidParams($aidSearchClass));

diff --git a/src/Controller/Api/Aid/AidController.php b/src/Controller/Api/Aid/AidController.php
@@ -41,7 +41,6 @@ public function index(
         // parametres pour requetes aides
         $aidParams = [
             'showInSearch' => true,
-            'selectComplete' => true
         ];
 
         // on fusionne les paramètres de recherche avec les paramètres de requête
@@ -135,16 +134,15 @@ public function all(
     ): JsonResponse {
         $params = [
             'showInSearch' => true,
-            'selectComplete' => true,
             'orderBy' => ['sort' => 'a.id', 'order' => 'DESC']
         ];
         // requete pour compter sans la pagination
-        $results = $aidService->searchForApi($params);
+        $results = $aidService->searchAidsV3($params);
         $count = count($results);
 
         // requete pour les résultats avec la pagination
         $results = array_slice($results, ($this->getPage() - 1) * $this->getItemsPerPage(), $this->getItemsPerPage());
-        $results = $aidService->getAidsFromResults($results);
+        $results = $aidService->hydrateLightAids($results, $params);
         // spécifique
         $resultsSpe = $this->getResultsSpe($results, $aidService);