fix(hebergement/territoire): fix hebergement/territoire sort

SocialGouv · Feb 17, 2025 · 021d323 · 021d323
1 parent 4730897
commit 021d323
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/packages/backend/src/services/Territoire.js b/packages/backend/src/services/Territoire.js
@@ -73,15 +73,15 @@ const query = {
 module.exports.fetch = async (queryParams) => {
   const titles = [
     {
-      filterEnabled: true,
       key: "ter.code",
       queryKey: "code",
+      sortEnabled: true,
       type: "default",
     },
     {
-      filterEnabled: true,
       key: "ter.label",
       queryKey: "label",
+      sortEnabled: true,
       type: "default",
     },
   ];
@@ -102,6 +102,8 @@ module.exports.fetch = async (queryParams) => {
     sortBy,
     sortDirection,
   );
+
+  log.w(paginatedQuery.query, paginatedQuery.params);
   const result = await Promise.all([
     pool.query(paginatedQuery.query, paginatedQuery.params),
     pool.query(paginatedQuery.countQuery, paginatedQuery.countQueryParams),

diff --git a/packages/backend/src/services/hebergement/Hebergement.js b/packages/backend/src/services/hebergement/Hebergement.js
@@ -251,12 +251,26 @@ ${new Array(nbRows)
   WHERE
     h.id = $1;
   `,
+  getStatut: `
+    SELECT
+      value AS "statut"
+    FROM
+      front.hebergement h
+      LEFT JOIN front.hebergement_statut hs ON h.statut_id = hs.id
+    WHERE
+      h.id = $1
+  `,
+
+  historize: `
+    UPDATE front.hebergement
+    SET current = FALSE
+    WHERE id = $1
+  `,
   removePrestationsHoteliere: `
   DELETE FROM front.hebergement_to_prestations_hotelieres
   WHERE
     hebergement_id = $1;
   `,
-
   update: `
   UPDATE front.hebergement
   SET
@@ -296,20 +310,6 @@ ${new Array(nbRows)
   WHERE
     id = $1
   `,
-  getStatut: `
-    SELECT
-      value AS "statut"
-    FROM
-      front.hebergement h
-      LEFT JOIN front.hebergement_statut hs ON h.statut_id = hs.id
-    WHERE
-      h.id = $1
-  `,
-  historize: `
-    UPDATE front.hebergement
-    SET current = FALSE
-    WHERE id = $1
-  `,
 };
 
 /*
@@ -548,28 +548,27 @@ module.exports.getByUserId = async (userId, queryParams) => {
 
   const titles = [
     {
-      filterEnabled: true,
       key: "h.nom",
       queryKey: "nom",
       sortEnabled: true,
       type: "default",
     },
     {
-      filterEnabled: true,
       key: "a.label",
       queryKey: "adresse",
+      sortEnabled: true,
       type: "default",
     },
     {
-      filterEnabled: true,
       key: "hs.value",
       queryKey: "statut",
+      sortEnabled: true,
       type: "default",
     },
     {
-      filterEnabled: true,
       key: "uo.use_id",
       queryKey: "userId",
+      sortEnabled: true,
       type: "number",
     },
   ];