Skip to content

Fix missing filter var #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hajarel-moukh merged 7 commits into from
Dec 18, 2025
Merged

Fix missing filter var #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cbca6cd
fix missing and filter_results in loadMetadatasFromDB
Hajarel-moukh Dec 12, 2025
1479d16
apply some refacto
Hajarel-moukh Dec 15, 2025
5edafa7
clean code
Hajarel-moukh Dec 15, 2025
c8a9f4a
clean code
Hajarel-moukh Dec 16, 2025
5ed34a5
clean code
Hajarel-moukh Dec 16, 2025
0094f8a
adapt the code to BPM modifications
Hajarel-moukh Dec 16, 2025
7b987bc
modify after CR
Hajarel-moukh Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/main/java/fr/insee/genesis/controller/rest/QuestionnaireMetadataController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.*;

@Controller
@RequestMapping(path = "/questionnaire-metadata")
Expand Down
21 changes: 6 additions & 15 deletions src/main/java/fr/insee/genesis/controller/rest/responses/ResponseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import fr.insee.bpm.exceptions.MetadataParserException;
import fr.insee.bpm.metadata.model.MetadataModel;
import fr.insee.bpm.metadata.model.VariablesMap;
import fr.insee.bpm.metadata.reader.ddi.DDIReader;
import fr.insee.bpm.metadata.reader.ReaderUtils;
import fr.insee.bpm.metadata.reader.lunatic.LunaticReader;
import fr.insee.genesis.Constants;
import fr.insee.genesis.controller.adapter.LunaticXmlAdapter;
Expand Down Expand Up @@ -41,22 +41,12 @@
import org.springframework.lang.Nullable;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.*;
import org.xml.sax.SAXException;

import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLStreamException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.*;
import java.net.MalformedURLException;
import java.nio.file.Files;
import java.nio.file.Path;
Expand Down Expand Up @@ -604,8 +594,9 @@ private static VariablesMap getVariablesMapWithPath(String metadataFilePath) thr
//Parse DDI
log.info("Try to read DDI file : {}", metadataFilePath);
try {
return DDIReader.getMetadataFromDDI(Path.of(metadataFilePath).toFile().toURI().toURL().toString(),
new FileInputStream(metadataFilePath)).getVariables();
InputStream metadataInputStream = new FileInputStream(metadataFilePath);
return ReaderUtils.getMetadataFromDDIAndLunatic(Path.of(metadataFilePath).toFile().toURI().toURL().toString(),
metadataInputStream,metadataInputStream).getVariables();
} catch (MetadataParserException e) {
throw new GenesisException(500, e.getMessage());
} catch (FileNotFoundException fnfe){
Expand Down
38 changes: 26 additions & 12 deletions src/main/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +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.reader.ddi.DDIReader;
import fr.insee.bpm.metadata.reader.ReaderUtils;
import fr.insee.bpm.metadata.reader.lunatic.LunaticReader;
import fr.insee.genesis.Constants;
import fr.insee.genesis.domain.model.metadata.QuestionnaireMetadataModel;
Expand All @@ -20,6 +20,7 @@

import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Path;
import java.util.List;

Expand All @@ -43,17 +44,28 @@ 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 =
public MetadataModel loadAndSaveIfNotExists(
String campaignName,
String questionnaireId,
Mode mode,
FileUtils fileUtils,
List<GenesisError> errors
) throws GenesisException {

List<QuestionnaireMetadataModel> storedMetadatas =
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;

if (!storedMetadatas.isEmpty()
&& storedMetadatas.getFirst().metadataModel() != null) {
return storedMetadatas.getFirst().metadataModel();
}
return questionnaireMetadataModels.getFirst().metadataModel();

MetadataModel metadataModel =
readMetadatas(campaignName, mode.getModeName(), fileUtils, errors);

saveMetadata(questionnaireId.toUpperCase(), mode, metadataModel);

@alicela alicela Dec 17, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't have to save if the metadata are already stored

@Hajarel-moukh Hajarel-moukh Dec 17, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right i have modified, thank you


return metadataModel;
}

private void saveMetadata(String questionnaireId, Mode mode, MetadataModel metadataModel) {
Expand Down Expand Up @@ -119,16 +131,18 @@ private MetadataModel parseMetadata(String metadataFilePath, boolean withDDI) {
try {
log.info("Try to read {} file: {}", withDDI ? "DDI" : "Lunatic", metadataFilePath);
if (withDDI) {
MetadataModel metadataModel = DDIReader.getMetadataFromDDI(
InputStream metadataInputStream = new FileInputStream(metadataFilePath);
MetadataModel metadataModel = ReaderUtils.getMetadataFromDDIAndLunatic(
Path.of(metadataFilePath).toFile().toURI().toURL().toString(),
new FileInputStream(metadataFilePath));
metadataInputStream,metadataInputStream);
// Temporary solution
// the logic of adding variables from lunatic to the ones present in the DDI needs to be implemented in BPM
// (only in Kraftwerk for the moment)
for (String enoVar : Constants.getEnoVariables()){
metadataModel.getVariables().putVariable(new Variable(enoVar, metadataModel.getRootGroup(), VariableType.STRING));
}
return metadataModel;

} else {
return LunaticReader.getMetadataFromLunatic(
new FileInputStream(metadataFilePath));
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/fr/insee/genesis/infrastructure/utils/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 1 addition & 5 deletions src/test/java/fr/insee/genesis/controller/adapter/LunaticXmlAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@
import fr.insee.bpm.metadata.model.Variable;
import fr.insee.bpm.metadata.model.VariableType;
import fr.insee.genesis.Constants;
import fr.insee.genesis.controller.sources.xml.LunaticXmlCollectedData;
import fr.insee.genesis.controller.sources.xml.LunaticXmlData;
import fr.insee.genesis.controller.sources.xml.LunaticXmlOtherData;
import fr.insee.genesis.controller.sources.xml.LunaticXmlSurveyUnit;
import fr.insee.genesis.controller.sources.xml.ValueType;
import fr.insee.genesis.controller.sources.xml.*;
import fr.insee.genesis.domain.model.surveyunit.DataState;
import fr.insee.genesis.domain.model.surveyunit.Mode;
import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
Expand Down
1 change: 1 addition & 0 deletions src/test/java/fr/insee/genesis/controller/rest/QuestionnaireMetadataControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ void saveMetadataTest(){
//WHEN
ResponseEntity<Object> response = questionnaireMetadataController.saveMetadata(questionnaireId, mode, metadataModel);


//THEN
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(questionnaireMetadataPersistancePortStub.getMongoStub()).hasSize(1);
Expand Down
Loading
Loading