feat(release): ds8j

.github/workflows/deactivate.yaml

@@ -1,7 +1,5 @@
 name: ♻️ Deactivate
 on:
-  pull_request:
-    types: [closed]
   delete:
     branches:
       - "**"

.github/workflows/review-auto.yaml

@@ -1,5 +1,6 @@
 name: 👓 Review Auto
 on:
+  workflow_dispatch:
   push:
     branches:
       - main

.kontinuous/env/prod/values.yaml

@@ -1,14 +1,20 @@
 backend:
+  autoscale:
+    enabled: true
   host: api-vao.social.gouv.fr
   redirectFrom:
     - "api-{{ .Values.global.host }}"
 
 frontend-usagers:
+  autoscale:
+    enabled: true
   host: vao.social.gouv.fr
   redirectFrom:
     - "{{ .Values.global.host }}"
 
 frontend-bo:
+  autoscale:
+    enabled: true
   host: admin-vao.social.gouv.fr
   redirectFrom:
     - "bo-{{ .Values.global.host }}"
@@ -28,4 +34,4 @@ jobs:
           NUXT_PUBLIC_APP_VERSION: "{{ .Values.global.gitBranch }}"
           NUXT_PUBLIC_BACKEND_URL: "https://api-vao.social.gouv.fr"
           NUXT_PUBLIC_ENVIRONMENT: "production"
-          NUXT_PUBLIC_SENTRY_ENABLED: "true"
+          NUXT_PUBLIC_SENTRY_ENABLED: "true"

.talismanrc

@@ -134,7 +134,7 @@ fileignoreconfig:
 - filename: packages/frontend-bo/src/components/demandes-sejour/Details.vue
   checksum: 2fcd6dcc607405fbbdf7dc8c5b9cf6229e8a65593503b5ebb55786b9788c514f
 - filename: packages/frontend-bo/src/components/demandes-sejour/DisplayFormulaire.vue
-  checksum: 7ca8cd5ca845caecf1d10ba0af46a4cff4e4f22537d7ba703ea04680143f8de0
+  checksum: 0c1ba679433b38f376fbbecfa020e9e7375c8a816ac43b1e46ab2225e9f19342
 - filename: packages/frontend-bo/src/components/demandes-sejour/DisplayPj.vue
   checksum: 7416e86be161886c048c7108e2ef95027e0dbaa858d2b4961e1effa469e98901
 - filename: packages/frontend-bo/src/components/utils/TableFull.vue
@@ -216,13 +216,3 @@ fileignoreconfig:
 scopeconfig:
 - scope: node
 version: "1.0"
-aa193faebb2d
-  - filename: pg/scripts/03/03-3-front-data.sql
-    checksum: 413817c8133c69f883087a7042258dcb75e4f75a45897ea830f86d8a5cba561a
-  - filename: pg/scripts/03/03-3-ref-data.sql
-    checksum: 0738f07a54568f11530944b7dd793718435c7b1ab6cc6eacf6739f380fb1eb83
-  - filename: pg/seeds/BO-1-back-user.sql
-    checksum: 2261cabf80475ffa0c06e59760d4a89ea3331b81062fe5e8640745741a562995
-scopeconfig:
-  - scope: node
-version: "1.0"

packages/backend/package.json

