feat(bo): list territoires filter and dsfrV2 760

packages/backend/src/controllers/demandeSejour/get.js

@@ -30,7 +30,7 @@ module.exports = async function get(req, res, next) {
       total: demandes.total,
     });
   } catch (error) {
-    console.log(error);
+    log.w(error);
     log.w("DONE with error");
     return next(error);
   }

packages/backend/src/controllers/territoire/list.js

@@ -1,12 +1,20 @@
 const Territoire = require("../../services/Territoire");
-
 const logger = require("../../utils/logger");
 
 const log = logger(module.filename);
 
-module.exports = async function list(_req, res) {
+module.exports = async function list(req, res, next) {
   log.i("IN");
-  const territoires = await Territoire.fetch();
-  log.i("DONE");
-  return res.json({ territoires });
+  try {
+    const territoires = await Territoire.fetch(req.query);
+    log.d(territoires);
+    return res.status(200).json({
+      territoires: territoires.rows,
+      total: territoires.total,
+    });
+  } catch (error) {
+    log.w(error);
+    log.w("DONE with error");
+    return next(error);
+  }
 };

packages/backend/src/helpers/__tests__/queryParams.test.js

@@ -1,6 +1,7 @@
 const {
   applyFilters,
   applyPagination,
+  applyGroupBy,
   sanityzeFiltersParams,
   sanityzePaginationParams,
 } = require("../queryParams");
@@ -10,7 +11,7 @@ describe("queryParams", () => {
   it("should return the original query and params if no filters are provided", () => {
     const query = "SELECT * FROM users";
     const result = applyFilters(query, [], {});
-    expect(result.query).toBe(query);
+    expect(result.query.trim()).toBe(query);
     expect(result.params).toEqual([]);
   });
 
@@ -28,6 +29,17 @@ describe("queryParams", () => {
     expect(result.params).toEqual(["30", "John"]);
   });
 
+  it("should apply group by to the query", () => {
+    const query = "SELECT age, name, count(*) FROM users";
+    const groupParams = ["age", "name"];
+    const result = applyFilters(query, [], {});
+    result.query = applyGroupBy(query, groupParams);
+    // remove return at line to fix space pb
+    expect(result.query.replace(/\s+/g, " ").trim()).toContain(
+      "GROUP BY age, name",
+    );
+  });
+
   it("should handle array filters with ANY", () => {
     const query = "SELECT * FROM users";
     const filterParams = { roles: ["admin", "user"] };
@@ -38,7 +50,7 @@ describe("queryParams", () => {
 
   it("should return the original query if no parameters are provided", () => {
     const result = applyFilters();
-    expect(result.query).toBe("");
+    expect(result.query.trim()).toBe("");
     expect(result.params).toEqual([]);
   });
 

packages/backend/src/helpers/queryParams.js

@@ -4,7 +4,7 @@ module.exports = {
     if (Object.keys(filterParams).length === 0) {
       return {
         params: initialParams,
-        query,
+        query: `${query}`,
       };
     }
     const filters = Object.entries(filterParams)
@@ -21,6 +21,18 @@ module.exports = {
       query: `${query} AND ${filters}`,
     };
   },
+  applyGroupBy: (queryInitial, groupByParams = []) => {
+    if (Object.keys(groupByParams).length === 0) {
+      return `${queryInitial}`;
+    }
+    const group = Object.entries(groupByParams)
+      .map(([key, value]) => {
+        return value;
+      })
+      .join(", ");
+    return `${queryInitial} GROUP BY ${group}`;
+  },
+
   applyPagination: (
     query,
     params,
@@ -39,15 +51,14 @@ module.exports = {
     const countQuery = `
       SELECT COUNT(*) AS total FROM (${query}) AS subquery;
     `;
-
     return {
       countQuery,
       countQueryParams: params,
       params: [...params, limit, offset],
       query: paginatedQuery,
     };
   },
-  sanityzeFiltersParams: (queryParams, availableParams) =>
+  sanityzeFiltersParams: (queryParams, availableParams) => 
     Object.entries(availableParams).reduce((acc, [key, value]) => {
       if (queryParams[key]) {
         acc[value] = queryParams[key];

packages/backend/src/services/Territoire.js

@@ -3,8 +3,20 @@ const logger = require("../utils/logger");
 const pool = require("../utils/pgpool").getPool();
 
 const log = logger(module.filename);
+const {
+  sanityzePaginationParams,
+  sanityzeFiltersParams,
+  applyFilters,
+  applyPagination,
+  applyGroupBy,
+} = require("../helpers/queryParams");
 
 const query = {
+  getFicheIdByTerCode: `
+  select
+        fte.id AS id
+      FROM back.fiche_territoire fte
+      WHERE ter_code = $1`,
   getOne: `
     select
         fte.id AS territoire_id,
@@ -23,31 +35,25 @@ const query = {
       FROM back.fiche_territoire fte
       INNER JOIN geo.territoires ter ON fte.ter_code = ter.code
       WHERE fte.id = $1`,
-  getFicheIdByTerCode: `
-  select
-        fte.id AS id
-      FROM back.fiche_territoire fte
-      WHERE ter_code = $1`,
-  select: `
+  select: () =>
+    `
       select
-        fte.id AS territoire_id,
+        fte.id AS "territoireId",
         CASE (ter.code ~ '[0-9]')
         	WHEN true THEN 'DEP'
  			    ELSE 'REG'
         END AS type,
-        ter.code AS value,
-        ter.label AS text,
-        fte.service_telephone AS service_telephone, 
-        fte.corresp_vao_nom AS corresp_vao_nom,
-        fte.corresp_vao_prenom AS corresp_vao_prenom,
-        fte.service_mail as service_mail,
-        COUNT(distinct(usr.id)) as nbusersbo
+        ter.code AS code,
+        ter.label AS label,
+        fte.corresp_vao_prenom AS "correspVaoPrenom",
+        fte.corresp_vao_nom AS "correspVaoNom",
+        fte.service_mail AS "serviceMail",
+        fte.service_telephone AS "serviceTelephone", 
+        COUNT(distinct(usr.id)) as "nbUsersBo"
       FROM geo.territoires ter
       INNER JOIN back.fiche_territoire fte ON fte.ter_code = ter.code
       LEFT JOIN back.users usr ON usr.ter_code = ter.code
-      WHERE code <> 'FRA'
-      GROUP BY territoire_id,type,value,text,service_telephone,corresp_vao_nom,corresp_vao_prenom,service_mail
-      ORDER BY type, text ASC`,
+      WHERE ter.code <> 'FRA'`,
   update: `
       UPDATE back.fiche_territoire
       SET
@@ -62,17 +68,51 @@ const query = {
       `,
 };
 
-module.exports.fetch = async (criterias = {}) => {
-  log.i("fetch - IN");
-  const { rows } = await pool.query(query.select);
+module.exports.fetch = async (queryParams) => {
+  const titles = {
+    label: "ter.label",
+    code: "ter.code",
+  };
+  const groupBy = [
+    "fte.id",
+    "type",
+    "code",
+    "label",
+    "fte.service_telephone",
+    "fte.corresp_vao_nom",
+    "fte.corresp_vao_prenom",
+    "fte.service_mail",
+  ];
 
-  return rows.filter((territoire) => {
-    return Object.entries(criterias).every(
-      ([key, value]) => territoire[key] == value,
-    );
-  });
-};
+  const { limit, offset, sortBy, sortDirection } = sanityzePaginationParams(
+    queryParams,
+    {
+      sortBy: titles,
+    },
+  );
+  const filterParams = sanityzeFiltersParams(queryParams, titles);
 
+  const queryGet = query.select();
+  const filterQuery = applyFilters(queryGet, [], filterParams, groupBy);
+  filterQuery.query = applyGroupBy(filterQuery.query, groupBy);
+  const paginatedQuery = applyPagination(
+    filterQuery.query,
+    filterQuery.params,
+    limit,
+    offset,
+    sortBy,
+    sortDirection,
+  );
+  console.log("paginatedQuery", paginatedQuery.query);
+  const result = await Promise.all([
+    pool.query(paginatedQuery.query, paginatedQuery.params),
+    pool.query(paginatedQuery.countQuery, paginatedQuery.countQueryParams),
+  ]);
+  return {
+    rows: result[0].rows,
+    total: parseInt(result[1].rows[0].total, 10),
+  };
+};
 
 module.exports.readFicheIdByTerCode = async (territoireCode) => {
   log.i("readFicheIdByTerCode - IN");

packages/frontend-bo/src/components/demandes-sejour/DefaultTable.vue

@@ -174,7 +174,7 @@ const updateData = () => {
       ...(isValidParams(sortDirection.value)
         ? { sortDirection: sortDirection.value.toUpperCase() }
         : {}),
-      search: getSearchParams(),
+      ...getSearchParams(),
     };
 
     demandeSejourStore.fetchDemandes(query);