chore: cleanup ts / tests

Author: achorein

.cursor/rules/integration-tests.md

@@ -12,6 +12,7 @@ Les tests d'intégrations :
 - ne doivent pas mocker les services
 - ne doivent pas mocker les requetes en base de données
 - doivent mocker les appels externe (axios, services/mail, etc)
+- les données nécessaires au test doivent être créé à l'aide des helpers
 - sont séparés en deux macro-domaines admin (aussi appelé bo) et usagers (aussi appelé fo)
 - le code http retourné doit être testé de façon stricte pour un use case précis (ex: `.toBe(404)` et non `.toBeLessThan(500)` ni `[401, 409, 500]).toContain(response.status)`)
 

.talismanrc

@@ -66,7 +66,7 @@ fileignoreconfig:
 - filename: packages/backend/src/__tests__/admin/accept-cgu.test.ts
   checksum: 692450d4fc33a59b516dab82ef8a447c1b0afa242acfac281b9c4584e330cbda
 - filename: packages/backend/src/__tests__/admin/authentication.test.ts
-  checksum: 528b8fad9ce9931d961b9ed7f7d3da8b779ff2a189dfba4edf4ec788aa83c709
+  checksum: 22348c897455013f64dd60180e4bde2d687254914c26cff65c548f1535b0dcd7
 - filename: packages/backend/src/__tests__/admin/sejour.test.ts
   checksum: d6e5b48000a21797f60865b4c59c09c9860f55c72376b785a21777e1f31d9b40
 - filename: packages/backend/src/__tests__/helper/testContainer.ts
@@ -94,7 +94,7 @@ fileignoreconfig:
 - filename: packages/backend/src/controllers/authentication/email/__tests__/renew-password.test.js
   checksum: 83ed8fdaec5e47e65e05fc8586202a8e2637ebc995fc326a79322cccaac25555
 - filename: packages/backend/src/controllers/authentication/email/forgotten-password.js
-  checksum: 6d0565ac2c741533e6ee3347a1aa2a6c11544dd081907d63bf817d89a2ec1668
+  checksum: 2a94b97c62b1ac4d7942613a926f249398f6659639ba716dc5393d14bb9c471a
 - filename: packages/backend/src/controllers/authentication/email/forgottenPassword.js
   checksum: d66401c29c51850346868ff2d7c097fbd572bbfd8cfae77c87ae5274a7cc8409
 - filename: packages/backend/src/controllers/authentication/email/index.js
@@ -104,19 +104,21 @@ fileignoreconfig:
 - filename: packages/backend/src/controllers/authentication/email/register.js
   checksum: ffe8f1a18fa67c4f00aed6f9ae5ccff003d55a30d9abffa3b66e178b3c0bb08a
 - filename: packages/backend/src/controllers/authentication/email/renew-password.js
-  checksum: b137ab7a643c341d0a2396864d4f65abc4367b8d4b1dcce06a0274bb497c2473
+  checksum: 3478527de3f1a06d217d02319704991dc59dbf2a559327ab6767edc95d31aa2f
 - filename: packages/backend/src/controllers/authentication/email/renewPassword.js
   checksum: 71c7f6afdca8903cb4ad4120ac93e5296cc5bac40dac63391722bb4c2079b422
 - filename: packages/backend/src/controllers/bo-authentication/email/forgotten-password.js
-  checksum: 9c7a31b3ba790969c6f469bbfd69d3b32200783f3f7d044215cbdeef6611141b
+  checksum: 52a72ed685e55a94d27fe3dc20c3b8aee0622ee82f3ce0c7a74b4977b4ebfc6d
 - filename: packages/backend/src/controllers/bo-authentication/email/index.js
   checksum: eed33b015aa92afe378f008ff56de976385b5dccddf1157fadafbe2854884336
 - filename: packages/backend/src/controllers/bo-authentication/email/renew-password.js
-  checksum: b2cfd04d94c5131c43cb80f0d9f210784da4c61fd42f6defd16f2ef93e83c913
+  checksum: b4a61017b7414ae94e60375a696e7bd3b3ee65cc549a963cbfb9c98669524ede
 - filename: packages/backend/src/controllers/siret/getLienSuccession.spec.ts
   checksum: 5c6862263cb7030aac2429eb09b35ab9a54e13c15e633944cdfac95747ec768f
 - filename: packages/backend/src/helpers/__tests__/queryParams.test.js
   checksum: c8b87f647822d4193d521e1d5630de0afbedc9f5273741bb5b419008e059b3fa
