chore(api): clean up create candidacy helper args

SocialGouv · Nov 22, 2024 · 725815b · 725815b
1 parent e755d63
commit 725815b
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 65 deletions.
diff --git a/packages/reva-api/modules/candidacy/candidacy.take-over.test.ts b/packages/reva-api/modules/candidacy/candidacy.take-over.test.ts
@@ -69,7 +69,7 @@ test("candidacy_takeOver should fail when candidacy manager has wrong organism",
 
 test("candidacy_takeOver should do nothing when candidacy status is not validation", async function () {
   const candidacy = await createCandidacyHelper({
-    status: CandidacyStatusStep.PROJET,
+    candidacyActiveStatus: CandidacyStatusStep.PROJET,
   });
   const resp = await injectGraphql({
     fastify: (global as any).fastify,
@@ -93,7 +93,7 @@ test("candidacy_takeOver should do nothing when candidacy status is not validati
 
 test("candidacy_takeOver should update candidacy statuses when active status is validation", async function () {
   const candidacy = await createCandidacyHelper({
-    status: CandidacyStatusStep.VALIDATION,
+    candidacyActiveStatus: CandidacyStatusStep.VALIDATION,
   });
   const resp = await injectGraphql({
     fastify: (global as any).fastify,

diff --git a/packages/reva-api/modules/candidacy/candidacy.type-accompagnement.test.ts b/packages/reva-api/modules/candidacy/candidacy.type-accompagnement.test.ts
@@ -13,7 +13,9 @@ afterEach(async () => {
 });
 
 test("candidate should be able to change it's type_accompagnement when the candidacy is still in project", async () => {
-  const candidacy = await createCandidacyHelper({}, CandidacyStatusStep.PROJET);
+  const candidacy = await createCandidacyHelper({
+    candidacyActiveStatus: CandidacyStatusStep.PROJET,
+  });
   const candidateKeycloakId = candidacy.candidate?.keycloakId;
 
   const resp = await injectGraphql({
@@ -38,10 +40,9 @@ test("candidate should be able to change it's type_accompagnement when the candi
 });
 
 test("candidate should NOT be able to change it's type_accompagnement when the candidacy is not in project", async () => {
-  const candidacy = await createCandidacyHelper(
-    {},
-    CandidacyStatusStep.VALIDATION,
-  );
+  const candidacy = await createCandidacyHelper({
+    candidacyActiveStatus: CandidacyStatusStep.VALIDATION,
+  });
   const candidateKeycloakId = candidacy.candidate?.keycloakId;
 
   const resp = await injectGraphql({

diff --git a/.../reva-api/modules/candidacy/certification/features/updateCertificationOfCandidacy.test.ts b/.../reva-api/modules/candidacy/certification/features/updateCertificationOfCandidacy.test.ts
@@ -91,10 +91,9 @@ afterEach(async () => {
 });
 
 test("a candidate should be able to select a new certification while a training is sent", async () => {
-  const candidacy = await createCandidacyHelper(
-    {},
-    CandidacyStatusStep.PARCOURS_ENVOYE,
-  );
+  const candidacy = await createCandidacyHelper({
+    candidacyActiveStatus: CandidacyStatusStep.PARCOURS_ENVOYE,
+  });
   const organismKeycloakId = candidacy.organism?.accounts[0].keycloakId ?? "";
   const certification = await createCertificationHelper();
   await submitTraining({
@@ -137,10 +136,9 @@ test("a candidate should not be able to select a new certification after the tra
 });
 
 test("should reset the training and status when selecting a new certification", async () => {
-  const candidacy = await createCandidacyHelper(
-    {},
-    CandidacyStatusStep.PARCOURS_ENVOYE,
-  );
+  const candidacy = await createCandidacyHelper({
+    candidacyActiveStatus: CandidacyStatusStep.PARCOURS_ENVOYE,
+  });
   const candidacyId = candidacy.id;
   const organismKeycloakId = candidacy.organism?.accounts[0].keycloakId ?? "";
   const certification = await createCertificationHelper();

diff --git a/packages/reva-api/modules/candidacy/features/archiveCandidacy.test.ts b/packages/reva-api/modules/candidacy/features/archiveCandidacy.test.ts
@@ -15,10 +15,9 @@ describe("archive candidacy", () => {
     }).rejects.toThrow(FunctionalCodeError.CANDIDACY_DOES_NOT_EXIST);
   });
   test("should fail with CANDIDACY_ALREADY_ARCHIVE", async () => {
-    const candidacyArchived = await createCandidacyHelper(
-      {},
-      CandidacyStatusStep.ARCHIVE,
-    );
+    const candidacyArchived = await createCandidacyHelper({
+      candidacyActiveStatus: CandidacyStatusStep.ARCHIVE,
+    });
     await expect(async () => {
       await archiveCandidacy({
         candidacyId: candidacyArchived.id,

diff --git a/packages/reva-api/modules/candidacy/features/cancelDropOutCandidacy.test.ts b/packages/reva-api/modules/candidacy/features/cancelDropOutCandidacy.test.ts
@@ -1,3 +1,4 @@
+import { CandidacyStatusStep } from "@prisma/client";
 import { prismaClient } from "../../../prisma/client";
 import { createCandidacyDropOutHelper } from "../../../test/helpers/entities/create-candidacy-drop-out-helper";
 
@@ -39,7 +40,9 @@ describe("cancel drop out candidacy", () => {
   });
 
   test("should return empty dropout reasons for the candidacy", async () => {
-    const candidacy = await createCandidacyHelper({}, "ARCHIVE");
+    const candidacy = await createCandidacyHelper({
+      candidacyActiveStatus: CandidacyStatusStep.ARCHIVE,
+    });
     const candidacyDropOut = await prismaClient.candidacyDropOut.findUnique({
       where: {
         candidacyId: candidacy.id,

diff --git a/packages/reva-api/modules/candidacy/features/selectOrganismForCandidacy.test.ts b/packages/reva-api/modules/candidacy/features/selectOrganismForCandidacy.test.ts
@@ -90,7 +90,9 @@ afterEach(async () => {
 });
 
 test("a candidate should be able to select a new organism while a training is sent", async () => {
-  const candidacy = await createCandidacyHelper({}, CandidacyStatusStep.PROJET);
+  const candidacy = await createCandidacyHelper({
+    candidacyActiveStatus: CandidacyStatusStep.PROJET,
+  });
   const candidacyId = candidacy.id;
   const candidateKeycloakId = candidacy.candidate?.keycloakId ?? "";
   const organismToSelect = await createOrganismHelper();
@@ -140,10 +142,9 @@ test("a candidate should not be able to select a new organism after the training
 });
 
 test("should reset the status to validation when selecting a new organism and status is prise_en_charge", async () => {
-  const candidacy = await createCandidacyHelper(
-    {},
-    CandidacyStatusStep.PRISE_EN_CHARGE,
-  );
+  const candidacy = await createCandidacyHelper({
+    candidacyActiveStatus: CandidacyStatusStep.PRISE_EN_CHARGE,
+  });
   const candidacyId = candidacy.id;
   const candidateKeycloakId = candidacy.candidate?.keycloakId ?? "";
   const organism = await createOrganismHelper();
@@ -164,10 +165,9 @@ test("should reset the status to validation when selecting a new organism and st
 });
 
 test("should reset the training and update the status when selecting a new organism", async () => {
-  const candidacy = await createCandidacyHelper(
-    {},
-    CandidacyStatusStep.PARCOURS_ENVOYE,
-  );
+  const candidacy = await createCandidacyHelper({
+    candidacyActiveStatus: CandidacyStatusStep.PARCOURS_ENVOYE,
+  });
   const candidacyId = candidacy.id;
   const candidateKeycloakId = candidacy.candidate?.keycloakId ?? "";
   const organism = await createOrganismHelper();

diff --git a/packages/reva-api/modules/candidacy/features/unarchiveCandidacy.test.ts b/packages/reva-api/modules/candidacy/features/unarchiveCandidacy.test.ts
@@ -1,3 +1,4 @@
+import { CandidacyStatusStep } from "@prisma/client";
 import { createCandidacyHelper } from "../../../test/helpers/entities/create-candidacy-helper";
 import { createReorientationReasonHelper } from "../../../test/helpers/entities/create-reorientation-reason-helper";
 import { FunctionalCodeError } from "../../shared/error/functionalError";
@@ -24,12 +25,12 @@ describe("unarchive candidacy", () => {
 
   test("should fail with CANDIDACY_IS_REORIENTATION", async () => {
     const reorientationReason = await createReorientationReasonHelper();
-    const candidacy = await createCandidacyHelper(
-      {
+    const candidacy = await createCandidacyHelper({
+      candidacyArgs: {
         reorientationReasonId: reorientationReason.id,
       },
-      "ARCHIVE",
-    );
+      candidacyActiveStatus: CandidacyStatusStep.ARCHIVE,
+    });
     await expect(async () => {
       await unarchiveCandidacy({
         candidacyId: candidacy.id,

diff --git a/packages/reva-api/modules/candidacy/security/candidacy.security.test.ts b/packages/reva-api/modules/candidacy/security/candidacy.security.test.ts
@@ -87,7 +87,9 @@ test("Random candidate should not be able to access the candidacy", async () =>
 test("Aap associated to the candidacy should be able to access it", async () => {
   const organism = await createOrganismHelper();
   const candidacy = await createCandidacyHelper({
-    organismId: organism.id,
+    candidacyArgs: {
+      organismId: organism.id,
+    },
   });
 
   const resp = await getCandidacy({
@@ -104,7 +106,7 @@ test("Aap associated to the candidacy should be able to access it", async () =>
 
 test("Random aap should not be able to access the candidacy", async () => {
   const organism = await createOrganismHelper();
-  const candidacy = await createCandidacyHelper({});
+  const candidacy = await createCandidacyHelper();
   const resp = await getCandidacy({
     role: "manage_candidacy",
     keycloakId: organism.accounts[0].keycloakId,
@@ -120,7 +122,9 @@ test("Random aap should not be able to access the candidacy", async () => {
 test("Maison mere manager of the aap associated to the candidacy should be able to access it", async () => {
   const organism = await createOrganismHelper();
   const candidacy = await createCandidacyHelper({
-    organismId: organism.id,
+    candidacyArgs: {
+      organismId: organism.id,
+    },
   });
 
   const resp = await getCandidacy({

diff --git a/packages/reva-api/modules/candidacy/training/training.test.ts b/packages/reva-api/modules/candidacy/training/training.test.ts
@@ -15,7 +15,9 @@ afterEach(async () => {
 });
 
 test("AAP should not be able to submit a training form if its status is in 'PROJET'", async () => {
-  const candidacy = await createCandidacyHelper({}, CandidacyStatusStep.PROJET);
+  const candidacy = await createCandidacyHelper({
+    candidacyActiveStatus: CandidacyStatusStep.PROJET,
+  });
   const organismKeycloakId = candidacy.organism?.accounts[0].keycloakId;
 
   const resp = await injectGraphql({
@@ -41,10 +43,9 @@ test("AAP should not be able to submit a training form if its status is in 'PROJ
 });
 
 test("AAP should be able to submit a basic training form when candidacy status is 'PRISE_EN_CHARGE' and its finance module is 'unifvae'", async () => {
-  const candidacy = await createCandidacyHelper(
-    {},
-    CandidacyStatusStep.PRISE_EN_CHARGE,
-  );
+  const candidacy = await createCandidacyHelper({
+    candidacyActiveStatus: CandidacyStatusStep.PRISE_EN_CHARGE,
+  });
   const organismKeycloakId = candidacy.organism?.accounts[0].keycloakId;
 
   const resp = await injectGraphql({
@@ -70,12 +71,12 @@ test("AAP should be able to submit a basic training form when candidacy status i
 });
 
 test("AAP should not be able to submit a basic training form without an estimated costwhen candidacy financeModule is 'hors_plateforme'", async () => {
-  const candidacy = await createCandidacyHelper(
-    {
+  const candidacy = await createCandidacyHelper({
+    candidacyArgs: {
       financeModule: "hors_plateforme",
     },
-    CandidacyStatusStep.PRISE_EN_CHARGE,
-  );
+    candidacyActiveStatus: CandidacyStatusStep.PRISE_EN_CHARGE,
+  });
   const organismKeycloakId = candidacy.organism?.accounts[0].keycloakId;
 
   const resp = await injectGraphql({
@@ -101,12 +102,12 @@ test("AAP should not be able to submit a basic training form without an estimate
 });
 
 test("AAP should not be able to submit a basic training form without at least one financing method  when candidacy financeModule is 'hors_plateforme'", async () => {
-  const candidacy = await createCandidacyHelper(
-    {
+  const candidacy = await createCandidacyHelper({
+    candidacyArgs: {
       financeModule: "hors_plateforme",
     },
-    CandidacyStatusStep.PRISE_EN_CHARGE,
-  );
+    candidacyActiveStatus: CandidacyStatusStep.PRISE_EN_CHARGE,
+  });
   const organismKeycloakId = candidacy.organism?.accounts[0].keycloakId;
 
   const resp = await injectGraphql({
@@ -132,12 +133,12 @@ test("AAP should not be able to submit a basic training form without at least on
 });
 
 test("AAP should not be able to submit a basic training form without a text when the 'other source' financing method has been checked", async () => {
-  const candidacy = await createCandidacyHelper(
-    {
+  const candidacy = await createCandidacyHelper({
+    candidacyArgs: {
       financeModule: "hors_plateforme",
     },
-    CandidacyStatusStep.PRISE_EN_CHARGE,
-  );
+    candidacyActiveStatus: CandidacyStatusStep.PRISE_EN_CHARGE,
+  });
   const organismKeycloakId = candidacy.organism?.accounts[0].keycloakId;
 
   const resp = await injectGraphql({
@@ -169,12 +170,12 @@ test("AAP should not be able to submit a basic training form without a text when
 });
 
 test("AAP should be able to submit a basic training form when candidacy status is 'PRISE_EN_CHARGE' and its finance module is 'hors_plateforme'", async () => {
-  const candidacy = await createCandidacyHelper(
-    {
+  const candidacy = await createCandidacyHelper({
+    candidacyArgs: {
       financeModule: "hors_plateforme",
     },
-    CandidacyStatusStep.PRISE_EN_CHARGE,
-  );
+    candidacyActiveStatus: CandidacyStatusStep.PRISE_EN_CHARGE,
+  });
   const organismKeycloakId = candidacy.organism?.accounts[0].keycloakId;
 
   const resp = await injectGraphql({

diff --git a/packages/reva-api/test/helpers/entities/create-candidacy-helper.ts b/packages/reva-api/test/helpers/entities/create-candidacy-helper.ts
@@ -10,10 +10,12 @@ import { createCandidateHelper } from "./create-candidate-helper";
 import { createCertificationHelper } from "./create-certification-helper";
 import { createOrganismHelper } from "./create-organism-helper";
 
-export const createCandidacyHelper = async (
-  candidacyArgs?: Partial<Candidacy>,
-  candidacyActiveStatus?: CandidacyStatusStep,
-) => {
+export const createCandidacyHelper = async (args?: {
+  candidacyArgs?: Partial<Candidacy>;
+  candidacyActiveStatus?: CandidacyStatusStep;
+}) => {
+  const { candidacyArgs, candidacyActiveStatus } = args ?? {};
+
   const certification = await createCertificationHelper();
   const department = await prismaClient.department.findFirst({
     where: { code: "75" },

diff --git a/packages/reva-api/test/helpers/entities/create-feasibility-dematerialized-helper.ts b/packages/reva-api/test/helpers/entities/create-feasibility-dematerialized-helper.ts
@@ -19,10 +19,10 @@ export const createFeasibilityDematerializedHelper = async ({
   candidacyArgs?: Partial<Candidacy>;
   candidacyActiveStatus?: CandidacyStatusStep;
 }) => {
-  const candidacy = await createCandidacyHelper(
+  const candidacy = await createCandidacyHelper({
     candidacyArgs,
     candidacyActiveStatus,
-  );
+  });
 
   return prismaClient.feasibility.create({
     data: {

diff --git a/packages/reva-api/test/helpers/entities/create-feasibility-uploaded-pdf-helper.ts b/packages/reva-api/test/helpers/entities/create-feasibility-uploaded-pdf-helper.ts
@@ -19,10 +19,10 @@ export const createFeasibilityUploadedPdfHelper = async ({
   candidacyArgs?: Partial<Candidacy>;
   candidacyActiveStatus?: CandidacyStatusStep;
 }) => {
-  const candidacy = await createCandidacyHelper(
+  const candidacy = await createCandidacyHelper({
     candidacyArgs,
     candidacyActiveStatus,
-  );
+  });
   const file = await createFileHelper();
 
   return prismaClient.feasibility.create({