feat(server): correction & MAJ des réseaux compagnons du tour de fran…

…ce & compagnons du devoir (#3273)
mission-apprentissage · Oct 9, 2023 · 99a71fb · 99a71fb
1 parent 4bc2a70
commit 99a71fb
Show file tree

Hide file tree

Showing 21 changed files with 110 additions and 143 deletions.
diff --git a/server/src/common/constants/networks.ts b/server/src/common/constants/networks.ts
diff --git a/server/src/common/model/@types/Effectif.ts b/server/src/common/model/@types/Effectif.ts
@@ -1832,6 +1832,7 @@ export interface Effectif {
         | "CCI"
         | "CFA_EC"
         | "COMP_DU_DEVOIR"
+        | "COMP_DU_TOUR_DE_FRANCE"
         | "GRETA"
         | "UIMM"
         | "BTP_CFA"

diff --git a/server/src/common/model/@types/Organisation.ts b/server/src/common/model/@types/Organisation.ts
@@ -39,6 +39,7 @@ export interface Organisation {
     | "CCI"
     | "CFA_EC"
     | "COMP_DU_DEVOIR"
+    | "COMP_DU_TOUR_DE_FRANCE"
     | "GRETA"
     | "UIMM"
     | "BTP_CFA"

diff --git a/server/src/common/model/@types/Organisme.ts b/server/src/common/model/@types/Organisme.ts
@@ -25,6 +25,7 @@ export interface Organisme {
     | "CCI"
     | "CFA_EC"
     | "COMP_DU_DEVOIR"
+    | "COMP_DU_TOUR_DE_FRANCE"
     | "GRETA"
     | "UIMM"
     | "BTP_CFA"

diff --git a/server/src/common/model/effectifs.model/effectifs.model.ts b/server/src/common/model/effectifs.model/effectifs.model.ts
@@ -1,8 +1,7 @@
 import { CreateIndexesOptions, IndexSpecification } from "mongodb";
-import { ACADEMIES, DEPARTEMENTS, REGIONS } from "shared";
+import { ACADEMIES, DEPARTEMENTS, REGIONS, TETE_DE_RESEAUX } from "shared";
 import { PartialDeep } from "type-fest";
 
-import { TETE_DE_RESEAUX } from "@/common/constants/networks";
 import { SIRET_REGEX_PATTERN, UAI_REGEX_PATTERN, YEAR_RANGE_PATTERN } from "@/common/constants/validations";
 import { any, arrayOf, boolean, date, object, objectId, string } from "@/common/model/json-schema/jsonSchemaTypes";
 

diff --git a/server/src/common/model/organisations.model.ts b/server/src/common/model/organisations.model.ts
@@ -1,7 +1,15 @@
 import { CreateIndexesOptions, IndexSpecification } from "mongodb";
-import { REGIONS, DEPARTEMENTS, ACADEMIES, ACADEMIES_BY_CODE, DEPARTEMENTS_BY_CODE, REGIONS_BY_CODE } from "shared";
+import {
+  REGIONS,
+  DEPARTEMENTS,
+  ACADEMIES,
+  ACADEMIES_BY_CODE,
+  DEPARTEMENTS_BY_CODE,
+  REGIONS_BY_CODE,
+  TETE_DE_RESEAUX,
+  TETE_DE_RESEAUX_BY_ID,
+} from "shared";
 
-import { TETE_DE_RESEAUX, TETE_DE_RESEAUX_BY_ID } from "@/common/constants/networks";
 import { ORGANISATIONS_NATIONALES } from "@/common/constants/organisations";
 import { SIRET_REGEX_PATTERN, UAI_REGEX_PATTERN } from "@/common/constants/validations";
 

diff --git a/server/src/common/model/organismes.model.ts b/server/src/common/model/organismes.model.ts
@@ -1,7 +1,7 @@
 import { CreateIndexesOptions, IndexSpecification } from "mongodb";
+import { TETE_DE_RESEAUX } from "shared";
 
 import { STATUT_CREATION_ORGANISME, STATUT_FIABILISATION_ORGANISME } from "@/common/constants/fiabilisation";
-import { TETE_DE_RESEAUX } from "@/common/constants/networks";
 import { SIRET_REGEX_PATTERN, UAI_REGEX_PATTERN } from "@/common/constants/validations";
 
 import { NATURE_ORGANISME_DE_FORMATION, STATUT_PRESENCE_REFERENTIEL } from "../constants/organisme";

diff --git a/server/src/common/validation/registrationSchema.ts b/server/src/common/validation/registrationSchema.ts
@@ -1,6 +1,6 @@
+import { TETE_DE_RESEAUX, TeteDeReseauKey } from "shared";
 import { z } from "zod";
 
-import { TETE_DE_RESEAUX, TeteDeReseauKey } from "@/common/constants/networks";
 import { ORGANISATIONS_NATIONALES, OrganisationsNationalesKey } from "@/common/constants/organisations";
 
 export const registrationSchema = {

diff --git a/server/src/http/server.ts b/server/src/http/server.ts
@@ -9,9 +9,9 @@ import express, { Application } from "express";
 import Joi from "joi";
 import { ObjectId, WithId } from "mongodb";
 import passport from "passport";
+import { TETE_DE_RESEAUX } from "shared";
 import swaggerUi from "swagger-ui-express";
 import { z } from "zod";
-
 // catch all unhandled promise rejections and call the error middleware
 import "express-async-errors";
 
@@ -73,7 +73,6 @@ import { searchOrganismesFormations } from "@/common/actions/organismes/organism
 import { createSession } from "@/common/actions/sessions.actions";
 import { generateSifa } from "@/common/actions/sifa.actions/sifa.actions";
 import { changePassword, updateUserProfile } from "@/common/actions/users.actions";
-import { TETE_DE_RESEAUX } from "@/common/constants/networks";
 import logger from "@/common/logger";
 import { Organisme } from "@/common/model/@types";
 import { jobEventsDb, organisationsDb } from "@/common/model/collections";

diff --git a/server/src/jobs/hydrate/reseaux/hydrate-reseaux.ts b/server/src/jobs/hydrate/reseaux/hydrate-reseaux.ts
@@ -31,13 +31,14 @@ const INPUT_FILES = [
   "reseaux/referentiel-reseau-agri.csv", // AGRI
   // "reseaux/referentiel-reseau-anasup.csv", // TODO Fichier non fourni pour l'instant
   // "reseaux/referentiel-reseau-dgesip.csv", // TODO Fichier non fourni pour l'instant
-  "reseaux/referentiel-reseau-compagnons-du-devoir.csv", // Compagnons du devoir
+  "reseaux/referentiel-reseau-compagnons-du-tour-de-france.csv", // Compagnons du tour de france
   "reseaux/referentiel-reseau-uimm.csv", // UIMM
   "reseaux/referentiel-reseau-greta.csv", // GRETA
   "reseaux/referentiel-reseau-en.csv", // EDUC. NAT
   // "reseaux/referentiel-reseau-ccca-btp.csv", // TODO Fichier non fourni pour l'instant
   "reseaux/referentiel-reseau-amue.csv", // AMUE
   "reseaux/referentiel-reseau-cfa-ec.csv", // CFA EC
+  "reseaux/referentiel-reseau-compagnons-du-devoir.csv", // Compagnons du devoir
 ];
 
 /**