feat: ajout des formations transition numérique, écologique, démograp…

…hique
mission-apprentissage · Nov 29, 2024 · 53f8d6b · 53f8d6b
1 parent 6ee31a5
commit 53f8d6b
Show file tree

Hide file tree

Showing 56 changed files with 1,331 additions and 390 deletions.
diff --git a/server/src/commands.product.ts b/server/src/commands.product.ts
@@ -303,7 +303,6 @@ export function productCommands(cli: Command) {
         importTensionRomeRegion,
         importTensionRomeDepartement,
         importActionPrioritaire,
-        refreshViews,
       };
 
       if (usecaseName) {
@@ -313,6 +312,7 @@ export function productCommands(cli: Command) {
           await usecase();
         }
       }
+      await refreshViews();
     });
 
   cli.command("refreshViews").action(async () => {
@@ -329,7 +329,6 @@ export function productCommands(cli: Command) {
     .action(async (usecaseName: string) => {
       const usecases = {
         importFormations,
-        refreshViews,
         importPositionsQuadrant,
       };
 
@@ -340,6 +339,7 @@ export function productCommands(cli: Command) {
           await usecase();
         }
       }
+      await refreshViews();
     });
 
   cli

diff --git a/server/src/db/schema.ts b/server/src/db/schema.ts
@@ -223,6 +223,7 @@ export interface Demande {
   campagneId: string | null;
   id: Generated<string>;
   numeroHistorique: string | null;
+  autreBesoinRH: string | null;
   amiCmaValide: boolean | null;
   amiCmaValideAnnee: string | null;
   recrutementRH: boolean | null;
@@ -241,7 +242,6 @@ export interface Demande {
   nbFormationRH: number | null;
   discipline1FormationRH: string | null;
   discipline2FormationRH: string | null;
-  autreBesoinRH: string | null;
   amiCmaEnCoursValidation: boolean | null;
   updatedBy: string | null;
   capaciteScolaireColoreeActuelle: Generated<number | null>;
@@ -405,8 +405,8 @@ export interface FormationEtablissement {
 }
 
 export interface FormationHistorique {
-  ancienCFD: string;
   cfd: string;
+  ancienCFD: string;
   voie: string;
 }
 
@@ -424,6 +424,9 @@ export interface FormationNonMaterializedView {
   typeFamille: "1ere_commune" | "2nde_commune" | "option" | "specialite" | null;
   voie: string | null;
   codeNsf: string | null;
+  isTransitionNumerique: boolean | null;
+  isTransitionEcologique: boolean | null;
+  isTransitionDemographique: boolean | null;
 }
 
 export interface FormationRome {
@@ -441,8 +444,8 @@ export interface IndicateurEntree {
   formationEtablissementId: string;
   rentreeScolaire: string;
   effectifs: Json | null;
-  anneeDebut: number | null;
   capacites: Json | null;
+  anneeDebut: number | null;
   premiersVoeux: Json | null;
 }
 
@@ -683,6 +686,7 @@ export interface LatestDemandeNonMaterializedView {
   campagneId: string | null;
   id: string | null;
   numeroHistorique: string | null;
+  autreBesoinRH: string | null;
   amiCmaValide: boolean | null;
   amiCmaValideAnnee: string | null;
   recrutementRH: boolean | null;
@@ -701,7 +705,6 @@ export interface LatestDemandeNonMaterializedView {
   nbFormationRH: number | null;
   discipline1FormationRH: string | null;
   discipline2FormationRH: string | null;
-  autreBesoinRH: string | null;
   amiCmaEnCoursValidation: boolean | null;
   updatedBy: string | null;
   capaciteScolaireColoreeActuelle: number | null;
@@ -816,7 +819,7 @@ export interface PositionFormationRegionaleQuadrant {
 export interface RawData {
   type: string;
   data: Json | null;
-  id: Generated<string | null>;
+  id: Generated<string>;
 }
 
 export interface Region {

diff --git a/server/src/migrations/index.ts b/server/src/migrations/index.ts
@@ -95,6 +95,7 @@ import * as migration_1729693085251 from "./migration_1729693085251";
 import * as migration_1730888921742 from "./migration_1730888921742";
 import * as migration_1731666807035 from "./migration_1731666807035";
 import * as migration_1732531157506 from "./migration_1732531157506";
+import * as migration_1732800962380 from "./migration_1732800962380";
 
 type Migration = {
   up: (db: Kysely<any>) => Promise<void>;
@@ -197,4 +198,5 @@ export const migrations: Migrations = {
   migration_1730888921742,
   migration_1731666807035,
   migration_1732531157506,
+  migration_1732800962380,
 };