add the folder and update the path of the save

Author: Hajarel-moukh

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

@@ -10,6 +10,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -50,12 +51,16 @@ public ResponseEntity<Object> getContextualVariables(
     @PreAuthorize("hasAnyRole('USER_PLATINE','SCHEDULER')")
     public ResponseEntity<Object> saveContextualVariables(
             @RequestParam("questionnaireId") String questionnaireId
-    ){
+    ) {
         try {
             FileUtils fileUtils = new FileUtils(config);
-            int fileCount = contextualVariableApiPort.saveContextualVariableFiles(questionnaireId, fileUtils);
+
+            String contextualFolderPath = fileUtils.getDataFolder(questionnaireId, "WEB", null) + "/contextual";
+
+            int fileCount = contextualVariableApiPort.saveContextualVariableFiles(questionnaireId, fileUtils,contextualFolderPath);
+
             return ResponseEntity.ok("%d file(s) processed for questionnaire %s !".formatted(fileCount, questionnaireId));
-        }catch (GenesisException ge){
+        } catch (GenesisException ge) {
             return ResponseEntity.status(HttpStatusCode.valueOf(ge.getStatus())).body(ge.getMessage());
         }
     }
@@ -72,7 +77,9 @@ public ResponseEntity<Object> readContextualPreviousJson(
         try {
             FileUtils fileUtils = new FileUtils(config);
 
-            String filePath = "%s/%s".formatted(
+            fileUtils.ensureContextualFolderExists(questionnaireId, mode);
+
+            String filePath = "%s/contextual/%s".formatted(
                     fileUtils.getDataFolder(questionnaireId, mode.getFolder(), null),
                     jsonFileName
             );
@@ -84,7 +91,8 @@ public ResponseEntity<Object> readContextualPreviousJson(
             return ResponseEntity.ok("Contextual previous variable file %s saved !".formatted(filePath));
         }catch (GenesisException ge){
             return ResponseEntity.status(HttpStatusCode.valueOf(ge.getStatus())).body(ge.getMessage());
-        }
+        } catch (IOException ioe) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Erreur IO : " + ioe.getMessage());        }
     }
 
     @Operation(summary = "Add contextual external json file")
@@ -98,7 +106,9 @@ public ResponseEntity<Object> readContextualExternalJson(
         try {
             FileUtils fileUtils = new FileUtils(config);
 
-            String filePath = "%s/%s".formatted(
+            fileUtils.ensureContextualFolderExists(questionnaireId, mode);
+
+            String filePath = "%s/contextual/%s".formatted(
                     fileUtils.getDataFolder(questionnaireId, mode.getFolder(), null),
                     jsonFileName
             );
@@ -110,6 +120,8 @@ public ResponseEntity<Object> readContextualExternalJson(
             return ResponseEntity.ok("Contextual external variable file %s saved !".formatted(filePath));
         }catch (GenesisException ge){
             return ResponseEntity.status(HttpStatusCode.valueOf(ge.getStatus())).body(ge.getMessage());
+        } catch (IOException ioe) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Erreur IO : " + ioe.getMessage());
         }
     }
 

src/main/java/fr/insee/genesis/domain/ports/api/ContextualVariableApiPort.java

@@ -6,5 +6,5 @@
 
 public interface ContextualVariableApiPort {
     ContextualVariableModel getContextualVariable(String questionnaireId, String interrogationId);
-    int saveContextualVariableFiles(String questionnaireId, FileUtils fileUtils) throws GenesisException;
+    int saveContextualVariableFiles(String questionnaireId, FileUtils fileUtils,String contextualFolderPath) throws GenesisException;
 }

src/main/java/fr/insee/genesis/domain/service/contextualvariable/ContextualVariableJsonService.java

@@ -75,13 +75,11 @@ public ContextualVariableModel getContextualVariable(String questionnaireId, Str
     }
 
     @Override
-    public int saveContextualVariableFiles(String questionnaireId, FileUtils fileUtils) throws GenesisException {
+    public int saveContextualVariableFiles(String questionnaireId, FileUtils fileUtils,String contextualFolderPath) throws GenesisException {
         int fileCount = 0;
 
         for (Mode mode : Mode.values()) {
-            try (Stream<Path> filePaths = Files.list(Path.of(fileUtils.getDataFolder(questionnaireId,
-                    mode.getFolder()
-                    , null)))) {
+            try (Stream<Path> filePaths = Files.list(Path.of(contextualFolderPath))) {
                 Iterator<Path> it = filePaths
                         .filter(path -> path.toString().endsWith(".json"))
                         .iterator();

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

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import fr.insee.genesis.configuration.Config;
+import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -256,4 +257,15 @@ public List<File> listAllSpecsFolders() {
 			.filter(File::isDirectory)
 			.toList();
 	}
+    public void ensureContextualFolderExists(String questionnaireId, Mode mode) throws IOException {
+        String contextualFolderPath = getDataFolder(questionnaireId, mode.getFolder(), null) + "/contextual";
+        if (!isFolderPresent(contextualFolderPath)) {
+            Files.createDirectories(Path.of(contextualFolderPath));
+            log.info("contextual folder created : {}", contextualFolderPath);
+        } else {
+            log.info("contextual folder already exists : {}", contextualFolderPath);
+        }
+    }
+
+
 }