fix: suppression du controle de date sur le statut apprenti (#3902)

mission-apprentissage · Jan 20, 2025 · e82cea4 · e82cea4
1 parent 9c8eaa0
commit e82cea4
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 3 deletions.
diff --git a/server/src/common/actions/effectifs.statut.actions.ts b/server/src/common/actions/effectifs.statut.actions.ts
@@ -178,11 +178,14 @@ function determineStatutsByContrats(
   contracts.forEach((contract, index) => {
     const { dateDebut, dateRupture } = contract;
 
-    if (dateDebut <= effectiveDateFin) {
-      statuts.push({ valeur: STATUT_APPRENANT.APPRENTI, date: dateDebut });
+    if (dateDebut) {
+      if (!dateRupture || (dateRupture && dateDebut <= dateRupture)) {
+        // Gestion des rutptures avant démarrage
+        statuts.push({ valeur: STATUT_APPRENANT.APPRENTI, date: dateDebut });
+      }
     }
 
-    if (dateRupture && dateRupture <= effectiveDateFin) {
+    if (dateRupture && dateDebut <= dateRupture) {
       const nextContract = contracts[index + 1];
       if (!nextContract) {
         latestRuptureDate = dateRupture;

diff --git a/server/src/db/migrations/20250120140331-update-computed-type.ts b/server/src/db/migrations/20250120140331-update-computed-type.ts
@@ -0,0 +1,8 @@
+import { addJob } from "job-processor";
+
+export const up = async () => {
+  await addJob({
+    name: "hydrate:effectifs:update_all_computed_statut",
+    queued: true,
+  });
+};
diff --git a/server/src/jobs/jobs.ts b/server/src/jobs/jobs.ts
@@ -179,6 +179,11 @@ export async function setupJobProcessor() {
           return hydrateDecaRaw();
         },
       },
+      "hydrate:effectifs:update_all_computed_statut": {
+        handler: async () => {
+          return hydrateEffectifsComputedTypes();
+        },
+      },
       "hydrate:effectifs:update_computed_statut": {
         handler: async (job, signal) => {
           const organismeId = (job.payload?.id as string) ? new ObjectId(job.payload?.id as string) : null;

diff --git a/server/tests/integration/common/actions/effectifs.types.actions.test.ts b/server/tests/integration/common/actions/effectifs.types.actions.test.ts
@@ -93,9 +93,59 @@ describe("hydrateEffectifsComputedTypes", () => {
 
       expect(updatedEffectif?._computed?.statut?.en_cours).toEqual(STATUT_APPRENANT.APPRENTI);
     });
+
+    it("doit avoir le statut apprenti même si le contrat commence dans le futur", async () => {
+      const customDateDeDebutDeContrat = new Date();
+      customDateDeDebutDeContrat.setDate(customDateDeDebutDeContrat.getDate() + 7);
+
+      const effectif = await createSampleEffectif({
+        organisme: sampleOrganisme,
+        contrats: [
+          {
+            date_debut: customDateDeDebutDeContrat,
+            date_fin: formation.date_fin,
+          },
+        ],
+        formation,
+      });
+
+      const { insertedId } = await effectifsDb().insertOne(effectif as IEffectif);
+      await hydrateEffectifsComputedTypes();
+
+      const updatedEffectif = await effectifsDb().findOne({ _id: insertedId });
+
+      expect(updatedEffectif?._computed?.statut?.en_cours).toEqual(STATUT_APPRENANT.APPRENTI);
+    });
   });
 
   describe("apprenent en formation avec rupture de contrat", () => {
+    it("ne doit  pas avoir le statut d'apprenti si rupture de contrat avant le début du contrat", async () => {
+      const ruptureDate = new Date(formation.date_entree.getTime());
+      ruptureDate.setDate(formation.date_entree.getDate() - 10);
+
+      const customEvalutationDate = new Date(formation.date_entree.getTime() + 10);
+      const effectif = await createSampleEffectif({
+        organisme: sampleOrganisme,
+        contrats: [
+          {
+            date_debut: formation.date_entree,
+            date_fin: formation.date_fin,
+            date_rupture: ruptureDate,
+          },
+        ],
+        formation,
+      });
+
+      const { insertedId } = await effectifsDb().insertOne(effectif as IEffectif);
+      await hydrateEffectifsComputedTypes({ evaluationDate: customEvalutationDate });
+
+      const updatedEffectif = await effectifsDb().findOne({ _id: insertedId });
+
+      expect(updatedEffectif?._computed?.statut?.parcours).toEqual([
+        { valeur: STATUT_APPRENANT.INSCRIT, date: formation.date_entree },
+      ]);
+    });
+
     it("doit avoir le statut rupturant si rupture de moins de 180 jours", async () => {
       const ruptureDate = new Date(evaluationDate.getTime());
       ruptureDate.setDate(ruptureDate.getDate() - 179);