feat(hebergement): add statut

SocialGouv · Dec 6, 2024 · 776ceb7 · 776ceb7
1 parent dc7aacb
commit 776ceb7
Show file tree

Hide file tree

Showing 22 changed files with 620 additions and 167 deletions.
diff --git a/packages/backend/src/controllers/hebergement/activate.js b/packages/backend/src/controllers/hebergement/activate.js
@@ -0,0 +1,69 @@
+const yup = require("yup");
+const logger = require("../../utils/logger");
+const ValidationAppError = require("../../utils/validation-error");
+const HebergementSchema = require("../../schemas/hebergement");
+const AppError = require("../../utils/error");
+const Hebergement = require("../../services/hebergement/Hebergement");
+const HebergementHelper = require("../../helpers/hebergement");
+
+const log = logger(module.filename);
+
+module.exports = async function activate(req, res, next) {
+  const hebergementId = req.params.id;
+  const { body, decoded } = req;
+  const userId = decoded.id;
+
+  const { nom, coordonnees, informationsLocaux, informationsTransport } = body;
+
+  if (
+    !nom ||
+    !coordonnees ||
+    !informationsLocaux ||
+    !informationsTransport ||
+    !hebergementId
+  ) {
+    log.w("missing or invalid parameter");
+
+    return next(
+      new AppError("Paramètre incorrect", {
+        statusCode: 400,
+      }),
+    );
+  }
+  let hebergement;
+
+  try {
+    hebergement = await yup.object(HebergementSchema.schema(false)).validate(
+      {
+        coordonnees,
+        informationsLocaux,
+        informationsTransport,
+        nom,
+      },
+      {
+        abortEarly: false,
+        stripped: true,
+      },
+    );
+  } catch (error) {
+    return next(new ValidationAppError(error));
+  }
+
+  try {
+    await Hebergement.updateWithoutHistory(
+      userId,
+      hebergementId,
+      HebergementHelper.statuts.ACTIF,
+      hebergement,
+    );
+
+    log.i("DONE");
+    return res.sendStatus(200);
+  } catch (error) {
+    if (error.cause === "archive") {
+      return next(new AppError(error));
+    }
+    log.w("DONE with error");
+    return next(error);
+  }
+};
diff --git a/packages/backend/src/controllers/hebergement/get.js b/packages/backend/src/controllers/hebergement/get.js
@@ -8,33 +8,30 @@ const log = logger(module.filename);
 module.exports = async function get(req, res) {
   log.i("IN");
   const { id: userId } = req.decoded;
+  const search = req.query.search ? JSON.parse(req.query.search) : {};
   let hebergements;
-  let searchByUserId = true;
   try {
-    const search = req.query.search ? JSON.parse(req.query.search) : {};
-    if (search?.organismeId) {
-      const organismeUserConnected = await Organisme.getOne({
-        use_id: userId,
-      });
-      if (organismeUserConnected?.organismeId !== search.organismeId) {
-        // Si c'est l'organisme de l'utilisateur connecté on remonte tous les hébergements de cet utilisateur
-        searchByUserId = false;
-        const organismeSiege = await Organisme.getSiege(
-          organismeUserConnected.personneMorale.siret,
+    const organismeUserConnected = await Organisme.getOne({
+      use_id: userId,
+    });
+    const searchByUserId =
+      !search?.organismeId ||
+      organismeUserConnected?.organismeId === search.organismeId;
+    if (!searchByUserId) {
+      const organismeSiege = await Organisme.getSiege(
+        organismeUserConnected.personneMorale.siret,
+      );
+      // L'organisme Siege est bien le même organisme que l'utilisateur connecté
+      if (organismeSiege.organismeId === organismeUserConnected?.organismeId) {
+        hebergements = await Hebergement.getBySiren(
+          organismeSiege.personneMorale.siren,
+          search,
         );
-        // L'organisme Siege est bien le même organisme que l'utilisateur connecté
-        if (
-          organismeSiege.organismeId === organismeUserConnected?.organismeId
-        ) {
-          hebergements = await Hebergement.getBySiren(
-            organismeSiege.personneMorale.siren,
-          );
-        }
       }
     }
     if (searchByUserId) {
       // Si c'est l'oganisme de l'utilisateur connecté on remonte tous les hébergements de cet utilisateur
-      hebergements = await Hebergement.getByUserId(userId);
+      hebergements = await Hebergement.getByUserId(userId, search);
     }
     log.d(hebergements);
     return res.status(200).json({ hebergements });

diff --git a/packages/backend/src/controllers/hebergement/index.js b/packages/backend/src/controllers/hebergement/index.js
@@ -6,3 +6,5 @@ module.exports.getExtract = require("./getExtract");
 module.exports.post = require("./post");
 module.exports.postBrouillon = require("./post-brouillon");
 module.exports.update = require("./update");
+module.exports.updateBrouillon = require("./update-brouillon");
+module.exports.activate = require("./activate");
diff --git a/packages/backend/src/controllers/hebergement/post-brouillon.js b/packages/backend/src/controllers/hebergement/post-brouillon.js
@@ -4,7 +4,6 @@ const HebergementHelper = require("../../helpers/hebergement");
 const HebergementSchema = require("../../schemas/hebergement");
 const logger = require("../../utils/logger");
 const ValidationAppError = require("../../utils/validation-error");
-const AppError = require("../../utils/error");
 const FOUser = require("../../services/FoUser");
 
 const log = logger(module.filename);
@@ -37,10 +36,12 @@ module.exports = async function postbrouillon(req, res, next) {
 
   try {
     const organismeId = await FOUser.getUserOrganisme(userId);
-    const id = await Hebergement.create(userId, organismeId, {
-      ...hebergement,
-      statut: HebergementHelper.statuts.BROUILLON,
-    });
+    const id = await Hebergement.create(
+      userId,
+      organismeId,
+      HebergementHelper.statuts.BROUILLON,
+      hebergement,
+    );
 
     return res.status(200).json({
       id,

diff --git a/packages/backend/src/controllers/hebergement/post.js b/packages/backend/src/controllers/hebergement/post.js
@@ -47,10 +47,12 @@ module.exports = async function post(req, res, next) {
 
   try {
     const organismeId = await FOUser.getUserOrganisme(userId);
-    const id = await Hebergement.create(userId, organismeId, {
-      ...hebergement,
-      statut: HebergementHelper.statuts.ACTIF,
-    });
+    const id = await Hebergement.create(
+      userId,
+      organismeId,
+      HebergementHelper.statuts.ACTIF,
+      hebergement,
+    );
 
     return res.status(200).json({
       id,

diff --git a/packages/backend/src/controllers/hebergement/update-brouillon.js b/packages/backend/src/controllers/hebergement/update-brouillon.js
@@ -0,0 +1,69 @@
+const yup = require("yup");
+const logger = require("../../utils/logger");
+const ValidationAppError = require("../../utils/validation-error");
+const HebergementSchema = require("../../schemas/hebergement");
+const AppError = require("../../utils/error");
+const Hebergement = require("../../services/hebergement/Hebergement");
+const HebergementHelper = require("../../helpers/hebergement");
+
+const log = logger(module.filename);
+
+module.exports = async function updateBrouillon(req, res, next) {
+  const hebergementId = req.params.id;
+  const { body, decoded } = req;
+  const userId = decoded.id;
+
+  const { nom, coordonnees, informationsLocaux, informationsTransport } = body;
+
+  if (
+    !nom ||
+    !coordonnees ||
+    !informationsLocaux ||
+    !informationsTransport ||
+    !hebergementId
+  ) {
+    log.w("missing or invalid parameter");
+
+    return next(
+      new AppError("Paramètre incorrect", {
+        statusCode: 400,
+      }),
+    );
+  }
+  let hebergement;
+
+  try {
+    hebergement = await yup.object(HebergementSchema.schema(true)).validate(
+      {
+        coordonnees,
+        informationsLocaux,
+        informationsTransport,
+        nom,
+      },
+      {
+        abortEarly: false,
+        stripped: true,
+      },
+    );
+  } catch (error) {
+    return next(new ValidationAppError(error));
+  }
+
+  try {
+    await Hebergement.updateWithoutHistory(
+      userId,
+      hebergementId,
+      HebergementHelper.statuts.BROUILLON,
+      hebergement,
+    );
+
+    log.i("DONE");
+    return res.sendStatus(200);
+  } catch (error) {
+    if (error.cause === "archive") {
+      return next(new AppError(error));
+    }
+    log.w("DONE with error");
+    return next(error);
+  }
+};
diff --git a/packages/backend/src/controllers/hebergement/update.js b/packages/backend/src/controllers/hebergement/update.js
@@ -33,7 +33,7 @@ module.exports = async function post(req, res, next) {
   let hebergement;
 
   try {
-    hebergement = await yup.object(HebergementSchema.schema()).validate(
+    hebergement = await yup.object(HebergementSchema.schema(false)).validate(
       {
         coordonnees,
         informationsLocaux,

diff --git a/packages/backend/src/middlewares/checkPermissionBOHebergement.js b/packages/backend/src/middlewares/checkPermissionBOHebergement.js
diff --git a/packages/backend/src/middlewares/checkStatutHebergement.js b/packages/backend/src/middlewares/checkStatutHebergement.js
@@ -0,0 +1,39 @@
+const logger = require("../utils/logger");
+const AppError = require("../utils/error");
+const Hebergement = require("../services/hebergement/Hebergement");
+
+const log = logger(module.filename);
+
+function checkStatutHebergement(statut) {
+  return async (req, res, next) => {
+    const { id: hebergementId } = req.params;
+
+    if (!hebergementId) {
+      return next(
+        new AppError("Paramètres invalides", {
+          statusCode: 400,
+        }),
+      );
+    }
+
+    let hebergementStatut;
+    try {
+      hebergementStatut = await Hebergement.getStatut(hebergementId);
+    } catch (error) {
+      log.w("DONE with error");
+      return next(error);
+    }
+
+    if (statut !== hebergementStatut) {
+      return next(
+        new AppError("Vous n'êtes pas autorisé à accéder à cet hébergement", {
+          statusCode: 403,
+        }),
+      );
+    }
+
+    next();
+  };
+}
+
+module.exports = checkStatutHebergement;
diff --git a/packages/backend/src/routes/__tests__/hebergement/FU-getById.test.js b/packages/backend/src/routes/__tests__/hebergement/FU-getById.test.js
@@ -8,7 +8,12 @@ const checkPermissionHebergement = require("../../../middlewares/checkPermission
 jest.mock("../../../services/hebergement/Hebergement");
 jest.mock("../../../middlewares/checkJWT");
 jest.mock("../../../middlewares/checkPermissionHebergement");
-
+jest.mock(
+  "../../../middlewares/checkStatutHebergement",
+  () => () => (req, res, next) => {
+    next();
+  },
+);
 describe("GET /hebergement/:id", () => {
   const user = {
     id: 1,

diff --git a/packages/backend/src/routes/__tests__/hebergement/admin-getById.test.js b/packages/backend/src/routes/__tests__/hebergement/admin-getById.test.js
@@ -8,7 +8,12 @@ const checkPermissionHebergement = require("../../../middlewares/checkPermission
 jest.mock("../../../services/hebergement/Hebergement");
 jest.mock("../../../middlewares/bo-check-JWT");
 jest.mock("../../../middlewares/checkPermissionHebergement");
-
+jest.mock(
+  "../../../middlewares/checkStatutHebergement",
+  () => () => (req, res, next) => {
+    next();
+  },
+);
 describe("GET /hebergement/admin/:id", () => {
   const user = {
     id: 1,

diff --git a/packages/backend/src/routes/__tests__/hebergement/post.test.js b/packages/backend/src/routes/__tests__/hebergement/post.test.js
@@ -12,7 +12,12 @@ jest.mock("../../../middlewares/checkJWT");
 jest.mock("../../../middlewares/checkPermissionHebergement");
 jest.mock("../../../schemas/hebergement");
 jest.mock("../../../services/FoUser");
-
+jest.mock(
+  "../../../middlewares/checkStatutHebergement",
+  () => () => (req, res, next) => {
+    next();
+  },
+);
 describe("POST /", () => {
   const user = {
     id: 1,
@@ -58,6 +63,7 @@ describe("POST /", () => {
     expect(Hebergement.create).toHaveBeenCalledWith(
       1,
       1,
+      "actif",
       expect.objectContaining(body),
     );
   });

diff --git a/packages/backend/src/routes/__tests__/hebergement/update.test.js b/packages/backend/src/routes/__tests__/hebergement/update.test.js
@@ -9,6 +9,12 @@ const yup = require("yup");
 jest.mock("../../../services/hebergement/Hebergement");
 jest.mock("../../../middlewares/checkJWT");
 jest.mock("../../../middlewares/checkPermissionHebergement");
+jest.mock(
+  "../../../middlewares/checkStatutHebergement",
+  () => () => (req, res, next) => {
+    next();
+  },
+);
 jest.mock("../../../schemas/hebergement");
 
 describe("POST /:id", () => {