Merge branch 'develop' of github.com:mission-apprentissage/tjp-pilota…

…ge into feat/formations-specifiques

.gitignore

@@ -176,3 +176,10 @@ seed.gz
 
 tsconfig.tsbuildinfo
 .infra_
+
+
+# Vs code config
+.vscode/terminals.json
+
+# Cursor
+.cursorrules

.talismanrc

@@ -8,7 +8,7 @@ fileignoreconfig:
 - filename: .infra/files/configs/mongodb/seed.gpg
   checksum: b1fa159bb2036a835b4138843b48043eca4ea374bcbb710ba4593bd39b1dfec1
 - filename: .infra/vault/vault.yml
-  checksum: d75971da55a3f43660e8e8d15247c755e8fbcde5077ea04c203e0975aa17616e
+  checksum: 0577a982f46500c55d62463f34fde72a3e14700b5235f8573cbf870e2452348f
 - filename: README.md
   checksum: 00ac991f0b2746c5a5ffa14e2b3c5427b739c0d952aa3730efe1f234ac1fc3ca
 - filename: server/.env.test
@@ -21,6 +21,8 @@ fileignoreconfig:
   checksum: 28cdc80f0d836857ee9a802bff5a72a3ff3addad70a31b1ad4b7e98bc8db447c
 - filename: server/src/modules/core/usecases/redirectDne/redirectDne.test.ts
   checksum: 97116750d964c12ae4a0ffe9f5477d66526bf2f2e8ac8719ee399dc88faf7ae5
+- filename: server/static/files/offres_apprentissage.csv
+  checksum: f8e173f11056708d2958e4f000428c2acb2281d9f19db55d9d72c5790bf0bf4b
 - filename: server/tests/test_origin/controllers/campagnes.controller.test.js_old
   checksum: 546c306130034fdce2c4165b1f31656dfa883bc8808f0e8b1fa5a5461da1cb08
 - filename: server/tests/test_origin/controllers/users.controller.test.js_old
@@ -58,7 +60,7 @@ fileignoreconfig:
 - filename: ui/app/(wrapped)/ressources/page.tsx
   checksum: 58aeb5ee51ef187a6f97a6dc73922767bd177c600164ffd7076391a87f372ebe
 - filename: ui/app/(wrapped)/statistiques/page.tsx
-  checksum: 573be5ad333d02b3969e61ec8a4860c161af648abb752a3a22b35d5f37bc6bd1
+  checksum: 4eff930f0a5a1df09c53d1a2e65c8911b3ae7d0ca8d2393ce371d9773af1e217
 - filename: ui/config.public.ts
   checksum: 5a6c64c078366fc4c259fcf660abb66e4db3ffbc8365fdad5d3c05cad54d99dc
 - filename: ui/src/config.public.ts

server/src/config.ts

