From 8d5a0e36c48377434e4b78b3f502a066b06cc92d Mon Sep 17 00:00:00 2001 From: Hugo Gimbert Date: Thu, 23 Jan 2025 14:52:27 +0100 Subject: [PATCH 1/2] fixed test --- .../suggestions-server/src/test/resources/references.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/suggestions/suggestions-server/src/test/resources/references.json b/app/suggestions/suggestions-server/src/test/resources/references.json index 916a99cff..cd1e803dc 100644 --- a/app/suggestions/suggestions-server/src/test/resources/references.json +++ b/app/suggestions/suggestions-server/src/test/resources/references.json @@ -66,7 +66,7 @@ "score": 4 }, { - "id": "fl2042", + "id": "fl250", "status": 1, "score": 5 } From 7446b5941591332a3838e6781e8ba337bdf74fed Mon Sep 17 00:00:00 2001 From: Hugo Gimbert Date: Thu, 23 Jan 2025 15:03:50 +0100 Subject: [PATCH 2/2] fixed etl --- .../data/etl/loaders/DescriptifsLoader.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/app/etl/etl-updatedb/src/main/java/fr/gouv/monprojetsup/data/etl/loaders/DescriptifsLoader.java b/app/etl/etl-updatedb/src/main/java/fr/gouv/monprojetsup/data/etl/loaders/DescriptifsLoader.java index 63bbf4096..8dbc292ce 100644 --- a/app/etl/etl-updatedb/src/main/java/fr/gouv/monprojetsup/data/etl/loaders/DescriptifsLoader.java +++ b/app/etl/etl-updatedb/src/main/java/fr/gouv/monprojetsup/data/etl/loaders/DescriptifsLoader.java @@ -18,10 +18,8 @@ import static fr.gouv.monprojetsup.data.Constants.LAS_CONSTANT; import static fr.gouv.monprojetsup.data.etl.loaders.DataSources.RESUMES_MPS_RESUME_FORMATION; -import static fr.gouv.monprojetsup.data.etl.loaders.DataSources.RESUMES_MPS_RESUME_FORMATION_MOS; import static fr.gouv.monprojetsup.data.etl.loaders.DataSources.RESUMES_MPS_RESUME_KEY; import static fr.gouv.monprojetsup.data.etl.loaders.DataSources.RESUMES_MPS_RESUME_TYPE_FORMATION; -import static fr.gouv.monprojetsup.data.etl.loaders.DataSources.RESUMES_MPS_RESUME_TYPE_FORMATION_MOS; public class DescriptifsLoader { public static @NotNull DescriptifsFormationsMetiers loadDescriptifs( @@ -73,9 +71,6 @@ private static void addMpsdescriptifs(DescriptifsFormationsMetiers descriptifs, val lines = CsvTools.readCSV( sources.getSourceDataFilePath(DataSources.RESUMES_MPS_PATH), ','); - String keyFlFr; - String keyDescFormation = RESUMES_MPS_RESUME_TYPE_FORMATION; - String keyDescFiliere = RESUMES_MPS_RESUME_FORMATION; String keyTypeFor = "code type formation"; Map resumesTypesformations = new HashMap<>(); @@ -86,13 +81,10 @@ private static void addMpsdescriptifs(DescriptifsFormationsMetiers descriptifs, for (val line : lines) { val frCod = line.get(keyTypeFor); val descFormation = line.get(RESUMES_MPS_RESUME_TYPE_FORMATION); - val descFormationMos = line.get(RESUMES_MPS_RESUME_TYPE_FORMATION_MOS); - if(descFormation == null || descFormationMos == null) { + if(descFormation == null) { throw new RuntimeException("No description for " + frCod); } - if (!frCod.isBlank() && !descFormationMos.isBlank()) { - resumesTypesformations.put(frCod, descFormationMos.trim()); - } else if (!frCod.isBlank() && !descFormation.isBlank()) { + if (!frCod.isBlank() && !descFormation.isBlank()) { resumesTypesformations.put(frCod, descFormation.trim()); } } @@ -110,10 +102,7 @@ private static void addMpsdescriptifs(DescriptifsFormationsMetiers descriptifs, String frcod = line.getOrDefault(keyTypeFor, ""); String descForm = resumesTypesformations.getOrDefault(frcod, ""); - String descFiliere = line.get(RESUMES_MPS_RESUME_FORMATION_MOS).trim(); - if(descFiliere.isBlank()) { - descFiliere = line.get(RESUMES_MPS_RESUME_FORMATION).trim(); - } + String descFiliere = line.get(RESUMES_MPS_RESUME_FORMATION).trim(); var descriptif = descriptifs.keyToDescriptifs().computeIfAbsent(flfrcod, z -> new DescriptifFormation(line)); if (descriptif.getMultiUrls() == null) descriptif.setMultiUrls(new HashSet<>());