Skip to content

Forcer les majuscules des questionnaireIds en entrée #262

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
alexisszmundy merged 2 commits into from
Jul 31, 2025
Merged

Forcer les majuscules des questionnaireIds en entrée #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d96f67
feat: Upper case questionnaireIds sent to DB
alexisszmundy Jul 24, 2025
a1d8920
test: fixed unit tests
alexisszmundy Jul 24, 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
2 changes: 1 addition & 1 deletion src/main/java/fr/insee/genesis/controller/adapter/LunaticXmlAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public static List<SurveyUnitModel> convert(LunaticXmlSurveyUnit su, VariablesMa
*/
private static SurveyUnitModel getStateDataFromSurveyUnit(LunaticXmlSurveyUnit su, VariablesMap variablesMap, String campaignId, DataState dataState, Mode mode) {
SurveyUnitModel surveyUnitModel = SurveyUnitModel.builder()
.questionnaireId(su.getQuestionnaireModelId())
.questionnaireId(su.getQuestionnaireModelId().toUpperCase())
.campaignId(campaignId)
.interrogationId(su.getId())
.state(dataState)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/insee/genesis/controller/rest/LunaticModelController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public ResponseEntity<String> saveRawResponsesFromJsonBody(
@RequestParam("questionnaireId") String questionnaireId,
@RequestBody Map<String, Object> dataJson
){
lunaticModelApiPort.save(questionnaireId, dataJson);
lunaticModelApiPort.save(questionnaireId.toUpperCase(), dataJson);
return ResponseEntity.ok().build();
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/insee/genesis/controller/rest/responses/EditedResponseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public ResponseEntity<Object> readEditedPreviousJson(
if (!jsonFileName.toLowerCase().endsWith(".json")) {
throw new GenesisException(400, "File must be a JSON file !");
}
readEditedPreviousFile(questionnaireId, sourceState, filePath);
readEditedPreviousFile(questionnaireId.toUpperCase(), sourceState, filePath);
moveFiles(questionnaireId, mode, fileUtils, filePath);
return ResponseEntity.ok("Edited previous variable file %s saved !".formatted(filePath));
}catch (GenesisException ge){
Expand All @@ -93,7 +93,7 @@ public ResponseEntity<Object> readEditedExternalJson(
if (!jsonFileName.toLowerCase().endsWith(".json")) {
throw new GenesisException(400, "File must be a JSON file !");
}
readEditedExternalFile(questionnaireId, filePath);
readEditedExternalFile(questionnaireId.toUpperCase(), filePath);
moveFiles(questionnaireId, mode, fileUtils, filePath);
return ResponseEntity.ok("Edited external variable file %s saved !".formatted(filePath));
}catch (GenesisException ge){
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public ResponseEntity<String> saveRawResponsesFromJsonBody(
log.info("Try to save interrogationId {} for campaign {}", interrogationId, campaignName);
LunaticJsonRawDataModel rawData = LunaticJsonRawDataModel.builder()
.campaignId(campaignName)
.questionnaireId(questionnaireId)
.questionnaireId(questionnaireId.toUpperCase())
.interrogationId(interrogationId)
.idUE(idUE)
.mode(modeSpecified)
Expand Down Expand Up @@ -118,7 +118,7 @@ public ResponseEntity<String> saveRawResponsesFromJsonBodyWithValidation(

LunaticJsonRawDataModel rawData = LunaticJsonRawDataModel.builder()
.campaignId(body.get(PARTITION_ID).toString())
.questionnaireId(body.get("questionnaireModelId").toString())
.questionnaireId(body.get("questionnaireModelId").toString().toUpperCase())
.interrogationId(body.get(INTERROGATION_ID).toString())
.idUE(body.get("surveyUnitId").toString())
.mode(Mode.getEnumFromJsonName(body.get("mode").toString()))
Expand Down
4 changes: 1 addition & 3 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 @@ -6,7 +6,6 @@
import fr.insee.bpm.metadata.reader.lunatic.LunaticReader;
import fr.insee.genesis.Constants;
import fr.insee.genesis.controller.adapter.LunaticXmlAdapter;
import fr.insee.genesis.domain.model.surveyunit.InterrogationId;
import fr.insee.genesis.controller.dto.SurveyUnitDto;
import fr.insee.genesis.controller.dto.SurveyUnitInputDto;
import fr.insee.genesis.controller.dto.SurveyUnitQualityToolDto;
Expand All @@ -21,6 +20,7 @@
import fr.insee.genesis.controller.utils.ControllerUtils;
import fr.insee.genesis.controller.utils.DataTransformer;
import fr.insee.genesis.domain.model.context.DataProcessingContextModel;
import fr.insee.genesis.domain.model.surveyunit.InterrogationId;
import fr.insee.genesis.domain.model.surveyunit.Mode;
import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
import fr.insee.genesis.domain.model.surveyunit.VariableModel;
Expand Down Expand Up @@ -57,11 +57,9 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;

@RequestMapping(path = "/responses" )
@Controller
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ public List<SurveyUnitModel> parseEditedVariables(
SurveyUnitModel surveyUnitModel = SurveyUnitModel.builder()
.campaignId(surveyUnitInputDto.getCampaignId())
.mode(surveyUnitInputDto.getMode())
.questionnaireId(surveyUnitInputDto.getQuestionnaireId())
.questionnaireId(surveyUnitInputDto.getQuestionnaireId().toUpperCase())
.interrogationId(surveyUnitInputDto.getInterrogationId())
.state(state)
.recordDate(LocalDateTime.now())
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/cucumber/functional_tests/MainDefinitions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,15 +191,15 @@ public void delete_directory() throws IOException {

@When("We extract survey unit data with questionnaireId {string} and interrogationId {string}")
public void extract_survey_data(String questionnaireId, String interrogationId) {
this.surveyUnitModelResponse = responseController.getLatestByInterrogation(interrogationId, questionnaireId);
this.surveyUnitModelResponse = responseController.getLatestByInterrogation(interrogationId, questionnaireId.toUpperCase());
}

@When("We extract survey unit latest states with questionnaireId {string} and interrogationId {string}")
public void extract_survey_unit_latest_states(String questionnaireId, String interrogationId){
try {
this.surveyUnitLatestStatesResponse =
responseController.findResponsesByInterrogationAndQuestionnaireLatestStates(interrogationId,
questionnaireId);
questionnaireId.toUpperCase());
} catch (GenesisException e) {
this.surveyUnitLatestStatesResponse = ResponseEntity.status(e.getStatus()).body(new ApiError(e.getMessage()));
}
Expand Down Expand Up @@ -329,7 +329,7 @@ public void check_external_variable_content_in_mongo(
@Then("If we get latest states for {string} in collected variable {string}, survey unit {string} we should have {string} for iteration {int}")
public void check_latest_state_collected(String questionnaireId, String variableName, String interrogationId, String expectedValue, int iteration) throws GenesisException {
ResponseEntity<Object> response =
responseController.findResponsesByInterrogationAndQuestionnaireLatestStates(interrogationId, questionnaireId);
responseController.findResponsesByInterrogationAndQuestionnaireLatestStates(interrogationId, questionnaireId.toUpperCase());
Assertions.assertThat(response.getStatusCode().value()).isEqualTo(200);

SurveyUnitQualityToolDto surveyUnitQualityToolDto = (SurveyUnitQualityToolDto) response.getBody();
Expand All @@ -353,7 +353,7 @@ public void check_latest_state_collected(String questionnaireId, String variable
@Then("If we get latest states for {string} in external variable {string}, survey unit {string} we should have {string} for iteration {int}")
public void check_latest_state_external(String questionnaireId, String variableName, String interrogationId, String expectedValue, int iteration) throws GenesisException {
ResponseEntity<Object> response =
responseController.findResponsesByInterrogationAndQuestionnaireLatestStates(interrogationId, questionnaireId);
responseController.findResponsesByInterrogationAndQuestionnaireLatestStates(interrogationId, questionnaireId.toUpperCase());
Assertions.assertThat(response.getStatusCode().value()).isEqualTo(200);
SurveyUnitQualityToolDto surveyUnitQualityToolDto = (SurveyUnitQualityToolDto) response.getBody();

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -234,7 +234,7 @@ void test02() {
// When
List<SurveyUnitModel> surveyUnitModels = LunaticXmlAdapter.convert(lunaticXmlSurveyUnit1, metadataModel.getVariables(), CAMPAIGN_ID, Mode.WEB);
// Then
Assertions.assertThat(surveyUnitModels.getFirst().getQuestionnaireId()).isEqualTo("questionnaireId1");
Assertions.assertThat(surveyUnitModels.getFirst().getQuestionnaireId()).isEqualTo("questionnaireId1".toUpperCase());
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void saveJsonRawDataFromStringTest() throws Exception {
//GIVEN
lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
String campaignId = "SAMPLETEST-PARADATA-v1";
String questionnaireId = "testIdQuest";
String questionnaireId = "testIdQuest".toUpperCase();
String interrogationId = "testinterrogationId";
Map<String,Object> json = JsonUtils.jsonToMap("{\"COLLECTED\": {\"testdata\": {\"COLLECTED\": [\"test\"]}}}");

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/fr/insee/genesis/controller/rest/responses/ResponseControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class ResponseControllerTest {
static final String DEFAULT_INTERROGATION_ID = "TESTINTERROGATIONID";
static final String DEFAULT_QUESTIONNAIRE_ID = "TESTQUESTIONNAIREID";
static final String CAMPAIGN_ID_WITH_DDI = "SAMPLETEST-PARADATA-v1";
static final String QUESTIONNAIRE_ID_WITH_DDI = "SAMPLETEST-PARADATA-v1";
static final String QUESTIONNAIRE_ID_WITH_DDI = "SAMPLETEST-PARADATA-v1".toUpperCase();

@BeforeAll
static void init() {
Expand Down
Loading