@@ -21,6 +21,7 @@ const config = {
   log: {
     type: env.get("LOG_TYPE").asString(),
     level: env.get("LOG_LEVEL").required().asString(),
+    forceLocalLogs: env.get("LOG_LOCAL").asBool(),
   },
   psql: {
     host: env.get("PSQL_HOST").required().asString(),

server/src/modules/core/usecases/redirectDne/redirectDne.usecase.ts

@@ -175,13 +175,19 @@ export const [redirectDne, redirectDneFactory] = inject(
       await deps.createUserInDB({ user: userToInsert });
 
       if (user) {
-        logger.info(`Info (SSO) : Nouveau login`, {
-          user: userToInsert,
-        });
+        logger.info(
+          {
+            user: userToInsert,
+          },
+          `Info (SSO) : Nouveau login`
+        );
       } else {
-        logger.info(`Info (SSO) : Nouvel utilisateur DNE`, {
-          user: userToInsert,
-        });
+        logger.info(
+          {
+            user: userToInsert,
+          },
+          `Info (SSO) : Nouvel utilisateur DNE`
+        );
       }
 
       const authorizationToken = jwt.sign({ email }, deps.authJwtSecret, {

server/src/modules/core/utils/extractUserInRequest/extractUserInRequest.ts

@@ -13,7 +13,6 @@ import { findUserQuery } from "./findUserQuery.dep";
 export const [extractUserInRequest, extractUserInRequestFactory] = inject(
   { jwtSecret: config.auth.authJwtSecret, findUserQuery },
   (deps) => async (request: FastifyRequest) => {
-    console.log(request.cookies);
     const token = request.cookies["Authorization"];
     if (!token) return;
     try {

server/src/modules/corrections/usecases/submitCorrection/submitCorrection.usecase.ts

@@ -79,10 +79,13 @@ export const [submitCorrectionUsecase, submitCorrectionFactory] = inject(
 
       const errors = validateCorrection(cleanNull(correction), cleanNull(demande) as Demande);
       if (errors) {
-        logger.info("Correction incorrecte", {
-          errors,
-          correction: correction,
-        });
+        logger.info(
+          {
+            errors,
+            correction: correction,
+          },
+          "Correction incorrecte"
+        );
         throw Boom.badData("Donnée incorrectes", { errors });
       }
 

server/src/modules/data/index.ts

@@ -8,8 +8,13 @@ import { getDataForPanoramaRegionRoute } from "./usecases/getDataForPanoramaRegi
 import { getDemandesRestitutionIntentionsRoute } from "./usecases/getDemandesRestitutionIntentions/getDemandesRestitutionIntentions.route";
 import { getDepartementRoute } from "./usecases/getDepartement/getDepartement.route";
 import { getDepartementsRoute } from "./usecases/getDepartements/getDepartements.route";
+import { getDomaineDeFormationRoute } from "./usecases/getDomaineDeFormation/getDomaineDeFormation.route";
+import { getDomainesDeFormationRoute } from "./usecases/getDomainesDeFormation/getDomainesDeFormation.route";
 import { getEtablissementRoute } from "./usecases/getEtablissement/getEtablissement.route";
+import { getFormationRoute } from "./usecases/getFormation/getFormation.route";
+import { getFormationCarteEtablissementsRoute } from "./usecases/getFormationCarteEtablissements/getFormationCarteEtablissements.route";
 import { getFormationEtablissementsRoutes } from "./usecases/getFormationEtablissements/getFormationEtablissements.routes";
+import { getFormationIndicateursRoute } from "./usecases/getFormationIndicateurs/getFormationIndicateurs.route";
 import { getFormationsRoute } from "./usecases/getFormations/getFormations.routes";
 import { getFormationsPilotageIntentionsRoute } from "./usecases/getFormationsPilotageIntentions/getFormationsPilotageIntentions.route";
 import { getHeaderEtablissementRoute } from "./usecases/getHeaderEtablissement/getHeaderEtablissement.route";
@@ -61,5 +66,10 @@ export const registerDataModule = (server: Server) => {
     ...searchFiliereRoute(server),
     ...searchCampusRoute(server),
     ...getRepartitionPilotageIntentionsRoute(server),
+    ...getDomainesDeFormationRoute(server),
+    ...getFormationRoute(server),
+    ...getDomaineDeFormationRoute(server),
+    ...getFormationIndicateursRoute(server),
+    ...getFormationCarteEtablissementsRoute(server),
   };
 };

server/src/modules/data/usecases/getDomaineDeFormation/dependencies/getFilters.dep.ts

@@ -0,0 +1,44 @@
+import { getKbdClient } from "@/db/db";
+import {
+  isInPerimetreIJAcademie,
+  isInPerimetreIJDepartement,
+  isInPerimetreIJRegion,
+} from "@/modules/data/utils/isInPerimetreIJ";
+
+export const getFilters = async () => {
+  const regions = await getKbdClient()
+    .selectFrom("region")
+    .select(["region.libelleRegion as label", "region.codeRegion as value"])
+    .where(isInPerimetreIJRegion)
+    .orderBy("region.libelleRegion", "asc")
+    .execute();
+
+  const academies = await getKbdClient()
+    .selectFrom("academie")
+    .select([
+      "academie.libelleAcademie as label",
+      "academie.codeAcademie as value",
+      "academie.codeRegion as codeRegion",
+    ])
+    .where(isInPerimetreIJAcademie)
+    .orderBy("academie.libelleAcademie", "asc")
+    .execute();
+
+  const departements = await getKbdClient()
+    .selectFrom("departement")
+    .select([
+      "departement.libelleDepartement as label",
+      "departement.codeDepartement as value",
+      "departement.codeAcademie as codeAcademie",
+      "departement.codeRegion as codeRegion",
+    ])
+    .where(isInPerimetreIJDepartement)
+    .orderBy("departement.libelleDepartement", "asc")
+    .execute();
+
+  return {
+    regions,
+    academies,
+    departements,
+  };
+};

server/src/modules/data/usecases/getDomaineDeFormation/dependencies/getFormations.dep.ts

@@ -0,0 +1,105 @@
+import { sql } from "kysely";
+import { CURRENT_RENTREE } from "shared";
+import type { formationSchema } from "shared/routes/schemas/get.domaine-de-formation.codeNsf.schema";
+import { getDateRentreeScolaire } from "shared/utils/getRentreeScolaire";
+import type { z } from "zod";
+
+import { getKbdClient } from "@/db/db";
+import { notHistoriqueUnlessCoExistant } from "@/modules/data/utils/notHistorique";
+import { cleanNull } from "@/utils/noNull";
+
+export const getFormations = async ({
+  codeNsf,
+  codeRegion,
+  codeDepartement,
+  codeAcademie,
+}: {
+  codeNsf: string;
+  codeRegion?: string;
+  codeDepartement?: string;
+  codeAcademie?: string;
+}) =>
+  getKbdClient()
+    .with("formations", (wb) =>
+      wb
+        .selectFrom("formationView")
+        .innerJoin("niveauDiplome", "niveauDiplome.codeNiveauDiplome", "formationView.codeNiveauDiplome")
+        .where("formationView.codeNsf", "=", codeNsf)
+        .where((w) => notHistoriqueUnlessCoExistant(w, CURRENT_RENTREE))
+        .select((sb) => [
+          sb.ref("formationView.codeNsf").as("codeNsf"),
+          sb.ref("formationView.cfd").as("cfd"),
+          sb.ref("formationView.libelleFormation").as("libelleFormation"),
+          sb.ref("formationView.dateOuverture").as("dateOuverture"),
+          sb.ref("niveauDiplome.libelleNiveauDiplome").as("libelleNiveauDiplome"),
+          sb.ref("niveauDiplome.codeNiveauDiplome").as("codeNiveauDiplome"),
+          sb.ref("formationView.typeFamille").as("typeFamille"),
+        ])
+        .orderBy("formationView.libelleFormation", "asc")
+        .distinct()
+    )
+    .with("formation_renovee", (wb) =>
+      wb
+        .selectFrom("formations")
+        .leftJoin("formationHistorique", "formationHistorique.cfd", "formations.cfd")
+        .where("formations.dateOuverture", "<=", sql<Date>`${getDateRentreeScolaire(CURRENT_RENTREE)}`)
+        .where("formationHistorique.ancienCFD", "in", (eb) => eb.selectFrom("formationEtablissement").select("cfd"))
+        .select("formationHistorique.cfd")
+        .distinct()
+    )
+    .with("formation_etab", (wb) =>
+      wb
+        .selectFrom("formations")
+        .leftJoin("formationEtablissement", "formations.cfd", "formationEtablissement.cfd")
+        .innerJoin("dataEtablissement", "dataEtablissement.uai", "formationEtablissement.uai")
+        .selectAll("formations")
+        .select((sb) => [
+          sb.ref("formationEtablissement.uai").as("uai"),
+          sb.ref("formationEtablissement.voie").as("voie"),
+          sb.ref("dataEtablissement.codeRegion").as("codeRegion"),
+          sb.ref("dataEtablissement.codeAcademie").as("codeAcademie"),
+          sb.ref("dataEtablissement.codeDepartement").as("codeDepartement"),
+        ])
+        .$call((q) => {
+          if (codeRegion) {
+            return q.where("codeRegion", "=", codeRegion);
+          }
+          return q;
+        })
+        .$call((q) => {
+          if (codeAcademie) {
+            return q.where("codeAcademie", "=", codeAcademie);
+          }
+          return q;
+        })
+        .$call((q) => {
+          if (codeDepartement) {
+            return q.where("codeDepartement", "=", codeDepartement);
+          }
+          return q;
+        })
+    )
+    .selectFrom("formations")
+    .leftJoin("formation_etab", "formations.cfd", "formation_etab.cfd")
+    .selectAll("formations")
+    .select((sb) => [
+      sb.fn.count<number>("formation_etab.uai").as("nbEtab"),
+      sql<boolean>`bool_or(voie = 'apprentissage' OR voie IS NULL)`.as("apprentissage"),
+      sql<boolean>`bool_or(voie = 'scolaire' OR voie IS NULL)`.as("scolaire"),
+      sb.fn
+        .coalesce(sql<boolean>`formations.cfd IN (SELECT cfd FROM formation_renovee)`, sql<boolean>`false`)
+        .as("isFormationRenovee"),
+    ])
+    .distinct()
+    .groupBy([
+      "formations.cfd",
+      "formations.libelleFormation",
+      "formations.libelleNiveauDiplome",
+      "formations.codeNiveauDiplome",
+      "formations.typeFamille",
+      "formations.codeNsf",
+      "formations.dateOuverture",
+    ])
+    .$castTo<z.infer<typeof formationSchema>>()
+    .execute()
+    .then(cleanNull);

server/src/modules/data/usecases/getDomaineDeFormation/dependencies/getNsf.dep.ts

@@ -0,0 +1,4 @@
+import { getKbdClient } from "@/db/db";
+
+export const getNsf = async (codeNsf: string) =>
+  getKbdClient().selectFrom("nsf").where("codeNsf", "=", codeNsf).selectAll().executeTakeFirst();

server/src/modules/data/usecases/getDomaineDeFormation/dependencies/index.ts

@@ -0,0 +1,3 @@
+export { getFilters } from "./getFilters.dep";
+export { getFormations } from "./getFormations.dep";
+export { getNsf } from "./getNsf.dep";

server/src/modules/data/usecases/getDomaineDeFormation/getDomaineDeFormation.route.ts

@@ -0,0 +1,24 @@
+import { createRoute } from "@http-wizard/core";
+import { ROUTES } from "shared/routes/routes";
+
+import type { Server } from "@/server/server";
+
+import { getDomaineDeFormation } from "./getDomaineDeFormation.usecase";
+
+const ROUTE = ROUTES["[GET]/domaine-de-formation/:codeNsf"];
+
+export const getDomaineDeFormationRoute = (server: Server) => {
+  return createRoute(ROUTE.url, {
+    method: ROUTE.method,
+    schema: ROUTE.schema,
+  }).handle((props) =>
+    server.route({
+      ...props,
+      handler: async (request, response) => {
+        const { codeNsf } = request.params;
+        const result = await getDomaineDeFormation(codeNsf, request.query);
+        response.status(200).send(result);
+      },
+    })
+  );
+};

server/src/modules/data/usecases/getDomaineDeFormation/getDomaineDeFormation.usecase.ts

@@ -0,0 +1,39 @@
+import Boom from "@hapi/boom";
+import type { QueryFilters } from "shared/routes/schemas/get.domaine-de-formation.codeNsf.schema";
+
+import { getFilters, getFormations, getNsf } from "./dependencies";
+
+const getDomaineDeFormationFactory =
+  (
+    deps = {
+      getNsf,
+      getFilters,
+      getFormations,
+    }
+  ) =>
+  async (codeNsf: string, queryFilters: QueryFilters) => {
+    const { codeRegion, codeDepartement, codeAcademie } = queryFilters;
+    const [nsf, filters, formations] = await Promise.all([
+      deps.getNsf(codeNsf),
+      deps.getFilters(),
+      deps.getFormations({
+        codeNsf,
+        codeRegion,
+        codeDepartement,
+        codeAcademie,
+      }),
+    ]);
+
+    if (!nsf) {
+      throw Boom.notFound(`Le domaine de formation avec le code ${codeNsf} est inconnue`);
+    }
+
+    return {
+      codeNsf,
+      libelleNsf: nsf.libelleNsf,
+      filters,
+      formations,
+    };
+  };
+
+export const getDomaineDeFormation = getDomaineDeFormationFactory();