feat: Move method in service

Author: alicela

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

@@ -11,8 +11,8 @@
 import fr.insee.genesis.controller.dto.SurveyUnitInputDto;
 import fr.insee.genesis.controller.dto.SurveyUnitQualityToolDto;
 import fr.insee.genesis.controller.dto.SurveyUnitSimplified;
-import fr.insee.genesis.controller.services.MetadataService;
 import fr.insee.genesis.controller.rest.CommonApiResponse;
+import fr.insee.genesis.controller.services.MetadataService;
 import fr.insee.genesis.controller.sources.xml.LunaticXmlCampaign;
 import fr.insee.genesis.controller.sources.xml.LunaticXmlDataParser;
 import fr.insee.genesis.controller.sources.xml.LunaticXmlDataSequentialParser;
@@ -57,7 +57,6 @@
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Stream;
@@ -79,7 +78,6 @@ public class ResponseController implements CommonApiResponse {
     private final AuthUtils authUtils;
     private final MetadataService metadataService;
 
-
     public ResponseController(SurveyUnitApiPort surveyUnitService,
                               SurveyUnitQualityService surveyUnitQualityService,
                               FileUtils fileUtils,
@@ -107,7 +105,7 @@ public ResponseEntity<Object> saveResponsesFromXmlFile(@RequestParam("pathLunati
         VariablesMap variablesMap;
         if(withDDI) {
             //Parse DDI
-            log.info(String.format("Try to read DDI file : %s", metadataFilePath));
+            log.info("Try to read DDI file : {}", metadataFilePath);
             try {
                 variablesMap =
                         DDIReader.getMetadataFromDDI(Path.of(metadataFilePath).toFile().toURI().toURL().toString(),
@@ -117,12 +115,12 @@ public ResponseEntity<Object> saveResponsesFromXmlFile(@RequestParam("pathLunati
             }
         }else{
             //Parse Lunatic
-            log.info(String.format("Try to read lunatic file : %s", metadataFilePath));
+            log.info("Try to read lunatic file : {}", metadataFilePath);
 
             variablesMap = LunaticReader.getMetadataFromLunatic(new FileInputStream(metadataFilePath)).getVariables();
         }
 
-        log.info(String.format("Try to read Xml file : %s", xmlFile));
+        log.info("Try to read Xml file : {}", xmlFile);
         Path filepath = Paths.get(xmlFile);
 
         if (getFileSizeInMB(filepath) <= Constants.MAX_FILE_SIZE_UNTIL_SEQUENTIAL) {
@@ -331,7 +329,7 @@ public ResponseEntity<Object> saveEditedVariables(
         //Try to look for DDI first, if no DDI found looks for lunatic components
         List<GenesisError> errors = new ArrayList<>();
         //We need to retrieve campaignId
-        HashSet<String> campaignIds = findCampaignId(surveyUnitInputDto);
+        Set<String> campaignIds = surveyUnitService.findCampaignIdsFrom(surveyUnitInputDto);
         if (campaignIds.size() != 1){
             return ResponseEntity.status(500).body("Impossible to assign one campaignId to that response");
         }
@@ -384,14 +382,7 @@ public ResponseEntity<Object> saveEditedVariables(
         return ResponseEntity.ok(SUCCESS_MESSAGE);
     }
 
-    private HashSet<String> findCampaignId(SurveyUnitInputDto surveyUnitInputDto) {
-        List<SurveyUnitModel> responses = surveyUnitService.findByIdsInterrogationAndQuestionnaire(surveyUnitInputDto.getInterrogationId(), surveyUnitInputDto.getQuestionnaireId());
-        HashSet<String> campaignIds = new HashSet<>();
-        for(SurveyUnitModel response : responses){
-            campaignIds.add(response.getCampaignId());
-        }
-        return campaignIds;
-    }
+
 
     //Utilities
     /**

src/main/java/fr/insee/genesis/domain/ports/api/SurveyUnitApiPort.java

@@ -2,12 +2,12 @@
 
 import fr.insee.bpm.metadata.model.VariablesMap;
 import fr.insee.genesis.controller.dto.CampaignWithQuestionnaire;
+import fr.insee.genesis.controller.dto.InterrogationId;
+import fr.insee.genesis.controller.dto.QuestionnaireWithCampaign;
 import fr.insee.genesis.controller.dto.SurveyUnitDto;
 import fr.insee.genesis.controller.dto.SurveyUnitInputDto;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.controller.dto.QuestionnaireWithCampaign;
 import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
-import fr.insee.genesis.controller.dto.InterrogationId;
 import fr.insee.genesis.exceptions.GenesisException;
 
 import java.util.List;
@@ -57,4 +57,6 @@ List<SurveyUnitModel> parseEditedVariables(SurveyUnitInputDto surveyUnitInputDto
                                          VariablesMap variablesMap) throws GenesisException;
 
     String findQuestionnaireIdByInterrogationId(String interrogationId) throws GenesisException;
+
+    Set<String> findCampaignIdsFrom(SurveyUnitInputDto dto);
 }

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

@@ -10,9 +10,9 @@
 import fr.insee.genesis.controller.dto.VariableInputDto;
 import fr.insee.genesis.controller.dto.VariableStateDto;
 import fr.insee.genesis.domain.model.surveyunit.DataState;
-import fr.insee.genesis.domain.model.surveyunit.VarIdScopeTuple;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
+import fr.insee.genesis.domain.model.surveyunit.VarIdScopeTuple;
 import fr.insee.genesis.domain.model.surveyunit.VariableModel;
 import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
 import fr.insee.genesis.domain.ports.spi.SurveyUnitPersistencePort;
@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Service
@@ -315,6 +316,17 @@ public String findQuestionnaireIdByInterrogationId(String interrogationId) throw
         return questionnaireIds.iterator().next(); //Return first (and supposed only) element of set
     }
 
+    @Override
+    public Set<String> findCampaignIdsFrom(SurveyUnitInputDto dto) {
+        List<SurveyUnitModel> responses = findByIdsInterrogationAndQuestionnaire(
+                dto.getInterrogationId(),
+                dto.getQuestionnaireId()
+        );
+        return responses.stream()
+                .map(SurveyUnitModel::getCampaignId)
+                .collect(Collectors.toSet());
+    }
+
     //Utils
     private static List<Mode> getDistinctsModes(List<SurveyUnitModel> surveyUnitModels) {
         List<Mode> sources = new ArrayList<>();