@@ -8,7 +8,7 @@
     "dev": "nodemon --inspect=0.0.0.0:9229 src/index.js"
   },
   "dependencies": {
-    "@sentry/node": "~7.109.0", 
+    "@sentry/node": "~7.117.0", 
     "axios": "^1.6.8",
     "body-parser": "~1.20.2",
     "cookie-parser": "^1.4.6",
@@ -21,7 +21,7 @@
     "helmet": "~7.1.0", 
     "jsonwebtoken": "^9.0.2",
     "multer": "^1.4.5-lts.1",
-    "pg": "~8.11.3",
+    "pg": "~8.12.0",
     "pg-format": "~1.0.4",
     "yup": "~1.4.0",
     "nodemailer": "^6.9.13",

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

@@ -0,0 +1,76 @@
+const DemandeSejour = require("../../services/DemandeSejour");
+const Organisme = require("../../services/Organisme");
+const { statuts } = require("../../helpers/ds-statuts");
+
+const logger = require("../../utils/logger");
+const AppError = require("../../utils/error");
+
+const log = logger(module.filename);
+
+module.exports = async function post(req, res, next) {
+  const demandeSejourId = req.params.id;
+  const { id: userId } = req.decoded;
+
+  log.i("IN", { demandeSejourId });
+
+  try {
+    const organisme = await Organisme.getOne({
+      use_id: userId,
+    });
+    const sourceDeclaration = await DemandeSejour.getOne({
+      "ds.id": demandeSejourId,
+      "o.id": organisme.organismeId,
+    });
+
+    if (!sourceDeclaration) {
+      log.w("DONE with error");
+      return next(
+        new AppError("Déclaration non trouvée", {
+          statusCode: 404,
+        }),
+      );
+    }
+
+    if (
+      sourceDeclaration.statut !== statuts.BROUILLON &&
+      sourceDeclaration.statut !== statuts.TRANSMISE &&
+      sourceDeclaration.statut !== statuts.EN_COURS
+    ) {
+      log.w("DONE with error");
+      return next(
+        new AppError("Le statut de la déclaration ne permet pas sa copie", {
+          statusCode: 404,
+        }),
+      );
+    }
+
+    sourceDeclaration.files = sourceDeclaration.files?.files?.filter(
+      (f) =>
+        f.type !== "declaration_2_mois" && f.type !== "AR_declaration_2_mois",
+    );
+
+    const demandeId = await DemandeSejour.copy(sourceDeclaration);
+    if (!demandeId) {
+      log.w("DONE with error");
+      return next(
+        new AppError("Erreur de copie", {
+          statusCode: 400,
+        }),
+      );
+    }
+    await DemandeSejour.insertEvent(
+      "Organisateur",
+      demandeId,
+      userId,
+      null,
+      "declaration_sejour",
+      "creation",
+      {},
+    );
+    log.i("DONE");
+
+    return res.status(200).json({ demandeId });
+  } catch (err) {
+    log.w(err);
+  }
+};

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

@@ -0,0 +1,62 @@
+const { statuts } = require("../../helpers/ds-statuts");
+const DemandeSejour = require("../../services/DemandeSejour");
+
+const logger = require("../../utils/logger");
+const AppError = require("../../utils/error");
+
+const log = logger(module.filename);
+
+module.exports = async function post(req, res, next) {
+  const demandeSejourId = req.params.id;
+  const { id: userId } = req.decoded;
+
+  log.i("IN", { demandeSejourId });
+
+  try {
+    const declaration = await DemandeSejour.getOne({
+      "ds.id": demandeSejourId,
+    });
+
+    if (!declaration) {
+      log.w("DONE with error");
+      return next(
+        new AppError("Déclaration non trouvée", {
+          statusCode: 404,
+        }),
+      );
+    }
+    log.i(declaration.statut);
+    if (declaration.statut !== statuts.BROUILLON) {
+      log.w("DONE with error");
+      return next(
+        new AppError(
+          "Impossible de supprimer une demande qui n'est pas au statut BROUILLON",
+          {
+            statusCode: 400,
+          },
+        ),
+      );
+    }
+    const deletedRows = await DemandeSejour.delete(declaration.id, userId);
+    if (deletedRows !== 1) {
+      log.w(`DONE with error, ${deletedRows} rows were deleted, expected one `);
+      return next(
+        new AppError(
+          "Erreur de suppression, trop de lignes supprimées ou pas assez",
+          {
+            statusCode: 400,
+          },
+        ),
+      );
+    }
+    log.i("DONE");
+    return res.status(200).json({ deletedRows });
+  } catch (err) {
+    log.w(err);
+    return next(
+      new AppError("Erreur de suppression", {
+        statusCode: 400,
+      }),
+    );
+  }
+};

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

@@ -52,28 +52,30 @@ module.exports = async function post(req, res, next) {
     );
   }
 
-  if (declaration.statut !== statuts.EN_COURS) {
+  if (declaration.statut !== statuts.EN_COURS && declaration.statut !== statuts.EN_COURS_8J) {
     log.w("Delaration should be in statut EN COURS");
     return res.status(400).json({
       message: "Statut non compatible",
     });
   }
 
+  const AModifierType = declaration.statut === statuts.EN_COURS ? statuts.A_MODIFIER : statuts.A_MODIFIER_8J
+  const textTypePrecision = "Demande de compléments " + (declaration.statut === statuts.EN_COURS ? " 2 mois" : " 8 jours");
   try {
     const destinataires = await DemandeSejour.getEmailToList(
       declaration.organismeId,
     );
 
     await DemandeSejour.updateStatut(
       declarationId,
-      statuts.A_MODIFIER,
+      AModifierType,
       {
         boUserId: userId,
         declarationId,
         metaData: { commentaire },
         source: `DDETS ${territoireCode}`,
         type: "declaration_sejour",
-        typePrecision: "Demande de complémements",
+        typePrecision: textTypePrecision,
         userId: null,
       },
       () =>