+- filename: packages/backend/src/helpers/declaration/mise-en-page.ts
+  checksum: 11396ec3010ca7db3c3fe349da3cd20e6aada4bd176762cdeb3b0515b0e6d282
 - filename: packages/backend/src/helpers/queryParams.js
   checksum: 5c840a9346e912b48660122bb3fd206d4cbedb6f0cb73972724ba95be6f4043b
 - filename: packages/backend/src/middlewares/requestValidatorMiddleware.ts
@@ -163,16 +165,22 @@ fileignoreconfig:
   checksum: 48c16e791d844e7d30d14fec5fcf36798ecb4235b685a204ecf7456ca84364ac
 - filename: packages/backend/src/usagers/agrements/agrements.mail.ts
   checksum: 9435876e82a33a64481b490c8d148c9db042fd15ec42e72e6a8ddb23d5356af8
+- filename: packages/backend/src/utils/canBeActivated.ts
+  checksum: 212a9a708b5135da12f93d9d98e2f9d2dcb8a3408bd3c6d56910f3c1d78cb66a
 - filename: packages/backend/src/utils/mail-service.js
   checksum: bf5f3c01e2edcf3a7ef6d8cbde306deb931a01df88ef90fe911c0c9ace41135c
 - filename: packages/backend/src/utils/mail.js
-  checksum: b7cbdb67f3627bfef8139a2bf9a92c81dd5d448becd069f3a6322c2bfa2c5978
+  checksum: 0cc74581f89fa2652cfa938481f3dfb14f30dc1353d3adec183d269ad3e5bd7b
 - filename: packages/backend/src/utils/pgpool.js
   checksum: 10d6ecbb906b6283646a6b2607cacbe2b6189059c321f3b85b49f73dbbe489be
 - filename: packages/backend/src/utils/pgpoolDoc.js
   checksum: 777a2c86e16769a1305d8fd2cd6a67eb195c2084855fe7fd0b6544af5028b72a
+- filename: packages/backend/src/utils/pgpoolDoc.ts
+  checksum: d55d2efa238244acd799b9fe1d322a1b9fcefea36adc4f534469f70fda630bdf
 - filename: packages/backend/src/utils/regex.js
   checksum: 9e58840c352b67fb278a7409352b7afc6c8a628fb30d19d13f0d52993a5d9463
+- filename: packages/backend/src/utils/regex.ts
+  checksum: 37980111f65aa47d942a24532df417df7c8b7520f009aba83e65388fb88aa0b9
 - filename: packages/backend/src/utils/validation-error.ts
   checksum: 4bec11a784b24d563235f78e271db6c1a9a7f2ebd0bf06544899c3da4f15b533
 - filename: packages/cron/src/notifySuppressionCompteInactif/notifySuppressionCompteInactif.email.ts

packages/backend/package.json

@@ -51,6 +51,7 @@
     "@socialgouv/eslint-config-recommended": "^1.131.0",
     "@testcontainers/postgresql": "^11.7.1",
     "@testcontainers/s3mock": "^11.11.0",
+    "@types/debug": "^4.1.12",
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.12",
     "@types/jsonwebtoken": "^9.0.10",

packages/backend/src/__tests__/admin/authentication.test.ts

@@ -4,7 +4,7 @@ import jwt from "jsonwebtoken";
 import request from "supertest";
 
 import app from "../../app";
-import config from "../../config";
+import { config } from "../../config";
 import boCheckJWT from "../../middlewares/bo-check-JWT";
 import { UsersRepository as AdminUsersRepository } from "../../repositories/admin/Users";
 import { mailService } from "../../services/mail";
@@ -182,67 +182,61 @@ describe("POST /bo-authentication/email/validate", () => {
   });
 });
 
