fix(instructeurs): corrige boug sur affichage des déclarations pour p…

…ersonne physique
SocialGouv · Apr 25, 2024 · 1b0f601 · 1b0f601
1 parent f09d111
commit 1b0f601
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 24 deletions.
diff --git a/packages/backend/src/controllers/demandeSejour/depose.js b/packages/backend/src/controllers/demandeSejour/depose.js
@@ -25,13 +25,10 @@ module.exports = async function post(req, res, next) {
   const { attestation } = req.body;
   log.i("IN", { demandeSejourId });
 
-  if (!demandeSejourId) {
-    log.w("missing parameter");
-    return next(
-      new AppError("Paramètre incorrect", {
-        statusCode: 400,
-      }),
-    );
+  try {
+    await yup.number().required().validate(demandeSejourId);
+  } catch (error) {
+    return next(new ValidationAppError(error));
   }
 
   if (!attestation) {

diff --git a/packages/backend/src/controllers/demandeSejour/getByDepartementCodes.js b/packages/backend/src/controllers/demandeSejour/getByDepartementCodes.js
@@ -1,6 +1,8 @@
-const DemandeSejour = require("../../services/DemandeSejour");
+const yup = require("yup");
 
+const DemandeSejour = require("../../services/DemandeSejour");
 const logger = require("../../utils/logger");
+const ValidationAppError = require("../../utils/validation-error");
 
 const log = logger(module.filename);
 
@@ -12,15 +14,33 @@ module.exports = async function getByDepartementCodes(req, res, next) {
 
   try {
     const { limit, offset, sortBy, sortDirection, search } = req.query;
+    const params = {
+      limit,
+      offset,
+      search: JSON.parse(search ?? "{}"),
+      sortBy,
+      sortDirection,
+    };
+
+    try {
+      await yup
+        .object({
+          limit: yup.number().nullable(),
+          offset: yup.number().nullable(),
+          search: yup.object().json(),
+          sortBy: yup.string().nullable(),
+          sortDirection: yup.string().oneOf(["ASC", "DESC"]).nullable(),
+        })
+        .validate(params, {
+          abortEarly: false,
+          stripUnknown: true,
+        });
+    } catch (error) {
+      return next(new ValidationAppError(error));
+    }
 
     const demandesWithPagination = await DemandeSejour.getByDepartementCodes(
-      {
-        limit,
-        offset,
-        search: JSON.parse(search ?? "{}"),
-        sortBy,
-        sortDirection,
-      },
+      params,
       req.departements.map((d) => d.value),
     );
     log.d(demandesWithPagination);

diff --git a/packages/backend/src/controllers/demandeSejour/post.js b/packages/backend/src/controllers/demandeSejour/post.js
@@ -71,8 +71,6 @@ module.exports = async function post(req, res, next) {
       duree,
       periode,
       responsableSejour,
-      organisme.protocoleTransport,
-      organisme.protocoleSanitaire,
       organisme,
     );
 

diff --git a/packages/backend/src/controllers/demandeSejour/update.js b/packages/backend/src/controllers/demandeSejour/update.js
@@ -1,7 +1,10 @@
+const yup = require("yup");
+
 const DemandeSejour = require("../../services/DemandeSejour");
 const AppError = require("../../utils/error");
 
 const logger = require("../../utils/logger");
+const ValidationAppError = require("../../utils/validation-error");
 
 const log = logger(module.filename);
 
@@ -10,7 +13,7 @@ module.exports = async function post(req, res, next) {
   const { type, parametre } = req.body;
   log.i("IN", { demandeSejourId, parametre, type });
 
-  if (!type || !demandeSejourId || !parametre) {
+  if (!type || !parametre) {
     log.w("missing parameter");
     return next(
       new AppError("Paramètre incorrect", {
@@ -19,6 +22,12 @@ module.exports = async function post(req, res, next) {
     );
   }
 
+  try {
+    await yup.number().required().validate(demandeSejourId);
+  } catch (error) {
+    return next(new ValidationAppError(error));
+  }
+
   try {
     const demandeId = await DemandeSejour.update(
       type,

diff --git a/packages/backend/src/services/DemandeSejour.js b/packages/backend/src/services/DemandeSejour.js
@@ -422,8 +422,6 @@ module.exports.create = async (
   duree,
   periode,
   responsableSejour,
-  protocoleTransport,
-  protocoleSanitaire,
   organisme,
 ) => {
   log.i("create - IN");
@@ -436,8 +434,8 @@ module.exports.create = async (
       duree,
       periode,
       responsableSejour,
-      protocoleTransport,
-      protocoleSanitaire,
+      organisme.protocoleTransport,
+      organisme.protocoleSanitaire,
       organisme,
     ),
   );

diff --git a/packages/frontend-usagers/src/pages/demande-sejour/liste.vue b/packages/frontend-usagers/src/pages/demande-sejour/liste.vue
@@ -12,7 +12,6 @@
         <h1>Liste des déclarations de séjour</h1>
       </div>
     </div>
-
     <template v-if="demandeSejourStore.demandes.length">
       <div class="fr-grid-row">
         <div class="fr-col">
@@ -207,7 +206,7 @@ const idOptions = computed(() => {
 const siretOptions = computed(() => {
   return demandeSejourStore.demandes
     .map((d) => d.siret)
-    .filter((v, i, a) => a.indexOf(v) === i);
+    .filter((v, i, a) => v !== null && a.indexOf(v) === i);
 });
 
 const idFonctionnellesOptions = computed(() => {