Merge pull request #417 from mission-apprentissage/chore/harmonisatio…

…n-noms-champs

chore: migrations UAI -> uai, dispositifId -> codeDispositif

server/src/db/schema.ts

@@ -342,7 +342,7 @@ export interface DomaineProfessionnel {
 
 export interface Etablissement {
  id: Generated<string>;
- UAI: string;
+ uai: string;
  siret: string | null;
  codeAcademie: string | null;
  natureUAI: string | null;
@@ -386,8 +386,8 @@ export interface Formation {
 export interface FormationEtablissement {
  id: Generated<string>;
  cfd: string;
- UAI: string;
- dispositifId: string | null;
+ uai: string;
+ codeDispositif: string | null;
  voie: string;
 }
 
@@ -434,7 +434,7 @@ export interface IndicateurEntree {
 }
 
 export interface IndicateurEtablissement {
- UAI: string;
+ uai: string;
  millesime: string;
  valeurAjoutee: number | null;
 }
@@ -447,7 +447,7 @@ export interface IndicateurRegion {
 
 export interface IndicateurRegionSortie {
  cfd: string;
- dispositifId: string | null;
+ codeDispositif: string | null;
  codeRegion: string;
  voie: string;
  millesimeSortie: string;

server/src/migrations/index.ts

@@ -88,6 +88,7 @@ import * as migration_1724934536809 from "./migration_1724934536809";
 import * as migration_1724939359838 from "./migration_1724939359838";
 import * as migration_1726560344568 from "./migration_1726560344568";
 import * as migration_1726811693181 from "./migration_1726811693181";
+import * as migration_1727438989073 from "./migration_1727438989073";
 import * as migration_1727692347950 from "./migration_1727692347950";
 
 type Migration = {
@@ -184,5 +185,6 @@ export const migrations: Migrations = {
  migration_1724939359838,
  migration_1726560344568,
  migration_1726811693181,
+ migration_1727438989073,
  migration_1727692347950,
 };

server/src/migrations/migration_1727438989073.ts

@@ -0,0 +1,55 @@
+import { Kysely } from "kysely";
+
+export const up = async (db: Kysely<unknown>) => {
+ await db.schema
+ .alterTable("etablissement")
+ .renameColumn("UAI", "uai")
+ .execute();
+
+ await db.schema
+ .alterTable("formationEtablissement")
+ .renameColumn("dispositifId", "codeDispositif")
+ .execute();
+
+ await db.schema
+ .alterTable("formationEtablissement")
+ .renameColumn("UAI", "uai")
+ .execute();
+
+ await db.schema
+ .alterTable("indicateurEtablissement")
+ .renameColumn("UAI", "uai")
+ .execute();
+
+ await db.schema
+ .alterTable("indicateurRegionSortie")
+ .renameColumn("dispositifId", "codeDispositif")
+ .execute();
+};
+
+export const down = async (db: Kysely<unknown>) => {
+ await db.schema
+ .alterTable("etablissement")
+ .renameColumn("uai", "UAI")
+ .execute();
+
+ await db.schema
+ .alterTable("formationEtablissement")
+ .renameColumn("codeDispositif", "dispositifId")
+ .execute();
+
+ await db.schema
+ .alterTable("formationEtablissement")
+ .renameColumn("uai", "UAI")
+ .execute();
+
+ await db.schema
+ .alterTable("indicateurEtablissement")
+ .renameColumn("uai", "UAI")
+ .execute();
+
+ await db.schema
+ .alterTable("indicateurRegionSortie")
+ .renameColumn("codeDispositif", "dispositifId")
+ .execute();
+};

server/src/migrations/migration_1727692347950.ts

@@ -8,10 +8,12 @@ export const up = async (db: Kysely<DB>) => {
  .alterTable("positionFormationRegionaleQuadrant")
  .dropConstraint("positionFormationRegionaleQuadrant_unique_constraint")
  .execute();
+
  await db.schema
  .alterTable("positionFormationRegionaleQuadrant")
  .addColumn("codeDispositif", "varchar(3)")
  .execute();
+
  await db.schema
  .alterTable("positionFormationRegionaleQuadrant")
  .addForeignKeyConstraint(
@@ -21,6 +23,7 @@ export const up = async (db: Kysely<DB>) => {
  ["codeDispositif"]
  )
  .execute();
+
  await db.schema
  .alterTable("positionFormationRegionaleQuadrant")
  .addUniqueConstraint(
@@ -38,18 +41,22 @@ export const up = async (db: Kysely<DB>) => {
 
 export const down = async (db: Kysely<DB>) => {
  await db.deleteFrom("positionFormationRegionaleQuadrant").execute();
+
  await db.schema
  .alterTable("positionFormationRegionaleQuadrant")
  .dropConstraint("positionFormationRegionaleQuadrant_unique_constraint")
  .execute();
+
  await db.schema
  .alterTable("positionFormationRegionaleQuadrant")
  .dropConstraint("fk_positionFormationRegionaleQuadrant_codeDispositif")
  .execute();
+
  await db.schema
  .alterTable("positionFormationRegionaleQuadrant")
  .dropColumn("codeDispositif")
  .execute();
+
  await db.schema
  .alterTable("positionFormationRegionaleQuadrant")
  .addUniqueConstraint(

server/src/modules/corrections/usecases/getCorrections/deps/getCorrections.dep.ts

@@ -84,7 +84,7 @@ export const getCorrectionsQuery = async ({
  .onRef("indicateurRegionSortie.cfd", "=", "demande.cfd")
  .onRef("indicateurRegionSortie.codeRegion", "=", "demande.codeRegion")
  .onRef(
- "indicateurRegionSortie.dispositifId",
+ "indicateurRegionSortie.codeDispositif",
  "=",
  "demande.codeDispositif"
  )

server/src/modules/data/usecases/getAnalyseDetailleeEtablissement/dependencies/base.dep.ts

@@ -14,7 +14,7 @@ export const getBase = ({
  .innerJoin(
  "dataEtablissement",
  "dataEtablissement.uai",
- "formationEtablissement.UAI"
+ "formationEtablissement.uai"
  )
  .innerJoin(
  "dataFormation",
@@ -31,7 +31,7 @@ export const getBase = ({
  .onRef(
  "dispositif.codeDispositif",
  "=",
- "formationEtablissement.dispositifId"
+ "formationEtablissement.codeDispositif"
  )
  .on("formationEtablissement.voie", "=", "scolaire")
  )
@@ -50,6 +50,6 @@ export const getBase = ({
  w("indicateurEntree.rentreeScolaire", "=", rentreeScolaire),
  w("indicateurEntree.rentreeScolaire", "is", null),
  ]),
- w("formationEtablissement.UAI", "=", uai),
+ w("formationEtablissement.uai", "=", uai),
  ])
  );

server/src/modules/data/usecases/getAnalyseDetailleeEtablissement/dependencies/getChiffresEntree.dep.ts

@@ -43,16 +43,16 @@ export const getChiffresEntree = async ({
  sql<string>`CONCAT(
  ${eb.ref("dataEtablissement.uai")},
  ${eb.ref("dataFormation.cfd")},
- COALESCE(${eb.ref("formationEtablissement.dispositifId")},''),
+ COALESCE(${eb.ref("formationEtablissement.codeDispositif")},''),
  ${eb.ref("formationEtablissement.voie")}
  )`.as("offre"),
  eb.fn
  .coalesce("ie.rentreeScolaire", sql<string>`${rentreeScolaire}`)
  .as("rentreeScolaire"),
  "voie",
- "uai",
+ "dataEtablissement.uai",
  "dataFormation.cfd",
- "dispositifId",
+ "formationEtablissement.codeDispositif",
  sql<number>`EXTRACT('year' FROM ${eb.ref(
  "dataFormation.dateOuverture"
  )})`.as("dateOuverture"),
@@ -67,22 +67,22 @@ export const getChiffresEntree = async ({
  withTauxPressionNat({
  eb: eb2,
  cfdRef: "dataFormation.cfd",
- codeDispositifRef: "codeDispositif",
+ codeDispositifRef: "formationEtablissement.codeDispositif",
  indicateurEntreeAlias: "ie",
  withTauxDemande: true,
  }).as("tauxPressionNational"),
  withTauxPressionReg({
  eb: eb2,
  cfdRef: "dataFormation.cfd",
- codeDispositifRef: "codeDispositif",
+ codeDispositifRef: "formationEtablissement.codeDispositif",
  codeRegionRef: "dataEtablissement.codeRegion",
  indicateurEntreeAlias: "ie",
  withTauxDemande: true,
  }).as("tauxPressionRegional"),
  withTauxPressionDep({
  eb: eb2,
  cfdRef: "dataFormation.cfd",
- codeDispositifRef: "codeDispositif",
+ codeDispositifRef: "formationEtablissement.codeDispositif",
  codeDepartementRef: "dataEtablissement.codeDepartement",
  indicateurEntreeAlias: "ie",
  withTauxDemande: true,
@@ -102,8 +102,7 @@ export const getChiffresEntree = async ({
  .groupBy([
  "ie.rentreeScolaire",
  "formationEtablissement.voie",
- "formationEtablissement.dispositifId",
- "codeDispositif",
+ "formationEtablissement.codeDispositif",
  "dataEtablissement.uai",
  "dataFormation.cfd",
  "nd.codeNiveauDiplome",

server/src/modules/data/usecases/getAnalyseDetailleeEtablissement/dependencies/getChiffresIJ.dep.ts

@@ -35,7 +35,7 @@ export const getChiffresIj = async ({
  sql<string>`CONCAT(
  ${eb.ref("dataEtablissement.uai")},
  ${eb.ref("dataFormation.cfd")},
- COALESCE(${eb.ref("formationEtablissement.dispositifId")},''),
+ COALESCE(${eb.ref("formationEtablissement.codeDispositif")},''),
  ${eb.ref("formationEtablissement.voie")}
  )`.as("offre"),
  "millesimeSortie",
@@ -47,18 +47,18 @@ export const getChiffresIj = async ({
  eb: eb2,
  millesimeSortie,
  cfdRef: "formationEtablissement.cfd",
- codeDispositifRef: "formationEtablissement.dispositifId",
+ codeDispositifRef: "formationEtablissement.codeDispositif",
  codeRegionRef: "dataEtablissement.codeRegion",
  }).as("tauxPoursuiteRegional"),
  withPoursuiteReg({
  eb: eb2,
  millesimeSortie,
  cfdRef: "formationEtablissement.cfd",
- codeDispositifRef: "formationEtablissement.dispositifId",
+ codeDispositifRef: "formationEtablissement.codeDispositif",
  codeRegionRef: "dataEtablissement.codeRegion",
  }).as("tauxInsertionRegional"),
  "dataFormation.cfd",
- "codeDispositif",
+ "formationEtablissement.codeDispositif",
  "effectifSortie",
  "nbSortants",
  "nbPoursuiteEtudes",
@@ -67,7 +67,7 @@ export const getChiffresIj = async ({
  eb: eb2,
  millesimeSortie,
  cfdRef: "formationEtablissement.cfd",
- codeDispositifRef: "formationEtablissement.dispositifId",
+ codeDispositifRef: "formationEtablissement.codeDispositif",
  codeRegionRef: "dataEtablissement.codeRegion",
  }).as("continuum"),
  ])
@@ -83,15 +83,14 @@ export const getChiffresIj = async ({
  .groupBy([
  "dataEtablissement.uai",
  "dataFormation.cfd",
- "formationEtablissement.dispositifId",
+ "formationEtablissement.codeDispositif",
  "formationEtablissement.cfd",
  "voie",
  "millesimeSortie",
  "nbPoursuiteEtudes",
  "nbInsertion6mois",
  "effectifSortie",
  "nbSortants",
- "codeDispositif",
  ])
  .execute()
  .then(cleanNull);

server/src/modules/data/usecases/getAnalyseDetailleeEtablissement/dependencies/getEtablissement.dep.ts

@@ -7,12 +7,12 @@ import { cleanNull } from "../../../../../utils/noNull";
 export const getEtablissement = async ({ uai }: { uai: string }) =>
  kdb
  .selectFrom("dataEtablissement")
- .where("uai", "=", uai)
+ .where("dataEtablissement.uai", "=", uai)
  .where("codeRegion", "is not", null)
  .where("codeAcademie", "is not", null)
  .where("codeDepartement", "is not", null)
  .select((eb) => [
- "uai",
+ "dataEtablissement.uai",
  sql<string>`coalesce(${eb.ref(
  "libelleEtablissement"
  )}, 'Sans libellé')`.as("libelleEtablissement"),

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

@@ -40,7 +40,7 @@ export const getFiltersCodeNiveauDiplome = async ({
  sql<number>`COUNT(DISTINCT CONCAT(
  ${eb.ref("dataEtablissement.uai")},
  ${eb.ref("dataFormation.cfd")},
- COALESCE(${eb.ref("formationEtablissement.dispositifId")},''),
+ COALESCE(${eb.ref("formationEtablissement.codeDispositif")},''),
  ${eb.ref("formationEtablissement.voie")}
  ))`.as("nbOffres"),
  ])

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

@@ -11,7 +11,7 @@ export const getFormations = async ({ uai }: { uai: string }) =>
  sql<string>`CONCAT(
  ${eb.ref("dataEtablissement.uai")},
  ${eb.ref("dataFormation.cfd")},
- COALESCE(${eb.ref("formationEtablissement.dispositifId")},''),
+ COALESCE(${eb.ref("formationEtablissement.codeDispositif")},''),
  ${eb.ref("formationEtablissement.voie")}
  )`.as("offre"),
  "libelleNiveauDiplome",
@@ -21,7 +21,7 @@ export const getFormations = async ({ uai }: { uai: string }) =>
  "dataFormation.codeNiveauDiplome",
  "dataFormation.cfd",
  "dataFormation.dateOuverture",
- "codeDispositif",
+ "formationEtablissement.codeDispositif",
  "dataFormation.typeFamille",
  "dispositif.libelleDispositif",
  ])

server/src/modules/data/usecases/getDataForEtablissementMap/dependencies/getEtablissement.ts

@@ -14,8 +14,8 @@ export const getEtablissement = async ({ uai, cfd }: Filters) =>
  .selectFrom("etablissement")
  .leftJoin(
  "formationEtablissement",
- "formationEtablissement.UAI",
- "etablissement.UAI"
+ "formationEtablissement.uai",
+ "etablissement.uai"
  )
  .leftJoin(
  "indicateurEntree",
@@ -25,7 +25,7 @@ export const getEtablissement = async ({ uai, cfd }: Filters) =>
  .leftJoin(
  "dispositif",
  "dispositif.codeDispositif",
- "formationEtablissement.dispositifId"
+ "formationEtablissement.codeDispositif"
  )
  .distinct()
  .select((sb) => [
@@ -35,7 +35,7 @@ export const getEtablissement = async ({ uai, cfd }: Filters) =>
  sql<string[]>`array_agg(distinct ${sb.ref(
  "dispositif.libelleDispositif"
  )})`.as("libellesDispositifs"),
- "etablissement.UAI",
+ "etablissement.uai",
  "etablissement.codeDepartement",
  "etablissement.commune",
  "etablissement.longitude",
@@ -52,9 +52,9 @@ export const getEtablissement = async ({ uai, cfd }: Filters) =>
  }
  return q;
  })
- .where("etablissement.UAI", "=", uai)
+ .where("etablissement.uai", "=", uai)
  .groupBy([
- "etablissement.UAI",
+ "etablissement.uai",
  "etablissement.codeDepartement",
  "etablissement.commune",
  "etablissement.longitude",

server/src/modules/data/usecases/getDataForEtablissementMap/dependencies/getEtablissementCfds.ts

@@ -9,5 +9,5 @@ export const getEtablissementCfds = async ({ uai }: Filters) =>
  .selectFrom("formationEtablissement")
  .select("cfd")
  .distinct()
- .where("UAI", "=", uai)
+ .where("uai", "=", uai)
  .execute();