modify after CR

Author: Hajarel-moukh

src/main/java/fr/insee/genesis/Constants.java

@@ -60,6 +60,7 @@ public class Constants {
     // Data extraction parameters
     public static final int BATCH_SIZE = 100; //Adapt to avoid OutOfMemoryException
     public static final String DIFFERENTIAL_DATA_FOLDER_NAME = "differential/data";
+    public static final String CONTEXTUAL_FOLDER = "/contextual";
 
     // Kraftwerk service path parameters
     public static final String KRAFTWERK_MAIN_ENDPOINT = "";

src/main/java/fr/insee/genesis/controller/rest/responses/ContextualVariableController.java

@@ -1,5 +1,6 @@
 package fr.insee.genesis.controller.rest.responses;
 
+import fr.insee.genesis.Constants;
 import fr.insee.genesis.configuration.Config;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.ports.api.ContextualExternalVariableApiPort;
@@ -55,7 +56,7 @@ public ResponseEntity<Object> saveContextualVariables(
         try {
             FileUtils fileUtils = new FileUtils(config);
 
-            String contextualFolderPath = fileUtils.getDataFolder(questionnaireId, "WEB", null) + "/contextual";
+            String contextualFolderPath = fileUtils.getDataFolder(questionnaireId, "WEB", null) + Constants.CONTEXTUAL_FOLDER;
 
             int fileCount = contextualVariableApiPort.saveContextualVariableFiles(questionnaireId, fileUtils,contextualFolderPath);
 
@@ -79,8 +80,9 @@ public ResponseEntity<Object> readContextualPreviousJson(
 
             fileUtils.ensureContextualFolderExists(questionnaireId, mode);
 
-            String filePath = "%s/contextual/%s".formatted(
+            String filePath = "%s%s/%s".formatted(
                     fileUtils.getDataFolder(questionnaireId, mode.getFolder(), null),
+                    Constants.CONTEXTUAL_FOLDER,
                     jsonFileName
             );
             if (!jsonFileName.toLowerCase().endsWith(".json")) {
@@ -108,8 +110,9 @@ public ResponseEntity<Object> readContextualExternalJson(
 
             fileUtils.ensureContextualFolderExists(questionnaireId, mode);
 
-            String filePath = "%s/contextual/%s".formatted(
+            String filePath = "%s%s/%s".formatted(
                     fileUtils.getDataFolder(questionnaireId, mode.getFolder(), null),
+                    Constants.CONTEXTUAL_FOLDER,
                     jsonFileName
             );
             if (!jsonFileName.toLowerCase().endsWith(".json")) {

src/main/java/fr/insee/genesis/infrastructure/utils/FileUtils.java

@@ -1,6 +1,7 @@
 package fr.insee.genesis.infrastructure.utils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import fr.insee.genesis.Constants;
 import fr.insee.genesis.configuration.Config;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
@@ -258,12 +259,12 @@ public List<File> listAllSpecsFolders() {
 			.toList();
 	}
     public void ensureContextualFolderExists(String questionnaireId, Mode mode) throws IOException {
-        String contextualFolderPath = getDataFolder(questionnaireId, mode.getFolder(), null) + "/contextual";
+        String contextualFolderPath = getDataFolder(questionnaireId, mode.getFolder(), null) + Constants.CONTEXTUAL_FOLDER;
         if (!isFolderPresent(contextualFolderPath)) {
             Files.createDirectories(Path.of(contextualFolderPath));
-            log.info("contextual folder created : {}", contextualFolderPath);
+            log.debug("contextual folder created : {}", contextualFolderPath);
         } else {
-            log.info("contextual folder already exists : {}", contextualFolderPath);
+            log.debug("contextual folder already exists : {}", contextualFolderPath);
         }
     }