-describe("Routes utilitaires /bo-authentication", () => {
-  it("GET /bo-authentication/check-token retourne 200", async () => {
-    (boCheckJWT as jest.Mock).mockImplementation(
-      (
-        req: { decoded?: { id: number } },
-        _res: Response,
-        next: NextFunction,
-      ) => {
-        req.decoded = { id: 1 };
-        next();
-      },
-    );
-
-    const response = await request(app).get("/bo-authentication/check-token");
+it("GET /bo-authentication/check-token retourne 200", async () => {
+  (boCheckJWT as jest.Mock).mockImplementation(
+    (req: { decoded?: { id: number } }, _res: Response, next: NextFunction) => {
+      req.decoded = { id: 1 };
+      next();
+    },
+  );
 
-    expect(response.status).toBe(200);
-    expect(response.text).toBe("OK");
-  });
+  const response = await request(app).get("/bo-authentication/check-token");
 
-  it("POST /bo-authentication/disconnect retourne 400 sans refresh token", async () => {
-    const response = await request(app).post("/bo-authentication/disconnect");
+  expect(response.status).toBe(200);
+  expect(response.text).toBe("OK");
+});
 
-    expect(response.status).toBe(400);
-    expect(response.body.name).toBe("MissingRefreshToken");
-  });
+it("POST /bo-authentication/disconnect retourne 400 sans refresh token", async () => {
+  const response = await request(app).post("/bo-authentication/disconnect");
 
-  it("POST /bo-authentication/disconnect retourne 200 avec des cookies valides", async () => {
-    const password = "HelloHello1!!";
-    const timestamp = Date.now();
-    const email = `bo-disconnect-${timestamp}@example.com`;
+  expect(response.status).toBe(400);
+  expect(response.body.name).toBe("MissingRefreshToken");
+});
 
-    await AdminUsersRepository.create({
-      user: {
-        cgu_accepted: true,
-        cgu_accepted_at: new Date(),
-        deleted: false,
-        email,
-        nom: "BoNom",
-        password,
-        prenom: "BoPrenom",
-        ter_code: "FRA",
-        validated: true,
-      },
-    });
+it("POST /bo-authentication/disconnect retourne 200 avec des cookies valides", async () => {
+  const password = "HelloHello1!!";
+  const timestamp = Date.now();
+  const email = `bo-disconnect-${timestamp}@example.com`;
+
+  await AdminUsersRepository.create({
+    user: {
+      cgu_accepted: true,
+      cgu_accepted_at: new Date(),
+      deleted: false,
+      email,
+      nom: "BoNom",
+      password,
+      prenom: "BoPrenom",
+      ter_code: "FRA",
+      validated: true,
+    },
+  });
 
-    const loginResponse = await request(app)
-      .post("/bo-authentication/email/login")
-      .send({ email, password });
+  const loginResponse = await request(app)
+    .post("/bo-authentication/email/login")
+    .send({ email, password });
 
-    const setCookieHeader = loginResponse.headers["set-cookie"];
-    const cookies = Array.isArray(setCookieHeader)
-      ? setCookieHeader
-      : setCookieHeader
-        ? [setCookieHeader]
-        : [];
+  const setCookieHeader = loginResponse.headers["set-cookie"];
+  const cookies = Array.isArray(setCookieHeader)
+    ? setCookieHeader
+    : setCookieHeader
+      ? [setCookieHeader]
+      : [];
 
-    const response = await request(app)
-      .post("/bo-authentication/disconnect")
-      .set("Cookie", cookies);
+  const response = await request(app)
+    .post("/bo-authentication/disconnect")
+    .set("Cookie", cookies);
 
-    expect(response.status).toBe(200);
-    expect(response.body.message).toBe("Déconnexion");
-  });
+  expect(response.status).toBe(200);
+  expect(response.body.message).toBe("Déconnexion");
 });

packages/backend/src/__tests__/admin/documents.test.ts

@@ -4,7 +4,7 @@ import request from "supertest";
 import app from "../../app";
 import * as DocumentService from "../../services/Document";
 import { User, UserRequest } from "../../types/request";
-import { getPool as getPoolDoc } from "../../utils/pgpoolDoc";
+import { getPoolDoc } from "../../utils/pgpoolDoc";
 import { createMinimalPdf } from "../helpers/fileHelper";
 import {
   createTestContainer,

packages/backend/src/__tests__/admin/eig.test.ts

@@ -3,11 +3,13 @@ import { NextFunction, Response } from "express";
 import request from "supertest";
 
 import app from "../../app";
+import { roles } from "../../helpers/users";
 import boCheckJWT from "../../middlewares/bo-check-JWT";
 import eigService from "../../services/eig";
 import { User, UserRequest } from "../../types/request";
 import { createAgrement } from "../helpers/agrementsHelper";
 import { createDemandeSejour } from "../helpers/demandeSejourHelper";
+import { createEig } from "../helpers/eigHelper";
 import { createHebergement } from "../helpers/hebergementHelper";
 import { createOrganisme } from "../helpers/organismeHelper";
 import {
@@ -33,15 +35,6 @@ let foUserId = 0;
 let boUserId = 0;
 let declarationId = 0;
 
-const createEig = async (): Promise<number> => {
-  return eigService.create({
-    date: new Date().toISOString().slice(0, 10),
-    declarationId,
-    departement: "75",
-    userId: foUserId,
-  });
-};
-
 beforeAll(async () => {
   await createTestContainer();
   const foUser = await createUsagersUserValide();
@@ -75,7 +68,11 @@ beforeEach(() => {
     (req: UserRequest, _res: Response, next: NextFunction) => {
       req.decoded = {
         id: boUserId,
-        roles: ["eig", "DemandeSejour_Lecture", "DemandeSejour_Ecriture"],
+        roles: [
+          roles.EIG,
+          roles.DEMANDE_SEJOUR_LECTURE,
+          roles.DEMANDE_SEJOUR_ECRITURE,
+        ],
         territoireCode: "FRA",
       } as unknown as User;
       next();
@@ -85,7 +82,7 @@ beforeEach(() => {
 
 describe("Domaine /eig (admin)", () => {
   it("GET /eig/admin/ds/:declarationId retourne les eig", async () => {
-    const eigId = await createEig();
+    const eigId = await createEig({ declarationId, userId: foUserId });
     await eigService.depose(eigId);
 
     const response = await request(app).get(`/eig/admin/ds/${declarationId}`);
@@ -94,7 +91,7 @@ describe("Domaine /eig (admin)", () => {
   });
 
   it("GET /eig/admin retourne la liste admin", async () => {
-    const eigId = await createEig();
+    const eigId = await createEig({ declarationId, userId: foUserId });
     await eigService.depose(eigId);
 
     const response = await request(app).get("/eig/admin").query({
@@ -105,7 +102,7 @@ describe("Domaine /eig (admin)", () => {
   });
 
   it("GET /eig/admin/pdf/:id retourne un pdf", async () => {
-    const eigId = await createEig();
+    const eigId = await createEig({ declarationId, userId: foUserId });
     await eigService.depose(eigId);
 
     const response = await request(app).get(`/eig/admin/pdf/${eigId}`);
@@ -125,7 +122,7 @@ describe("Domaine /eig (admin)", () => {
   });
 
   it("GET /eig/admin/:id retourne un eig", async () => {
-    const eigId = await createEig();
+    const eigId = await createEig({ declarationId, userId: foUserId });
     await eigService.depose(eigId);
 
     const response = await request(app).get(`/eig/admin/${eigId}`);
@@ -145,7 +142,7 @@ describe("Domaine /eig (admin)", () => {
       },
     );
 
-    const eigId = await createEig();
+    const eigId = await createEig({ declarationId, userId: foUserId });
     await eigService.depose(eigId);
 
     const response = await request(app).post(
@@ -156,7 +153,7 @@ describe("Domaine /eig (admin)", () => {
   });
 
   it("POST /eig/admin/:id/mark-as-read retourne 400 en statut brouillon", async () => {
-    const eigId = await createEig();
+    const eigId = await createEig({ declarationId, userId: foUserId });
     const response = await request(app).post(
       `/eig/admin/${eigId}/mark-as-read`,
     );

packages/backend/src/__tests__/admin/message.test.ts

@@ -2,6 +2,7 @@ import { NextFunction, Response } from "express";
 import request from "supertest";
 
 import app from "../../app";
+import { roles } from "../../helpers/users";
 import boCheckJWT from "../../middlewares/bo-check-JWT";
 import { User, UserRequest } from "../../types/request";
 import { createDemandeSejour } from "../helpers/demandeSejourHelper";
@@ -46,7 +47,7 @@ beforeEach(() => {
     (req: UserRequest, _res: Response, next: NextFunction) => {
       req.decoded = {
         id: boUserID,
-        roles: ["DemandeSejour_Lecture", "DemandeSejour_Ecriture"],
+        roles: [roles.DEMANDE_SEJOUR_LECTURE, roles.DEMANDE_SEJOUR_ECRITURE],
         territoireCode: "FRA",
       } as unknown as User;
       next();

packages/backend/src/__tests__/admin/sejour.test.ts

@@ -2,6 +2,7 @@ import { NextFunction, Response } from "express";
 import request from "supertest";
 
 import app from "../../app";
+import { roles } from "../../helpers/users";
 import boCheckJWT from "../../middlewares/bo-check-JWT";
 import DemandeSejour from "../../services/DemandeSejour";
 import { User, UserRequest } from "../../types/request";
@@ -50,7 +51,7 @@ beforeEach(() => {
     (req: UserRequest, _res: Response, next: NextFunction) => {
       req.decoded = {
         id: boUserId,
-        roles: ["DemandeSejour_Lecture", "DemandeSejour_Ecriture"],
+        roles: [roles.DEMANDE_SEJOUR_LECTURE, roles.DEMANDE_SEJOUR_ECRITURE],
         territoireCode: "FRA",
       } as unknown as User;
       next();

packages/backend/src/__tests__/debug-sentry.test.ts

@@ -1,7 +1,7 @@
 import request from "supertest";
 
 import app from "../app";
-import config from "../config";
+import { config } from "../config";
 
 describe("GET /debug-sentry", () => {
   it("retourne une erreur gérée quand la route est activée", async () => {