fix: taux de transformation page pilotage de la réforme (#507)

* fix: taux de transformation page pilotage de la réforme * fix: nom de fichier d'export trop long * fix: ajout des enums de demande --------- Co-authored-by: Gaetan BUSATO <[email protected]>
mission-apprentissage · Dec 16, 2024 · 4ae9228 · 4ae9228
1 parent db3e04d
commit 4ae9228
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 66 deletions.
diff --git a/server/src/modules/data/usecases/getPilotageReformeStats/dependencies.ts b/server/src/modules/data/usecases/getPilotageReformeStats/dependencies.ts
@@ -1,5 +1,4 @@
 import { sql } from "kysely";
-import { NEXT_RENTREE } from "shared/time/NEXT_RENTREE";
 
 import { getKbdClient } from "@/db/db";
 import { getMillesimeFromRentreeScolaire } from "@/modules/data/services/getMillesime";
@@ -13,12 +12,13 @@ import {
   notHistoriqueIndicateurRegionSortie,
 } from "@/modules/data/utils/notHistorique";
 import { genericOnConstatRentree } from "@/modules/data/utils/onConstatDeRentree";
+import { genericOnDemandes } from "@/modules/data/utils/onDemande";
 import { selectTauxInsertion6moisAgg } from "@/modules/data/utils/tauxInsertion6mois";
 import { selectTauxPoursuiteAgg } from "@/modules/data/utils/tauxPoursuite";
-import { countPlacesTransformeesParCampagne } from "@/modules/utils/countCapacite";
-import { isDemandeNotAjustementRentree, isDemandeNotDeletedOrRefused } from "@/modules/utils/isDemandeSelectable";
 import { cleanNull } from "@/utils/noNull";
 
+import type { Filters } from "./getPilotageReformeStats.usecase";
+
 const getRentreesScolaires = async () => {
   return await getKbdClient()
     .selectFrom("indicateurEntree")
@@ -167,34 +167,19 @@ const findFiltersInDb = async () => {
   };
 };
 
-const getTauxTransformationData = async (filters: { codeNiveauDiplome?: string[]; codeRegion?: string }) => {
+const getTauxTransformationData = async (filters: Filters) => {
   return getKbdClient()
-    .selectFrom("latestDemandeIntentionView as demande")
-    .leftJoin("dataFormation", "dataFormation.cfd", "demande.cfd")
-    .leftJoin("dataEtablissement", "dataEtablissement.uai", "demande.uai")
-    .leftJoin("campagne", "campagne.id", "demande.campagneId")
+    .selectFrom(genericOnDemandes({ ...filters, rentreeScolaire: ["2025"] }).as("demande"))
+    .leftJoin(
+      genericOnConstatRentree(filters)
+        .select((eb) => [sql<number>`SUM(${eb.ref("constatRentree.effectif")})`.as("effectif")])
+        .as("effectifs"),
+      (join) => join.onTrue()
+    )
     .select((eb) => [
-      eb.fn.coalesce(eb.fn.sum<number>(countPlacesTransformeesParCampagne(eb)), sql`0`).as("transformes"),
-      genericOnConstatRentree({ ...filters })
-        .select((eb) => eb.fn.coalesce(eb.fn.sum<number>("effectif"), eb.val(0)).as("effectif"))
-        .as("effectif"),
+      eb.fn.coalesce("effectifs.effectif", eb.val(0)).as("effectif"),
+      eb.fn.coalesce("placesTransformees", eb.val(0)).as("placesTransformees"),
     ])
-    .where(isDemandeNotDeletedOrRefused)
-    .where(isDemandeNotAjustementRentree)
-    .$call((eb) => {
-      return eb.where("demande.rentreeScolaire", "in", [parseInt(NEXT_RENTREE)]);
-    })
-    .$call((eb) => {
-      if (filters.codeNiveauDiplome)
-        return eb.where("dataFormation.codeNiveauDiplome", "in", filters.codeNiveauDiplome);
-      return eb;
-    })
-    .$call((eb) => {
-      if (filters.codeRegion) {
-        return eb.where("dataEtablissement.codeRegion", "=", filters.codeRegion);
-      }
-      return eb;
-    })
     .execute()
     .then(cleanNull);
 };

diff --git a/server/src/modules/data/usecases/getPilotageReformeStats/getPilotageReformeStats.usecase.ts b/server/src/modules/data/usecases/getPilotageReformeStats/getPilotageReformeStats.usecase.ts
@@ -1,21 +1,34 @@
+import type { getPilotageReformeStatsSchema } from "shared/routes/schemas/get.pilotage-reforme.stats.schema";
+import type { z } from "zod";
+
+import { getCurrentCampagneQuery } from "@/modules/data/queries/getCurrentCampagne/getCurrentCampagne.query";
 import { formatTauxTransformation } from "@/modules/data/utils/formatTauxTransformation";
 
 import { dependencies } from "./dependencies";
 
+export interface Filters extends z.infer<typeof getPilotageReformeStatsSchema.querystring> {
+  campagne: string;
+}
 const getPilotageReformeStatsFactory =
   (
     deps = {
+      getCurrentCampagneQuery,
       getStats: dependencies.getStats,
       findFiltersInDb: dependencies.findFiltersInDb,
       getTauxTransformationData: dependencies.getTauxTransformationData,
     }
   ) =>
   async (activeFilters: { codeNiveauDiplome?: string[]; orderBy?: { order: "asc" | "desc"; column: string } }) => {
+    const currentCampagne = await deps.getCurrentCampagneQuery();
+    const anneeCampagne = currentCampagne.annee;
     const [stats, filters] = await Promise.all([deps.getStats(activeFilters), deps.findFiltersInDb()]);
 
-    const [{ transformes, effectif }] = await deps.getTauxTransformationData(activeFilters);
+    const [{ placesTransformees, effectif }] = await deps.getTauxTransformationData({
+      ...activeFilters,
+      campagne: anneeCampagne,
+    });
 
-    const tauxTransformation = formatTauxTransformation(transformes, effectif);
+    const tauxTransformation = formatTauxTransformation(placesTransformees, effectif);
 
     return {
       ...stats,

diff --git a/...modules/data/usecases/getStatsPilotageIntentions/deps/getStatsPilotageIntentions.query.ts b/...modules/data/usecases/getStatsPilotageIntentions/deps/getStatsPilotageIntentions.query.ts
@@ -1,7 +1,7 @@
 import { sql } from "kysely";
 import { ScopeEnum } from "shared";
 import type { getStatsPilotageIntentionsSchema } from "shared/routes/schemas/get.pilotage-intentions.stats.schema";
-import type z from "zod";
+import type { z } from "zod";
 
 import { getKbdClient } from "@/db/db";
 import {

diff --git a/server/src/modules/data/utils/onDemande.ts b/server/src/modules/data/utils/onDemande.ts
@@ -1,5 +1,6 @@
 import { expressionBuilder, sql } from "kysely";
 import type { DemandeStatutType } from "shared/enum/demandeStatutEnum";
+import { DemandeStatutEnum } from "shared/enum/demandeStatutEnum";
 import { DemandeTypeEnum } from "shared/enum/demandeTypeEnum";
 import { CURRENT_ANNEE_CAMPAGNE } from "shared/time/CURRENT_ANNEE_CAMPAGNE";
 import { getMillesimeFromCampagne } from "shared/time/millesimes";
@@ -28,6 +29,7 @@ import {
   countPlacesTransformeesParCampagne,
 } from "@/modules/utils/countCapacite";
 import { isDemandeProjetOrValidee } from "@/modules/utils/isDemandeProjetOrValidee";
+import { isDemandeNotAjustementRentree } from "@/modules/utils/isDemandeSelectable";
 
 import { isInPerimetreIJDataEtablissement } from "./isInPerimetreIJ";
 
@@ -43,6 +45,7 @@ export const genericOnDemandes = ({
   codeAcademie,
   codeDepartement,
   withColoration,
+  withAjustementRentree = true,
 }: {
   statut?: Array<DemandeStatutType>;
   rentreeScolaire?: string[];
@@ -55,6 +58,7 @@ export const genericOnDemandes = ({
   codeAcademie?: string;
   codeDepartement?: string;
   withColoration?: string;
+  withAjustementRentree?: boolean;
 }) =>
   expressionBuilder<DB, keyof DB>()
     .selectFrom("latestDemandeIntentionView as demande")
@@ -117,6 +121,8 @@ export const genericOnDemandes = ({
       eb.fn.sum<number>(countPlacesTransformeesParCampagne(eb)).as("placesTransformees"),
     ])
     .where(isInPerimetreIJDataEtablissement)
+    .$if(withAjustementRentree, (eb) => eb.where(isDemandeNotAjustementRentree))
+    .where("demande.statut", "in", [DemandeStatutEnum["projet de demande"], DemandeStatutEnum["demande validée"]])
     .$call((eb) => {
       if (campagne) return eb.where("campagne.annee", "=", campagne);
       return eb;

diff --git a/ui/app/(wrapped)/console/etablissements/page.tsx b/ui/app/(wrapped)/console/etablissements/page.tsx
@@ -5,7 +5,7 @@ import { Icon } from "@iconify/react";
 import { useRouter, useSearchParams } from "next/navigation";
 import { usePlausible } from "next-plausible";
 import qs from "qs";
-import { Fragment, useContext, useEffect, useState } from "react";
+import { useContext, useEffect, useState } from "react";
 
 import { client } from "@/api.client";
 import { CreateRequeteEnregistreeModal } from "@/app/(wrapped)/console/components/CreateRequeteEnregistreeModal";
@@ -218,11 +218,7 @@ export default function Etablissements() {
 
     const { columns, etablissements } = getDataForExport(data);
 
-    downloadCsv(
-      formatExportFilename("etablissement_export", isFiltered ? filters : undefined),
-      etablissements,
-      columns
-    );
+    downloadCsv(formatExportFilename("etablissement_export"), etablissements, columns);
   };
 
   const onExportExcel = async (isFiltered?: boolean) => {
@@ -233,11 +229,7 @@ export default function Etablissements() {
 
     const { columns, etablissements } = getDataForExport(data);
 
-    downloadExcel(
-      formatExportFilename("etablissement_export", isFiltered ? filters : undefined),
-      etablissements,
-      columns
-    );
+    downloadExcel(formatExportFilename("etablissement_export"), etablissements, columns);
   };
 
   const [colonneFilters, setColonneFilters] = useState<(keyof typeof FORMATION_ETABLISSEMENT_COLUMNS)[]>(
@@ -357,6 +349,7 @@ export default function Etablissements() {
       filters.uai = uaisFilter;
       setSearchParams({ filters: filters });
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   return (

diff --git a/ui/app/(wrapped)/console/formations/page.tsx b/ui/app/(wrapped)/console/formations/page.tsx
@@ -221,11 +221,7 @@ export default function Formations() {
 
     const filteredColumns = canShowQuadrantPosition ? columns : _.omit(columns, "positionQuadrant");
 
-    downloadCsv(
-      formatExportFilename("formation_export", isFiltered ? filters : undefined),
-      formations,
-      filteredColumns
-    );
+    downloadCsv(formatExportFilename("formation_export"), formations, filteredColumns);
   };
 
   const onExportExcel = async (isFiltered?: boolean) => {
@@ -238,11 +234,7 @@ export default function Formations() {
 
     const filteredColumns = canShowQuadrantPosition ? columns : _.omit(columns, "positionQuadrant");
 
-    downloadExcel(
-      formatExportFilename("formation_export", isFiltered ? filters : undefined),
-      formations,
-      filteredColumns
-    );
+    downloadExcel(formatExportFilename("formation_export"), formations, filteredColumns);
   };
 
   const canShowQuadrantPosition = filters.codeRegion?.length === 1;

diff --git a/ui/app/(wrapped)/intentions/perdir/saisie/components/Header.tsx b/ui/app/(wrapped)/intentions/perdir/saisie/components/Header.tsx
@@ -56,7 +56,7 @@ export const Header = ({
       query: isFiltered ? getIntentionsQueryParameters() : {},
     });
     downloadCsv(
-      formatExportFilename("recueil_demandes", isFiltered ? activeFilters : {}),
+      formatExportFilename("recueil_demandes"),
       [
         ...data.intentions.map((intention) => ({
           ...intention,
@@ -83,7 +83,7 @@ export const Header = ({
       query: isFiltered ? getIntentionsQueryParameters() : {},
     });
     downloadExcel(
-      formatExportFilename("recueil_demandes", isFiltered ? activeFilters : {}),
+      formatExportFilename("recueil_demandes"),
       [
         ...data.intentions.map((intention) => ({
           ...intention,

diff --git a/ui/app/(wrapped)/intentions/restitution/page.tsx b/ui/app/(wrapped)/intentions/restitution/page.tsx
@@ -275,7 +275,7 @@ export default () => {
       query: isFiltered ? getIntentionsStatsQueryParameters() : {},
     });
     downloadCsv(
-      formatExportFilename("restitution_export", isFiltered ? filters : undefined),
+      formatExportFilename("restitution_export"),
       data.demandes.map((demande) => ({
         ...demande,
         createdAt: new Date(demande.createdAt).toLocaleDateString("fr-FR", {
@@ -318,7 +318,7 @@ export default () => {
       query: isFiltered ? getIntentionsStatsQueryParameters() : {},
     });
     downloadExcel(
-      formatExportFilename("restitution_export", isFiltered ? filters : undefined),
+      formatExportFilename("restitution_export"),
 
       data.demandes.map((demande) => ({
         ...demande,
@@ -358,6 +358,7 @@ export default () => {
 
   useEffect(() => {
     setDefaultFilters();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const onClickSearch = () => {
@@ -371,6 +372,7 @@ export default () => {
   useEffect(() => {
     const campagneFilterNumber = parseInt(searchParams.filters?.campagne ?? "");
     handleFilters("rentreeScolaire", campagneFilterNumber + 1);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [searchParams.filters?.campagne]);
 
   return (

diff --git a/ui/app/(wrapped)/intentions/saisie/components/Header.tsx b/ui/app/(wrapped)/intentions/saisie/components/Header.tsx
@@ -54,23 +54,15 @@ export const Header = ({
     const data = await client.ref("[GET]/demandes").query({
       query: isFiltered ? getDemandesQueryParameters() : {},
     });
-    downloadCsv(
-      formatExportFilename("recueil_demandes", isFiltered ? activeFilters : undefined),
-      data.demandes,
-      DEMANDES_COLUMNS
-    );
+    downloadCsv(formatExportFilename("recueil_demandes"), data.demandes, DEMANDES_COLUMNS);
   };
 
   const onExportExcel = async (isFiltered?: boolean) => {
     trackEvent("saisie_demandes:export-excel");
     const data = await client.ref("[GET]/demandes").query({
       query: isFiltered ? getDemandesQueryParameters() : {},
     });
-    downloadExcel(
-      formatExportFilename("recueil_demandes", isFiltered ? activeFilters : undefined),
-      data.demandes,
-      DEMANDES_COLUMNS
-    );
+    downloadExcel(formatExportFilename("recueil_demandes"), data.demandes, DEMANDES_COLUMNS);
   };
   return (
     <Flex gap={2} mb={2}>