Merge pull request #542 from mission-apprentissage/fix/compteurs-inte…

…ntion fix: compteurs dans la boîte de réception des demandes/intentions
mission-apprentissage · Jan 22, 2025 · 3f6b61b · 3f6b61b
2 parents b48b36a + db0aaec
commit 3f6b61b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 24 deletions.
diff --git a/server/src/modules/demandes/usecases/countDemandes/countDemandes.query.ts b/server/src/modules/demandes/usecases/countDemandes/countDemandes.query.ts
@@ -12,7 +12,7 @@ import { cleanNull } from "@/utils/noNull";
 export interface Filters extends z.infer<typeof countDemandesSchema.querystring> {
   user: RequestUser;
 }
-export const countDemandesQuery = async ({ user, anneeCampagne, codeAcademie, codeNiveauDiplome, search }: Filters) => {
+export const countDemandesQuery = async ({ user, campagne, codeAcademie, codeNiveauDiplome, search }: Filters) => {
   const search_array = getNormalizedSearchArray(search);
 
   const countDemandes = getKbdClient()
@@ -22,14 +22,7 @@ export const countDemandesQuery = async ({ user, anneeCampagne, codeAcademie, co
     .leftJoin("departement", "departement.codeDepartement", "dataEtablissement.codeDepartement")
     .leftJoin("academie", "academie.codeAcademie", "dataEtablissement.codeAcademie")
     .leftJoin("user", "user.id", "demande.createdBy")
-    .innerJoin("campagne", (join) =>
-      join.onRef("campagne.id", "=", "demande.campagneId").$call((eb) => {
-        if (anneeCampagne) {
-          return eb.on("campagne.annee", "=", anneeCampagne);
-        }
-        return eb;
-      })
-    )
+    .innerJoin("campagne", "campagne.id", "demande.campagneId")
     .leftJoin("suivi", (join) =>
       join.onRef("suivi.intentionNumero", "=", "demande.numero").on("suivi.userId", "=", user.id)
     )
@@ -118,6 +111,12 @@ export const countDemandesQuery = async ({ user, anneeCampagne, codeAcademie, co
       if (codeNiveauDiplome) return eb.where("dataFormation.codeNiveauDiplome", "in", codeNiveauDiplome);
       return eb;
     })
+    .$call((eb) => {
+      if (campagne) {
+        return eb.where("campagne.annee", "=", campagne);
+      }
+      return eb;
+    })
     .where(isDemandeNotDeleted)
     .where(isDemandeSelectable({ user }))
     .executeTakeFirstOrThrow()

diff --git a/server/src/modules/demandes/usecases/countDemandes/countDemandes.usecase.ts b/server/src/modules/demandes/usecases/countDemandes/countDemandes.usecase.ts
@@ -11,10 +11,10 @@ const countDemandesFactory =
   ) =>
     async (activeFilters: Filters) => {
       const currentCampagne = await deps.getCurrentCampagneQuery();
-      const anneeCampagne = activeFilters.anneeCampagne ?? currentCampagne.annee;
+      const anneeCampagne = activeFilters.campagne ?? currentCampagne.annee;
 
       return await deps.countDemandesQuery({
-        anneeCampagne,
+        campagne: anneeCampagne,
         ...activeFilters,
       });
     };

diff --git a/server/src/modules/intentions/usecases/countIntentions/countIntentions.query.ts b/server/src/modules/intentions/usecases/countIntentions/countIntentions.query.ts
@@ -19,7 +19,7 @@ export interface Filters extends z.infer<typeof countIntentionsSchema.querystrin
 }
 export const countIntentionsQuery = async ({
   user,
-  anneeCampagne,
+  campagne,
   shouldFetchOnlyIntention,
   search,
   codeAcademie,
@@ -33,14 +33,7 @@ export const countIntentionsQuery = async ({
     .leftJoin("departement", "departement.codeDepartement", "dataEtablissement.codeDepartement")
     .leftJoin("academie", "academie.codeAcademie", "dataEtablissement.codeAcademie")
     .leftJoin("user", "user.id", "intention.createdBy")
-    .innerJoin("campagne", (join) =>
-      join.onRef("campagne.id", "=", "intention.campagneId").$call((eb) => {
-        if (anneeCampagne) {
-          return eb.on("campagne.annee", "=", anneeCampagne);
-        }
-        return eb;
-      })
-    )
+    .innerJoin("campagne", "campagne.id", "intention.campagneId")
     .leftJoin("suivi", (join) =>
       join.onRef("suivi.intentionNumero", "=", "intention.numero").on("suivi.userId", "=", user.id)
     )
@@ -181,6 +174,12 @@ export const countIntentionsQuery = async ({
       }
       return eb;
     })
+    .$call((eb) => {
+      if (campagne) {
+        return eb.where("campagne.annee", "=", campagne);
+      }
+      return eb;
+    })
     .where(isIntentionNotDeleted)
     .where(isIntentionSelectable({ user }))
     .where(isIntentionBrouillonVisible({ user }))

diff --git a/server/src/modules/intentions/usecases/countIntentions/countIntentions.usecase.ts b/server/src/modules/intentions/usecases/countIntentions/countIntentions.usecase.ts
@@ -14,11 +14,11 @@ const countIntentionsFactory =
   ) =>
     async (activeFilters: Filters) => {
       const currentCampagne = await deps.getCurrentCampagneQuery();
-      const anneeCampagne = activeFilters.anneeCampagne ?? currentCampagne.annee;
+      const anneeCampagne = activeFilters.campagne ?? currentCampagne.annee;
 
       const shouldFetchOnlyIntention = anneeCampagne !== CAMPAGNE_DEMANDE;
       return await deps.countIntentionsQuery({
-        anneeCampagne,
+        campagne:anneeCampagne,
         ...activeFilters,
         shouldFetchOnlyIntention,
       });

diff --git a/shared/routes/schemas/get.demandes.count.schema.ts b/shared/routes/schemas/get.demandes.count.schema.ts
@@ -4,7 +4,7 @@ import { DemandeStatutEnum } from "../../enum/demandeStatutEnum";
 
 export const countDemandesSchema = {
   querystring: z.object({
-    anneeCampagne: z.string().optional(),
+    campagne: z.string().optional(),
     search: z.string().optional(),
     codeAcademie: z.array(z.string()).optional(),
     codeNiveauDiplome: z.array(z.string()).optional(),

diff --git a/shared/routes/schemas/get.intentions.count.schema.ts b/shared/routes/schemas/get.intentions.count.schema.ts
@@ -4,7 +4,7 @@ import { DemandeStatutEnum } from "../../enum/demandeStatutEnum";
 
 export const countIntentionsSchema = {
   querystring: z.object({
-    anneeCampagne: z.string().optional(),
+    campagne: z.string().optional(),
     search: z.string().optional(),
     codeAcademie: z.array(z.string()).optional(),
     codeNiveauDiplome: z.array(z.string()).optional(),