Skip to content

Commit

Permalink
Merge pull request #137 from InseeFr/devTableauxDynamiquesFix
Browse files Browse the repository at this point in the history 
Tableaux dynamiques fix perret
  • Loading branch information
@loichenninger
loichenninger authored Dec 16, 2024
2 parents dc992ad + 5d665d0 commit d849c79
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 38 deletions.
1 change: 1 addition & 0 deletions src/main/java/fr/insee/genesis/controller/dto/VariableDto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
@Data
public class VariableDto {
private String variableName;
private String idLoop;

@JsonProperty("variableStates")
private List<VariableStateDto> variableStateDtoList;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/fr/insee/genesis/domain/model/surveyunit/IdLoopTuple.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package fr.insee.genesis.domain.model.surveyunit;

public record IdLoopTuple(String idVar, String idLoop) {
}
66 changes: 28 additions & 38 deletions src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitService.java
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,15 @@
package fr.insee.genesis.domain.service.surveyunit;

import fr.insee.genesis.controller.dto.CampaignWithQuestionnaire;
import fr.insee.genesis.controller.dto.QuestionnaireWithCampaign;
import fr.insee.genesis.controller.dto.SurveyUnitDto;
import fr.insee.genesis.controller.dto.SurveyUnitId;
import fr.insee.genesis.controller.dto.VariableDto;
import fr.insee.genesis.controller.dto.VariableStateDto;
import fr.insee.genesis.domain.model.surveyunit.CollectedVariable;
import fr.insee.genesis.domain.model.surveyunit.Mode;
import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
import fr.insee.genesis.domain.model.surveyunit.Variable;
import fr.insee.genesis.controller.dto.*;
import fr.insee.genesis.domain.model.surveyunit.*;
import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
import fr.insee.genesis.domain.ports.spi.SurveyUnitPersistencePort;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.stream.Stream;

@Service
Expand Down Expand Up @@ -77,7 +65,7 @@ public List<SurveyUnitModel> findLatestByIdAndByIdQuestionnaire(String idUE, Str
//We had all the variables of the oldest update
latestUpdatesbyVariables.add(suByMode.getFirst());
//We keep the name of already added variables to skip them in older updates
List<String> addedVariables = new ArrayList<>();
List<IdLoopTuple> addedVariables = new ArrayList<>();
SurveyUnitModel latestUpdate = suByMode.getFirst();

if(latestUpdate.getCollectedVariables() == null){
Expand All @@ -86,33 +74,33 @@ public List<SurveyUnitModel> findLatestByIdAndByIdQuestionnaire(String idUE, Str
if(latestUpdate.getExternalVariables() == null){
latestUpdate.setExternalVariables(new ArrayList<>());
}
latestUpdate.getCollectedVariables().forEach(variableStateDto -> addedVariables.add(variableStateDto.getIdVar()));
latestUpdate.getExternalVariables().forEach(externalVariableDto -> addedVariables.add(externalVariableDto.getIdVar()));
latestUpdate.getCollectedVariables().forEach(colVar -> addedVariables.add(new IdLoopTuple(colVar.getIdVar(), colVar.getIdLoop())));
latestUpdate.getExternalVariables().forEach(extVar -> addedVariables.add(new IdLoopTuple(extVar.getIdVar(), "")));

suByMode.forEach(surveyUnitDto -> {
suByMode.forEach(surveyUnitModel -> {
List<CollectedVariable> variablesToKeep = new ArrayList<>();
List<Variable> externalToKeep = new ArrayList<>();
// We iterate over the variables of the update and add them to the list if they are not already added
surveyUnitDto.getCollectedVariables().stream()
.filter(variableStateDto -> !addedVariables.contains(variableStateDto.getIdVar()))
.forEach(variableStateDto -> {
variablesToKeep.add(variableStateDto);
addedVariables.add(variableStateDto.getIdVar());
surveyUnitModel.getCollectedVariables().stream()
.filter(colVar -> !addedVariables.contains(new IdLoopTuple(colVar.getIdVar(), colVar.getIdLoop())))
.forEach(colVar -> {
variablesToKeep.add(colVar);
addedVariables.add(new IdLoopTuple(colVar.getIdVar(), colVar.getIdLoop()));
});
if (surveyUnitDto.getExternalVariables() != null){
surveyUnitDto.getExternalVariables().stream()
.filter(externalVariableDto -> !addedVariables.contains(externalVariableDto.getIdVar()))
.forEach(externalVariableDto -> {
externalToKeep.add(externalVariableDto);
addedVariables.add(externalVariableDto.getIdVar());
if (surveyUnitModel.getExternalVariables() != null){
surveyUnitModel.getExternalVariables().stream()
.filter(extVar -> !addedVariables.contains(new IdLoopTuple(extVar.getIdVar(), "")))
.forEach(extVar -> {
externalToKeep.add(extVar);
addedVariables.add(new IdLoopTuple(extVar.getIdVar(), ""));
});
}

// If there are new variables, we add the update to the list of latest updates
if (!variablesToKeep.isEmpty() || !externalToKeep.isEmpty()){
surveyUnitDto.setCollectedVariables(variablesToKeep);
surveyUnitDto.setExternalVariables(externalToKeep);
latestUpdatesbyVariables.add(surveyUnitDto);
surveyUnitModel.setCollectedVariables(variablesToKeep);
surveyUnitModel.setExternalVariables(externalToKeep);
latestUpdatesbyVariables.add(surveyUnitModel);
}
});
});
Expand All @@ -128,7 +116,7 @@ public SurveyUnitDto findLatestValuesByStateByIdAndByIdQuestionnaire(String idUE
.build();

//Extract variables
Map<String, VariableDto> collectedVariableMap = new HashMap<>();
Map<IdLoopTuple, VariableDto> collectedVariableMap = new HashMap<>();
Map<String, VariableDto> externalVariableMap = new HashMap<>();
List<SurveyUnitModel> surveyUnitModels = surveyUnitPersistencePort.findByIds(idUE, idQuest);
List<Mode> modes = getDistinctsModes(surveyUnitModels);
Expand All @@ -139,7 +127,7 @@ public SurveyUnitDto findLatestValuesByStateByIdAndByIdQuestionnaire(String idUE
.toList();
suByMode.forEach(surveyUnitModel -> extractVariables(surveyUnitModel, collectedVariableMap,externalVariableMap));
});
collectedVariableMap.keySet().forEach(variableName -> surveyUnitDto.getCollectedVariables().add(collectedVariableMap.get(variableName)));
collectedVariableMap.keySet().forEach(variableTuple -> surveyUnitDto.getCollectedVariables().add(collectedVariableMap.get(variableTuple)));
externalVariableMap.keySet().forEach(variableName -> surveyUnitDto.getExternalVariables().add(externalVariableMap.get(variableName)));
return surveyUnitDto;
}
Expand Down Expand Up @@ -241,22 +229,24 @@ private static List<Mode> getDistinctsModes(List<SurveyUnitModel> surveyUnitMode
* @param externalVariableMap External variable DTO map to populate
*/
private void extractVariables(SurveyUnitModel surveyUnitModel,
Map<String, VariableDto> collectedVariableMap,
Map<IdLoopTuple, VariableDto> collectedVariableMap,
Map<String, VariableDto> externalVariableMap) {

if(surveyUnitModel.getCollectedVariables() == null){
surveyUnitModel.setCollectedVariables(new ArrayList<>());
}
for (CollectedVariable collectedVariable : surveyUnitModel.getCollectedVariables()) {
VariableDto variableDto = collectedVariableMap.get(collectedVariable.getIdVar());
IdLoopTuple idLoopTuple = new IdLoopTuple(collectedVariable.getIdVar(), collectedVariable.getIdLoop());
VariableDto variableDto = collectedVariableMap.get(idLoopTuple);

//Create variable into map if not exists
if (variableDto == null) {
variableDto = VariableDto.builder()
.variableName(collectedVariable.getIdVar())
.idLoop(collectedVariable.getIdLoop())
.variableStateDtoList(new ArrayList<>())
.build();
collectedVariableMap.put(collectedVariable.getIdVar(), variableDto);
collectedVariableMap.put(idLoopTuple, variableDto);
}
//Extract variable state
if (!collectedVariable.getValues().isEmpty() && isMostRecentForSameState(surveyUnitModel, variableDto)) {
Expand Down

0 comments on commit d849c79

Please sign in to comment.