Merge branch 'develop' of github.com:mission-apprentissage/tables-cor…

…respondances into sdk
mission-apprentissage · Sep 13, 2024 · b0bb336 · b0bb336
2 parents 94a1b9c + bbbd116
commit b0bb336
Show file tree

Hide file tree

Showing 11 changed files with 17,487 additions and 5,688 deletions.
diff --git a/Makefile b/Makefile
@@ -8,13 +8,13 @@ install-ui:
 	yarn --cwd ui install --frozen-lockfile
 
 start:
-	docker-compose up --build --force-recreate
+	docker compose up --build --force-recreate
 
 start-mongodb:
-	docker-compose up -d mongodb
+	docker compose up -d mongodb
 
 stop:
-	docker-compose stop
+	docker compose stop
 
 test:
 	yarn --cwd server test
@@ -23,6 +23,6 @@ lint:
 	yarn --cwd server lint
 
 clean:
-	docker-compose down
+	docker compose down
 
 ci: install-server lint start-mongodb test clean
diff --git a/server/package.json b/server/package.json
@@ -51,11 +51,11 @@
     "byline": "5.0.0",
     "cli-progress": "3.9.0",
     "compose-middleware": "5.0.1",
-    "config": "3.3.1",
+    "config": "3.3.12",
     "convert-csv-to-json": "1.3.3",
-    "deep-object-diff": "1.1.0",
+    "deep-object-diff": "1.1.9",
     "dotenv": "8.2.0",
-    "express": "4.17.1",
+    "express": "4.21.0",
     "form-data": "4.0.0",
     "fs-extra": "9.0.0",
     "iconv-lite": "0.6.2",
@@ -64,7 +64,7 @@
     "lodash": "4.17.21",
     "migrate-mongo": "8.2.3",
     "moment": "^2.29.4",
-    "mongoose": "5.13.14",
+    "mongoose": "5.13.20",
     "mongoose-paginate": "5.0.3",
     "mongoose-schema-jsonschema": "1.4.7",
     "passport": "0.4.1",
@@ -113,7 +113,7 @@
     "lint-staged": ">=10",
     "mocha": "7.1.2",
     "nodemon": "2.0.3",
-    "nyc": "15.1.0",
+    "nyc": "17.0.0",
     "prettier": "2.0.5",
     "semantic-release": "^17.3.1",
     "semantic-release-slack-bot": "^1.7.0",

diff --git a/server/scripts/preventSensibleFilesCommit.sh b/server/scripts/preventSensibleFilesCommit.sh
@@ -14,7 +14,7 @@ exception="$exception|CodeDiplome_RNCP_latest_mna.csv"
 exception="$exception|BaseDataDock-latest.csv"
 exception="$exception|sample.json"
 exception="$exception|tsconfig.base.json|tsconfig.json"
-exception="$exception|CodeDiplome_RNCP_latest_kit.csv"
+exception="$exception|CodeDiplome_RNCP_latest_kit.csv|CodeDiplome_RNCP_2.9.csv|Kit_apprentissage_20231218.csv"
 exception="$exception)$"
 
 files=$(git diff --cached --name-only | grep -v -E "$exception" | grep -E "$sensible_files_pattern")

diff --git a/server/src/common/model/swaggerSchema/conventionFile.js b/server/src/common/model/swaggerSchema/conventionFile.js
@@ -6,6 +6,21 @@ module.exports = {
         type: "string",
         description: "Type de fichier (DATAGOUV)",
       },
+      siren: {
+        type: "string",
+      },
+      numero_uai: {
+        type: "string",
+      },
+      "N° SIREN": {
+        type: "string",
+      },
+      "N° Etablissement": {
+        type: "string",
+      },
+      siretetablissementdeclarant: {
+        type: "string",
+      },
       _id: {
         type: "string",
         pattern: "^[0-9a-fA-F]{24}$",

diff --git a/server/src/common/model/swaggerSchema/onisep.js b/server/src/common/model/swaggerSchema/onisep.js
@@ -6,6 +6,37 @@ module.exports = {
         type: "string",
         description: "Type (etablissement | formation)",
       },
+      code_uai: {
+        type: "string",
+        description: "uai",
+      },
+      academie: {
+        type: "string",
+        description: "academie",
+      },
+      code_mef: {
+        type: "string",
+        description: "Code Mef",
+      },
+      code_formation_diplome: {
+        type: "string",
+        description: "Code formation diplome (EN)",
+      },
+      libelle_formation_principal: {
+        type: "string",
+      },
+      libelle_poursuite: {
+        type: "string",
+      },
+      lien_site_onisepfr: {
+        type: "string",
+      },
+      discipline: {
+        type: "string",
+      },
+      domaine_sousdomaine: {
+        type: "string",
+      },
       _id: {
         type: "string",
         pattern: "^[0-9a-fA-F]{24}$",

diff --git a/server/src/jobs/rncpImporter/assets/CodeDiplome_RNCP_2.9.csv b/server/src/jobs/rncpImporter/assets/CodeDiplome_RNCP_2.9.csv
diff --git a/server/src/jobs/rncpImporter/assets/CodeDiplome_RNCP_latest_kit.csv b/server/src/jobs/rncpImporter/assets/CodeDiplome_RNCP_latest_kit.csv
diff --git a/server/src/jobs/rncpImporter/assets/Kit_apprentissage_20231218.csv b/server/src/jobs/rncpImporter/assets/Kit_apprentissage_20231218.csv
diff --git a/server/src/logic/handlers/geoHandler.js b/server/src/logic/handlers/geoHandler.js
@@ -1,11 +1,24 @@
 const geoController = require("../controllers/geo/geoController");
 
 const getDataFromCP = async (providedCP, providedCodeInsee) => {
-  if (!providedCP || !geoController.isValidCodePostal(providedCP.trim())) {
+  if (!providedCP) {
     return {
       result: {},
       messages: {
-        error: `Erreur: Le code postal fourni doit être définit et au format 5 caractères ${providedCP}`,
+        error: `Erreur: Le code postal doit être définit`,
+      },
+    };
+  }
+
+  if (
+    providedCP &&
+    !geoController.isValidCodePostal(providedCP.trim()) &&
+    !geoController.isValidCodeInsee(providedCP.trim())
+  ) {
+    return {
+      result: {},
+      messages: {
+        error: `Erreur: Le code postal fourni doit être au format 5 caractères ${providedCP}`,
       },
     };
   }