fix missing and filter_results in loadMetadatasFromDB

Author: Hajarel-moukh

src/main/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataService.java

@@ -4,6 +4,7 @@
 import fr.insee.bpm.metadata.model.MetadataModel;
 import fr.insee.bpm.metadata.model.Variable;
 import fr.insee.bpm.metadata.model.VariableType;
+import fr.insee.bpm.metadata.model.VariablesMap;
 import fr.insee.bpm.metadata.reader.ddi.DDIReader;
 import fr.insee.bpm.metadata.reader.lunatic.LunaticReader;
 import fr.insee.genesis.Constants;
@@ -20,9 +21,12 @@
 
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Path;
 import java.util.List;
 
+import static fr.insee.bpm.metadata.reader.lunatic.LunaticUtils.addLunaticVariable;
+
 @Service
 @AllArgsConstructor
 @Slf4j
@@ -43,19 +47,58 @@ public MetadataModel find(String questionnaireId, Mode mode) throws GenesisExcep
         return questionnaireMetadataModels.getFirst().metadataModel();
     }
 
-    @Override
     public MetadataModel loadAndSaveIfNotExists(String campaignName, String questionnaireId, Mode mode, FileUtils fileUtils,
                                                 List<GenesisError> errors) throws GenesisException {
+
         List<QuestionnaireMetadataModel> questionnaireMetadataModels =
                 questionnaireMetadataPersistancePort.find(questionnaireId.toUpperCase(), mode);
-        if(questionnaireMetadataModels.isEmpty() || questionnaireMetadataModels.getFirst().metadataModel() == null){
-            MetadataModel metadataModel = readMetadatas(campaignName, mode.getModeName(), fileUtils, errors);
-            saveMetadata(questionnaireId.toUpperCase(), mode, metadataModel);
-            return metadataModel;
+
+        MetadataModel metadataModel;
+
+        if (questionnaireMetadataModels.isEmpty() || questionnaireMetadataModels.getFirst().metadataModel() == null) {
+            metadataModel = readMetadatas(campaignName, mode.getModeName(), fileUtils, errors);
+        } else {
+            metadataModel = questionnaireMetadataModels.getFirst().metadataModel();
         }
-        return questionnaireMetadataModels.getFirst().metadataModel();
+        String metadataFilePath = fileUtils.getSpecFolder(questionnaireId);
+        addMissingAndFilterVariables(metadataModel, metadataFilePath);
+
+        saveMetadata(questionnaireId.toUpperCase(), mode, metadataModel);
+
+        return metadataModel;
     }
 
+    private void addMissingAndFilterVariables(MetadataModel metadataModel, String metadataFilePath) {
+        VariablesMap variablesMap = metadataModel.getVariables();
+
+        try (InputStream lunaticStream = new FileInputStream(metadataFilePath);
+             InputStream lunaticStream2 = new FileInputStream(metadataFilePath)) {
+
+            List<String> missingVars = LunaticReader.getMissingVariablesFromLunatic(lunaticStream);
+            List<String> filterVars = LunaticReader.getFilterResultFromLunatic(lunaticStream2);
+
+            for (String var : missingVars) {
+                String missingVarName = var + Constants.MISSING_SUFFIX;
+                if (!variablesMap.hasVariable(missingVarName)) {
+                    addLunaticVariable(metadataModel, var, Constants.MISSING_SUFFIX, VariableType.STRING);
+                }
+            }
+
+            for (String var : filterVars) {
+                String filterVarName = Constants.FILTER_RESULT_PREFIX + var;
+                if (!variablesMap.hasVariable(filterVarName)) {
+                    addLunaticVariable(metadataModel, var, Constants.FILTER_RESULT_PREFIX, VariableType.BOOLEAN);
+                }
+            }
+
+        } catch (IOException e) {
+            log.error("Erreur lecture fichier Lunatic : {}", metadataFilePath, e);
+        }
+    }
+
+
+
+
     private void saveMetadata(String questionnaireId, Mode mode, MetadataModel metadataModel) {
         questionnaireMetadataPersistancePort.save(
                 new QuestionnaireMetadataModel(

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

@@ -7,11 +7,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.UncheckedIOException;
+import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;

src/test/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataServiceTest.java

@@ -0,0 +1,55 @@
+package fr.insee.genesis.domain.service.metadata;
+
+import fr.insee.bpm.metadata.model.MetadataModel;
+import fr.insee.genesis.domain.model.surveyunit.Mode;
+import fr.insee.genesis.exceptions.GenesisError;
+import fr.insee.genesis.infrastructure.utils.FileUtils;
+import fr.insee.genesis.stubs.ConfigStub;
+import fr.insee.genesis.stubs.QuestionnaireMetadataPersistancePortStub;
+import org.junit.jupiter.api.Test;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+class QuestionnaireMetadataServiceTest {
+
+    @Test
+    void loadAndSaveIfNotExists_should_add_missing_and_filter_variables() throws Exception {
+
+        /*
+        QuestionnaireMetadataPersistancePortStub metadataStub = new QuestionnaireMetadataPersistancePortStub();
+        FileUtils fileUtils = new FileUtils(new ConfigStub());
+
+        QuestionnaireMetadataService service = new QuestionnaireMetadataService(metadataStub);
+        List<GenesisError> errors = new ArrayList<>();
+
+        String campaign = "TEST-GLOB";
+        Mode mode = Mode.TEL;
+
+        // On lit directement le fichier Lunatic (pour vérifier initial)
+        MetadataModel initial = service.parseMetadata(
+                "src/test/resources/specs/" + campaign + "/" + mode + "/lunatic_" + campaign + ".json",
+                false
+        );
+
+        int initialCount = initial.getVariables().getVariables().size();
+
+        // WHEN
+        MetadataModel saved = service.loadAndSaveIfNotExists(
+                campaign,
+                campaign,
+                mode,
+                fileUtils,
+                errors
+        );
+
+        // THEN
+        int afterCount = saved.getVariables().getVariables().size();
+        assertThat(initialCount).isGreaterThan(afterCount);
+*/
+
+    }
+
+
+}