feat: codelists endpoints

src/main/java/fr/insee/pogues/service/CodesListService.java

@@ -19,20 +19,24 @@
 
 import static fr.insee.pogues.utils.CodesListConverter.*;
 import static fr.insee.pogues.utils.json.JSONFunctions.jsonStringtoJsonNode;
+import static fr.insee.pogues.utils.model.CodesList.getListOfQuestionIdWhereCodesListIsUsed;
 
 @Service
 @Slf4j
 public class CodesListService {
     private QuestionnairesService questionnairesService;
+    private VariableService variableService;
 
     @Autowired
-    public CodesListService(QuestionnairesService questionnairesService){
+    public CodesListService(QuestionnairesService questionnairesService, VariableService variableService){
         this.questionnairesService = questionnairesService;
+        this.variableService = variableService;
     }
 
     public boolean updateOrAddCodeListToQuestionnaire(String questionnaireId, String idCodesList, CodesList codesList) throws Exception {
         Questionnaire questionnaire = retrieveQuestionnaireWithId(questionnaireId);
         boolean created = updateOrAddCodeListToQuestionnaire(questionnaire, idCodesList, codesList);
+        if(!created) variableService.updateQuestionAndVariablesAccordingToCodesList(questionnaire, idCodesList);
         updateQuestionnaireInDataBase(questionnaire);
         return created;
     }
@@ -91,38 +95,7 @@ boolean updateOrAddCodeListDTD(List<CodeList> existingCodeLists, String idCodesL
         return false;
     }
 
-    List<String> getListOfQuestionIdWhereCodesListIsUsed(Questionnaire questionnaire, String codesListId){
-        return getListOfQuestionWhereCodesListIsUsed(questionnaire, codesListId).stream()
-                .map(componentType -> componentType.getId())
-                .toList();
-    }
-
-    List<ComponentType> getListOfQuestionWhereCodesListIsUsed(Questionnaire questionnaire, String codesListId){
-        return questionnaire.getChild().stream()
-                .map(componentType -> getListOfQuestionWhereCodesListIsUsed(componentType, codesListId))
-                .flatMap(Collection::stream).toList();
-    }
 
-    List<ComponentType> getListOfQuestionWhereCodesListIsUsed(ComponentType poguesComponent, String codesListId){
-        List<ComponentType> questions = new ArrayList<>();
-        if(poguesComponent.getClass().equals(SequenceType.class)){
-            ((SequenceType) poguesComponent).getChild().stream().forEach(childComponent -> {
-                questions.addAll(getListOfQuestionWhereCodesListIsUsed(childComponent, codesListId));
-            });
-        }
-        if(poguesComponent.getClass().equals(QuestionType.class)){
-            QuestionTypeEnum questionType = ((QuestionType) poguesComponent).getQuestionType();
-            ((QuestionType) poguesComponent).getResponse().forEach(responseType -> {
-                if(codesListId.equals(responseType.getCodeListReference())) questions.add(poguesComponent);
-            });
-            if(questionType.equals(QuestionTypeEnum.TABLE) || questionType.equals(QuestionTypeEnum.MULTIPLE_CHOICE)){
-                ((QuestionType) poguesComponent).getResponseStructure().getDimension().forEach(dimensionType -> {
-                    if(codesListId.equals(dimensionType.getCodeListReference())) questions.add(poguesComponent);
-                });
-            }
-        }
-        return questions;
-    }
 
 
     void addCodeListDTD(List<CodeList> existingCodeLists, CodesList codesListDtdToAdd){

src/main/java/fr/insee/pogues/service/VariableService.java

@@ -1,94 +1,43 @@
 package fr.insee.pogues.service;
 
 import fr.insee.pogues.model.*;
-import fr.insee.pogues.persistence.service.QuestionnairesService;
-import fr.insee.pogues.utils.PoguesDeserializer;
-import fr.insee.pogues.utils.PoguesSerializer;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.IntStream;
 
-import static fr.insee.pogues.utils.json.JSONFunctions.jsonStringtoJsonNode;
+import static fr.insee.pogues.utils.model.CodesList.getListOfQuestionWhereCodesListIsUsed;
+import static fr.insee.pogues.utils.model.question.MultipleChoice.updateMultipleChoiceQuestionAccordingToCodeList;
+import static fr.insee.pogues.utils.model.question.Table.updateTableQuestionAccordingToCodeList;
+import static fr.insee.pogues.utils.model.Variables.*;
 
 @Service
 public class VariableService {
 
-    private QuestionnairesService questionnairesService;
-
-    private CodesListService codesListService;
-
-    @Autowired
-    public VariableService(QuestionnairesService questionnairesService, CodesListService codesListService){
-        this.questionnairesService = questionnairesService;
-        this.codesListService = codesListService;
-    }
-
     public void updateQuestionAndVariablesAccordingToCodesList(Questionnaire questionnaire, String updatedCodeListId){
+        // Retrieve updatedCodeList in questionnaire
         CodeList codeList = questionnaire.getCodeLists().getCodeList().stream().filter(cL -> updatedCodeListId.equals(cL.getId())).findFirst().get();
-        // handleOnly MULTIPLE_CHOICE question for now
-        List<ComponentType> questionsToModify = codesListService
-                .getListOfQuestionWhereCodesListIsUsed(questionnaire, updatedCodeListId).stream()
-                .filter(componentType -> ((QuestionType) componentType).getQuestionType().equals(QuestionTypeEnum.MULTIPLE_CHOICE)).toList();
-        // retrieve collected variables of multipleQuestion
-        List<String> oldVariables = questionsToModify.stream()
-                .map(componentType ->  getVariableOfMultipleQuestion((QuestionType) componentType))
-                .flatMap(Collection::stream)
+        // Just retrieve MULTIPLE_CHOICE and TABLE questions
+        List<QuestionType> questionsToModify = getListOfQuestionWhereCodesListIsUsed(questionnaire, updatedCodeListId).stream()
+                .filter(questionType -> {
+                    QuestionTypeEnum questionTypeEnum = questionType.getQuestionType();
+                    return QuestionTypeEnum.MULTIPLE_CHOICE.equals(questionTypeEnum) || QuestionTypeEnum.TABLE.equals(questionTypeEnum);
+                })
                 .toList();
-        // remove old variables
-        questionnaire.getVariables().getVariable().removeIf(variable -> oldVariables.contains(variable.getId()));
-
-        // generate response first with CollectedVariableReference id generated
-        List<ResponseType> responses;
-
-
-        // generate new variable according to codeList
-        List<VariableType> newVariables = questionsToModify.stream()
-                .map(componentType -> computeNewVariableAccordingToCodeListMultipleChoice(codeList, componentType.getName()))
+        // modify Multiple and Table question and get there new Variables
+        List<VariableType> variables = questionsToModify.stream()
+                .map(questionType -> {
+                    QuestionTypeEnum questionTypeEnum = questionType.getQuestionType();
+                    if(QuestionTypeEnum.MULTIPLE_CHOICE.equals(questionTypeEnum)) return updateMultipleChoiceQuestionAccordingToCodeList(questionType, codeList);
+                    return updateTableQuestionAccordingToCodeList(questionType, codeList, questionnaire.getCodeLists().getCodeList());
+                })
                 .flatMap(Collection::stream)
                 .toList();
-
-        // add new variables
-        questionnaire.getVariables().getVariable().addAll(newVariables);
-
-    }
-
-    private List<String> getVariableOfMultipleQuestion(QuestionType multipleQuestion){
-        if(!multipleQuestion.getQuestionType().equals(QuestionTypeEnum.MULTIPLE_CHOICE)) return List.of();
-        return multipleQuestion.getResponse().stream()
-                .map(responseType -> responseType.getCollectedVariableReference())
-                .toList();
-    }
-
-    private VariableType buildBooleanVariableFromCode(CodeType codeType, String name){
-        CollectedVariableType collectedVariableType = new CollectedVariableType();
-        collectedVariableType.setId(UUID.randomUUID().toString());
-        collectedVariableType.setName(name);
-        collectedVariableType.setLabel(String.format("%s - %s",codeType.getValue(), codeType.getLabel()));
-        DatatypeType booleanType = new BooleanDatatypeType();
-        booleanType.setTypeName(DatatypeTypeEnum.BOOLEAN);
-        collectedVariableType.setDatatype(booleanType);
-        return collectedVariableType;
-    }
-
-    public List<VariableType> computeNewVariableAccordingToCodeListMultipleChoice(CodeList codeList, String questionName){
-        return IntStream.range(0, codeList.getCode().size())
-                .mapToObj(index -> buildBooleanVariableFromCode(codeList.getCode().get(index), String.format("%s%d",questionName,index+1)))
-                .toList();
-    }
-
-
-    private Questionnaire retrieveQuestionnaireWithId(String id) throws Exception {
-        return PoguesDeserializer.questionnaireToJavaObject(questionnairesService.getQuestionnaireByID(id));
-    }
-
-    private void updateQuestionnaireInDataBase(Questionnaire questionnaire) throws Exception {
-        questionnairesService.updateQuestionnaire(
-                questionnaire.getId(),
-                jsonStringtoJsonNode(PoguesSerializer.questionnaireJavaToString(questionnaire)));
+        // add new variables to questionnaire
+        questionnaire.getVariables().getVariable().addAll(variables);
+        // Delete variables that are not referenced in response
+        List<String> neededCollectedVariables = getNeededCollectedVariablesInQuestionnaire(questionnaire);
+        questionnaire.getVariables().getVariable().removeIf(variableType -> !neededCollectedVariables.contains(variableType.getId()));
     }
 
 }

src/main/java/fr/insee/pogues/transforms/visualize/composition/InsertSequences.java

@@ -6,7 +6,7 @@
 
 import java.util.List;
 
-import static fr.insee.pogues.utils.PoguesModelUtils.getSequences;
+import static fr.insee.pogues.utils.model.PoguesModelUtils.getSequences;
 
 /**
  * Implementation of CompositionStep to replace questionnaire reference by its sequences.

src/main/java/fr/insee/pogues/transforms/visualize/composition/UpdateFlowControlBounds.java

@@ -9,8 +9,8 @@
 
 import java.util.List;
 
-import static fr.insee.pogues.utils.PoguesModelUtils.getFlowControlBounds;
-import static fr.insee.pogues.utils.PoguesModelUtils.getSequences;
+import static fr.insee.pogues.utils.model.PoguesModelUtils.getFlowControlBounds;
+import static fr.insee.pogues.utils.model.PoguesModelUtils.getSequences;
 
 /**
  * Implementation of CompositionStep to update FlowControl (filters) objects when de-referencing a questionnaire.

src/main/java/fr/insee/pogues/transforms/visualize/composition/UpdateIterationBounds.java

@@ -9,8 +9,8 @@
 
 import java.util.List;
 
-import static fr.insee.pogues.utils.PoguesModelUtils.getIterationBounds;
-import static fr.insee.pogues.utils.PoguesModelUtils.getSequences;
+import static fr.insee.pogues.utils.model.PoguesModelUtils.getIterationBounds;
+import static fr.insee.pogues.utils.model.PoguesModelUtils.getSequences;
 
 /**
  * Implementation of CompositionStep to update Iteration (loops) objects when de-referencing a questionnaire.

src/main/java/fr/insee/pogues/transforms/visualize/composition/UpdateReferencedVariablesScope.java

@@ -6,12 +6,12 @@
 import fr.insee.pogues.model.IterationType;
 import fr.insee.pogues.model.Questionnaire;
 import fr.insee.pogues.model.VariableType;
-import fr.insee.pogues.utils.PoguesModelUtils;
+import fr.insee.pogues.utils.model.PoguesModelUtils;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
 
-import static fr.insee.pogues.utils.PoguesModelUtils.getIterationBounds;
+import static fr.insee.pogues.utils.model.PoguesModelUtils.getIterationBounds;
 
 /**
  * Implementation of CompositionStep to update variable scopes when de-referencing a questionnaire.

src/main/java/fr/insee/pogues/utils/model/CodesList.java

@@ -0,0 +1,43 @@
+package fr.insee.pogues.utils.model;
+
+import fr.insee.pogues.model.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public class CodesList {
+
+    public static List<QuestionType> getListOfQuestionWhereCodesListIsUsed(Questionnaire questionnaire, String codesListId){
+        return questionnaire.getChild().stream()
+                .map(componentType -> getListOfQuestionWhereCodesListIsUsed(componentType, codesListId))
+                .flatMap(Collection::stream).toList();
+    }
+
+    public static List<String> getListOfQuestionIdWhereCodesListIsUsed(Questionnaire questionnaire, String codesListId){
+        return getListOfQuestionWhereCodesListIsUsed(questionnaire, codesListId).stream()
+                .map(componentType -> componentType.getId())
+                .toList();
+    }
+
+    public static List<QuestionType> getListOfQuestionWhereCodesListIsUsed(ComponentType poguesComponent, String codesListId){
+        List<QuestionType> questions = new ArrayList<>();
+        if(poguesComponent.getClass().equals(SequenceType.class)){
+            ((SequenceType) poguesComponent).getChild().stream().forEach(childComponent -> {
+                questions.addAll(getListOfQuestionWhereCodesListIsUsed(childComponent, codesListId));
+            });
+        }
+        if(poguesComponent.getClass().equals(QuestionType.class)){
+            QuestionTypeEnum questionType = ((QuestionType) poguesComponent).getQuestionType();
+            ((QuestionType) poguesComponent).getResponse().forEach(responseType -> {
+                if(codesListId.equals(responseType.getCodeListReference())) questions.add((QuestionType) poguesComponent);
+            });
+            if(questionType.equals(QuestionTypeEnum.TABLE) || questionType.equals(QuestionTypeEnum.MULTIPLE_CHOICE)){
+                ((QuestionType) poguesComponent).getResponseStructure().getDimension().forEach(dimensionType -> {
+                    if(codesListId.equals(dimensionType.getCodeListReference())) questions.add((QuestionType) poguesComponent);
+                });
+            }
+        }
+        return questions;
+    }
+}

src/main/java/fr/insee/pogues/utils/PoguesModelUtils.java → src/main/java/fr/insee/pogues/utils/model/PoguesModelUtils.java

@@ -1,4 +1,4 @@
-package fr.insee.pogues.utils;
+package fr.insee.pogues.utils.model;
 
 import fr.insee.pogues.exception.IllegalFlowControlException;
 import fr.insee.pogues.exception.IllegalIterationException;

src/main/java/fr/insee/pogues/utils/model/Variables.java

@@ -0,0 +1,52 @@
+package fr.insee.pogues.utils.model;
+
+import fr.insee.pogues.model.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public class Variables {
+
+    public static VariableType buildBooleanVariableFromCode(CodeType codeType, String variableId, String name){
+        CollectedVariableType collectedVariableType = new CollectedVariableType();
+        collectedVariableType.setId(variableId);
+        collectedVariableType.setName(name);
+        collectedVariableType.setLabel(String.format("%s - %s",codeType.getValue(), codeType.getLabel()));
+        DatatypeType booleanType = new BooleanDatatypeType();
+        booleanType.setTypeName(DatatypeTypeEnum.BOOLEAN);
+        collectedVariableType.setDatatype(booleanType);
+        return collectedVariableType;
+    }
+
+    public static VariableType buildCollectedVariableFromDataType(DatatypeType datatype, String variableId, String name, String label){
+        CollectedVariableType collectedVariableType = new CollectedVariableType();
+        collectedVariableType.setDatatype(datatype);
+        collectedVariableType.setId(variableId);
+        collectedVariableType.setName(name);
+        collectedVariableType.setLabel(label);
+        return collectedVariableType;
+    }
+
+    public static List<String> getNeededCollectedVariablesInQuestionnaire(Questionnaire questionnaire){
+        return questionnaire.getChild().stream()
+                .map(componentType -> getNeededCollectedVariablesInQuestionnaire(componentType))
+                .flatMap(Collection::stream).toList();
+    }
+
+    public static List<String> getNeededCollectedVariablesInQuestionnaire(ComponentType poguesComponent){
+        List<String> variablesIds = new ArrayList<>();
+        if(poguesComponent.getClass().equals(SequenceType.class)){
+            ((SequenceType) poguesComponent).getChild().stream().forEach(childComponent -> {
+                variablesIds.addAll(getNeededCollectedVariablesInQuestionnaire(childComponent));
+            });
+        }
+        if(poguesComponent.getClass().equals(QuestionType.class)){
+            ((QuestionType) poguesComponent).getResponse().forEach(responseType -> {
+                String collectedVariable = responseType.getCollectedVariableReference();
+                if(collectedVariable != null) variablesIds.add(collectedVariable);
+            });
+        }
+        return variablesIds;
+    }
+}

src/main/java/fr/insee/pogues/utils/model/question/Common.java

@@ -0,0 +1,19 @@
+package fr.insee.pogues.utils.model.question;
+
+import fr.insee.pogues.model.MappingType;
+
+import java.util.UUID;
+
+public class Common {
+
+    public static String getNewUniqueId(){
+        return UUID.randomUUID().toString();
+    }
+
+    public static MappingType createNewMapping(String mappingSource, String mappingTarget){
+        MappingType mapping = new MappingType();
+        mapping.setMappingSource(mappingSource);
+        mapping.setMappingTarget(mappingTarget);
+        return mapping;
+    }
+}