Merge pull request #155 from InseeFr/devSonar

fix: resolve sonar issues

Author: loichenninger

src/main/java/fr/insee/genesis/controller/dto/VariableInputDto.java

@@ -4,8 +4,6 @@
 import lombok.Builder;
 import lombok.Data;
 
-import java.util.List;
-
 @Builder
 @Data
 public class VariableInputDto {

src/main/java/fr/insee/genesis/controller/rest/responses/ResponseController.java

@@ -389,9 +389,6 @@ public ResponseEntity<Object> saveEditedVariables(
         List<String> absentCollectedVariableNames =
                 surveyUnitQualityService.checkVariablesPresentInMetadata(surveyUnitInputDto.getCollectedVariables(),
                 variablesMap);
-//        List<String> absentExternalVariableNames =
-//                surveyUnitQualityService.checkVariablesPresentInMetadata(surveyUnitInputDto.getExternalVariables(),
-//                        variablesMap);
         if (!absentCollectedVariableNames.isEmpty()) {
             String absentVariables = String.join("\n", absentCollectedVariableNames);
             return ResponseEntity.badRequest().body(

src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitQualityService.java

@@ -1,10 +1,9 @@
 package fr.insee.genesis.domain.service.surveyunit;
 
-import fr.insee.genesis.controller.dto.VariableDto;
+import fr.insee.bpm.metadata.model.VariablesMap;
 import fr.insee.genesis.controller.dto.VariableInputDto;
 import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
 import fr.insee.genesis.domain.utils.DataVerifier;
-import fr.insee.bpm.metadata.model.VariablesMap;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

src/main/java/fr/insee/genesis/infrastructure/adapter/RundeckExecutionMongoAdapter.java

@@ -4,11 +4,9 @@
 import fr.insee.genesis.domain.ports.spi.RundeckExecutionPersistencePort;
 import fr.insee.genesis.infrastructure.mappers.RundeckExecutionDocumentMapper;
 import fr.insee.genesis.infrastructure.repository.RundeckExecutionDBRepository;
-import fr.insee.genesis.infrastructure.repository.ScheduleMongoDBRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
 
 @Service

src/test/java/fr/insee/genesis/controller/rest/responses/ResponseControllerTest.java

@@ -442,7 +442,7 @@ void saveEditedTest() {
     }
 
     @Test
-    void saveEditedTest_Forced() {
+    void saveEditedTest_DocumentEdited() {
         //GIVEN
         surveyUnitPersistencePortStub.getMongoStub().clear();
         String campaignId = ID_CAMPAIGN_WITH_DDI;
@@ -504,6 +504,55 @@ void saveEditedTest_Forced() {
         Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables().getFirst().getValues()).hasSize(1);
         Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables().getFirst().getValues().getFirst()).isEqualTo(editedValue);
         Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getModifiedBy()).isNull();
+    }
+
+    @Test
+    void saveEditedTest_DocumentForced() {
+        //GIVEN
+        surveyUnitPersistencePortStub.getMongoStub().clear();
+        String campaignId = ID_CAMPAIGN_WITH_DDI;
+        String idQuest = ID_QUEST_WITH_DDI;
+        String idVar = "PRENOM_C";
+        String idVar2 = "NB_SOEURS";
+        String idLoop = "BOUCLE_VAL_ANNAISS_1";
+        String editedValue = "NOT A INT";
+
+        //Variable 1
+        List<VariableInputDto> newVariables = new ArrayList<>();
+        VariableInputDto variableInputDto = VariableInputDto.builder()
+                .variableName(idVar)
+                .idLoop(idLoop)
+                .variableStateInputDto(VariableStateInputDto.builder()
+                        .state(DataState.EDITED)
+                        .value(editedValue)
+                        .build())
+                .build();
+        newVariables.add(variableInputDto);
+
+        //Variable 2
+        VariableInputDto variableInputDto2 = VariableInputDto.builder()
+                .variableName(idVar2)
+                .idLoop(idLoop)
+                .variableStateInputDto(VariableStateInputDto.builder()
+                        .state(DataState.EDITED)
+                        .value(editedValue)
+                        .build())
+                .build();
+        newVariables.add(variableInputDto2);
+
+        SurveyUnitInputDto surveyUnitInputDto = SurveyUnitInputDto.builder()
+                .campaignId(campaignId)
+                .mode(Mode.WEB)
+                .idQuestionnaire(idQuest)
+                .surveyUnitId(DEFAULT_ID_UE)
+                .collectedVariables(newVariables)
+                .build();
+
+        //WHEN
+        responseControllerStatic.saveEditedVariables(surveyUnitInputDto);
+
+        //THEN
+        Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).hasSize(2);
 
         //FORCED document assertions
         Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getLast().getIdCampaign()).isEqualTo(campaignId);