get RawResponseData + LunaticJsonRawData by InterrogationId

Hajarel-moukh · Hajarel-moukh · commit f89d1261c977 · 2025-12-22T17:36:04.000+01:00
diff --git a/src/main/java/fr/insee/genesis/controller/rest/CombinedRawDataController.java b/src/main/java/fr/insee/genesis/controller/rest/CombinedRawDataController.java
@@ -0,0 +1,41 @@
+package fr.insee.genesis.controller.rest;
+
+import fr.insee.genesis.domain.model.surveyunit.rawdata.CombinedRawData;
+import fr.insee.genesis.domain.service.rawdata.CombinedRawDataService;
+import fr.insee.genesis.exceptions.GenesisException;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Slf4j
+@Controller
+@RequestMapping(path = "/combined-raw-data" )
+public class CombinedRawDataController {
+
+    private static final String INTERROGATION_ID = "interrogationId";
+    private final CombinedRawDataService combinedRawDataService;
+
+    public CombinedRawDataController(CombinedRawDataService combinedRawDataService) {
+        this.combinedRawDataService = combinedRawDataService;
+    }
+
+    @Operation(summary = "Retrieve combined raw responses and Lunatic raw data for a given interrogationId")
+    @GetMapping
+    @PreAuthorize("hasAnyRole('ADMIN', 'USER_PLATINE')")
+    public ResponseEntity<CombinedRawData> getCombinetRawData(
+            @RequestParam(INTERROGATION_ID) String interrogationId
+    ){CombinedRawData data = combinedRawDataService.getCombinedRawDataByInterrogationId(interrogationId);
+
+        if (data.rawResponses().isEmpty()) {
+            return ResponseEntity.notFound().build();
+        }
+
+        return ResponseEntity.ok(data);
+    }
+
+    }
diff --git a/src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/CombinedRawData.java b/src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/CombinedRawData.java
@@ -0,0 +1,7 @@
+package fr.insee.genesis.domain.model.surveyunit.rawdata;
+
+import java.util.List;
+
+public record CombinedRawData(List<RawResponse> rawResponses,
+                             List<LunaticJsonRawDataModel> lunaticRawData) {
+}
diff --git a/src/main/java/fr/insee/genesis/domain/ports/api/LunaticJsonRawDataApiPort.java b/src/main/java/fr/insee/genesis/domain/ports/api/LunaticJsonRawDataApiPort.java
@@ -28,6 +28,8 @@ public interface LunaticJsonRawDataApiPort {
     long countResponsesByQuestionnaireId(String campaignId);
     Page<LunaticJsonRawDataModel> findRawDataByCampaignIdAndDate(String campaignId, Instant  startDt, Instant endDt, Pageable pageable);
 
+    List<LunaticJsonRawDataModel> getRawDataByInterrogationId(String interrogationId);
+
     @Deprecated(since = "1.13.0")
     DataProcessResult processRawData(String campaignName, List<String> interrogationIdList, List<GenesisError> errors) throws GenesisException;
 
diff --git a/src/main/java/fr/insee/genesis/domain/ports/api/RawResponseApiPort.java b/src/main/java/fr/insee/genesis/domain/ports/api/RawResponseApiPort.java
@@ -13,6 +13,7 @@
 public interface RawResponseApiPort {
 
     List<RawResponse> getRawResponses(String collectionInstrumentId, Mode mode, List<String> interrogationIdList);
+    List<RawResponse> getRawResponsesByInterrogationID(String interrogationId);
     DataProcessResult processRawResponses(String collectionInstrumentId, List<String> interrogationIdList, List<GenesisError> errors) throws GenesisException;
     DataProcessResult processRawResponses(String collectionInstrumentId) throws GenesisException;
     List<SurveyUnitModel> convertRawResponse(List<RawResponse> rawResponses, VariablesMap variablesMap);
diff --git a/src/main/java/fr/insee/genesis/domain/ports/spi/LunaticJsonRawDataPersistencePort.java b/src/main/java/fr/insee/genesis/domain/ports/spi/LunaticJsonRawDataPersistencePort.java
@@ -15,6 +15,7 @@ public interface LunaticJsonRawDataPersistencePort {
 
     void save(LunaticJsonRawDataModel rawData);
     List<LunaticJsonRawDataModel> findRawData(String campaignName, Mode mode, List<String> interrogationIdList);
+    List<LunaticJsonRawDataModel> findRawDataByInterrogationID(String interrogationId);
     List<LunaticJsonRawDataModel> getAllUnprocessedData();
     void updateProcessDates(String campaignId, Set<String> interrogationIds);
     Set<String> findDistinctQuestionnaireIds();
diff --git a/src/main/java/fr/insee/genesis/domain/ports/spi/RawResponsePersistencePort.java b/src/main/java/fr/insee/genesis/domain/ports/spi/RawResponsePersistencePort.java
@@ -9,6 +9,7 @@
 public interface RawResponsePersistencePort {
 
     List<RawResponse> findRawResponses(String collectionInstrumentId, Mode mode, List<String> interrogationIdList);
+    List<RawResponse> findRawResponsesByInterrogationID(String interrogationId);
     void updateProcessDates(String collectionInstrumentId, Set<String> interrogationIds);
     List<String> getUnprocessedCollectionIds();
     Set<String> findUnprocessedInterrogationIdsByCollectionInstrumentId(String collectionInstrumentId);
diff --git a/src/main/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataService.java b/src/main/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataService.java
@@ -58,7 +58,7 @@ public MetadataModel loadAndSaveIfNotExists(String campaignName, String collecti
         MetadataModel metadataModel =
                 readMetadatas(campaignName, mode.getModeName(), fileUtils, errors);
 
-        saveMetadata(questionnaireId.toUpperCase(), mode, metadataModel);
+        saveMetadata(collectionInstrumentId.toUpperCase(), mode, metadataModel);
 
         return metadataModel;
     }
diff --git a/src/main/java/fr/insee/genesis/domain/service/rawdata/CombinedRawDataService.java b/src/main/java/fr/insee/genesis/domain/service/rawdata/CombinedRawDataService.java
@@ -0,0 +1,35 @@
+package fr.insee.genesis.domain.service.rawdata;
+
+import fr.insee.genesis.domain.model.surveyunit.rawdata.CombinedRawData;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponse;
+import fr.insee.genesis.domain.ports.spi.LunaticJsonRawDataPersistencePort;
+import fr.insee.genesis.domain.ports.spi.RawResponsePersistencePort;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class CombinedRawDataService {
+
+    @Qualifier("lunaticJsonMongoAdapterNew")
+    private final LunaticJsonRawDataPersistencePort lunaticJsonRawDataPersistencePort;
+    @Qualifier("rawResponseMongoAdapter")
+    private final RawResponsePersistencePort rawResponsePersistencePort;
+
+    public CombinedRawDataService(LunaticJsonRawDataPersistencePort lunaticJsonRawDataPersistencePort, RawResponsePersistencePort rawResponsePersistencePort) {
+        this.lunaticJsonRawDataPersistencePort = lunaticJsonRawDataPersistencePort;
+        this.rawResponsePersistencePort = rawResponsePersistencePort;
+    }
+
+    public CombinedRawData getCombinedRawDataByInterrogationId(String interrogationId) {
+        List<RawResponse> rawResponses = rawResponsePersistencePort.findRawResponsesByInterrogationID(interrogationId);
+        List<LunaticJsonRawDataModel> lunaticRawData = lunaticJsonRawDataPersistencePort.findRawDataByInterrogationID(interrogationId);
+
+        return new CombinedRawData(rawResponses, lunaticRawData);
+    }
+
+}
diff --git a/src/main/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataService.java b/src/main/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataService.java
@@ -99,6 +99,11 @@ public List<LunaticJsonRawDataModel> getRawData(String campaignName, Mode mode,
         return lunaticJsonRawDataPersistencePort.findRawData(campaignName, mode, interrogationIdList);
     }
 
+    @Override
+    public List<LunaticJsonRawDataModel> getRawDataByInterrogationId(String interrogationId) {
+        return lunaticJsonRawDataPersistencePort.findRawDataByInterrogationID(interrogationId);
+    }
+
     @Override
     @Deprecated(since = "1.13.0")
     public DataProcessResult processRawData(String campaignName, List<String> interrogationIdList, List<GenesisError> errors) throws GenesisException {
diff --git a/src/main/java/fr/insee/genesis/domain/service/rawdata/RawResponseService.java b/src/main/java/fr/insee/genesis/domain/service/rawdata/RawResponseService.java
@@ -71,6 +71,11 @@ public List<RawResponse> getRawResponses(String collectionInstrumentId, Mode mod
         return rawResponsePersistencePort.findRawResponses(collectionInstrumentId,mode,interrogationIdList);
     }
 
+    @Override
+    public List<RawResponse> getRawResponsesByInterrogationID(String interrogationId) {
+        return rawResponsePersistencePort.findRawResponsesByInterrogationID(interrogationId);
+    }
+
     @Override
     public DataProcessResult processRawResponses(String collectionInstrumentId, List<String> interrogationIdList, List<GenesisError> errors) throws GenesisException {
         int dataCount=0;
diff --git a/src/main/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonRawDataMongoAdapter.java b/src/main/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonRawDataMongoAdapter.java
@@ -6,7 +6,6 @@
 import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
 import fr.insee.genesis.domain.ports.spi.LunaticJsonRawDataPersistencePort;
 import fr.insee.genesis.infrastructure.document.rawdata.LunaticJsonRawDataDocument;
-import fr.insee.genesis.infrastructure.document.surveyunit.GroupedInterrogationDocument;
 import fr.insee.genesis.infrastructure.mappers.GroupedInterrogationDocumentMapper;
 import fr.insee.genesis.infrastructure.mappers.LunaticJsonRawDataDocumentMapper;
 import fr.insee.genesis.infrastructure.repository.LunaticJsonMongoDBRepository;
@@ -55,6 +54,11 @@ public List<LunaticJsonRawDataModel> findRawData(String campaignName, Mode mode,
         List<LunaticJsonRawDataDocument> rawDataDocs = repository.findModesByCampaignIdAndByModeAndinterrogationIdIninterrogationIdList(campaignName, mode, interrogationIdList);return LunaticJsonRawDataDocumentMapper.INSTANCE.listDocumentToListModel(rawDataDocs);
     }
 
+    @Override
+    public List<LunaticJsonRawDataModel> findRawDataByInterrogationID(String interrogationId) {
+        return repository.findByInterrogationId(interrogationId);
+    }
+
     @Override
     public void updateProcessDates(String campaignId, Set<String> interrogationIds) {
         mongoTemplate.updateMulti(
diff --git a/src/main/java/fr/insee/genesis/infrastructure/adapter/RawResponseMongoAdapter.java b/src/main/java/fr/insee/genesis/infrastructure/adapter/RawResponseMongoAdapter.java
@@ -39,6 +39,12 @@ public List<RawResponse> findRawResponses(String collectionInstrumentId, Mode mo
         return RawResponseDocumentMapper.INSTANCE.listDocumentToListModel(rawDataDocs);
     }
 
+    @Override
+    public List<RawResponse> findRawResponsesByInterrogationID(String interrogationId) {
+        List<RawResponseDocument> rawResponseDocumentList = repository.findByInterrogationId(interrogationId);
+        return RawResponseDocumentMapper.INSTANCE.listDocumentToListModel(rawResponseDocumentList);
+    }
+
     @Override
     public void updateProcessDates(String collectionInstrumentId, Set<String> interrogationIds) {
         mongoTemplate.updateMulti(
diff --git a/src/main/java/fr/insee/genesis/infrastructure/repository/LunaticJsonMongoDBRepository.java b/src/main/java/fr/insee/genesis/infrastructure/repository/LunaticJsonMongoDBRepository.java
@@ -1,6 +1,7 @@
 package fr.insee.genesis.infrastructure.repository;
 
 import fr.insee.genesis.domain.model.surveyunit.Mode;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
 import fr.insee.genesis.infrastructure.document.rawdata.LunaticJsonRawDataDocument;
 import fr.insee.genesis.infrastructure.document.surveyunit.GroupedInterrogationDocument;
 import org.springframework.data.mongodb.repository.Aggregation;
@@ -26,6 +27,9 @@ public interface LunaticJsonMongoDBRepository extends MongoRepository<LunaticJso
     @Query(value = "{ 'campaignId' : ?0, 'mode' : ?1, 'interrogationId': {$in: ?2} }")
     List<LunaticJsonRawDataDocument> findModesByCampaignIdAndByModeAndinterrogationIdIninterrogationIdList(String campaignName, Mode mode, List<String> interrogationIdList);
 
+    @Query(value = "{ 'interrogationId': ?0}")
+    List<LunaticJsonRawDataModel> findByInterrogationId(String interrogationId);
+
     Page<LunaticJsonRawDataDocument> findByCampaignIdAndRecordDateBetween(String campagneId, Instant start, Instant  end, Pageable pageable);
     long countByQuestionnaireId(String questionnaireId);
     @Aggregation(pipeline = {
diff --git a/src/main/java/fr/insee/genesis/infrastructure/repository/RawResponseRepository.java b/src/main/java/fr/insee/genesis/infrastructure/repository/RawResponseRepository.java
@@ -26,4 +26,6 @@ public interface RawResponseRepository extends MongoRepository<RawResponseDocume
     })
     List<String> findInterrogationIdByCollectionInstrumentIdAndProcessDateIsNull(String collectionInstrumentId);
 
+    @Query(value = "{ 'interrogationId': ?0}")
+    List<RawResponseDocument> findByInterrogationId(String interrogationId);
 }
diff --git a/src/test/java/cucumber/functional_tests/RawDataDefinitions.java b/src/test/java/cucumber/functional_tests/RawDataDefinitions.java
@@ -110,6 +110,11 @@ public List<RawResponse> getRawResponses(String questionnaireModelId, Mode mode,
             return List.of();
         }
 
+        @Override
+        public List<RawResponse> getRawResponsesByInterrogationID(String interrogationId) {
+            return List.of();
+        }
+
         @Override
         public DataProcessResult processRawResponses(String questionnaireId, List<String> interrogationIdList, List<GenesisError> errors) throws GenesisException {
             return null;
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerTest.java
@@ -83,6 +83,11 @@ public List<RawResponse> getRawResponses(String questionnaireModelId, Mode mode,
             return List.of();
         }
 
+        @Override
+        public List<RawResponse> getRawResponsesByInterrogationID(String interrogationId) {
+            return List.of();
+        }
+
         @Override
         public DataProcessResult processRawResponses(String questionnaireId, List<String> interrogationIdList, List<GenesisError> errors) throws GenesisException {
             return null;
diff --git a/src/test/java/fr/insee/genesis/domain/service/rawdata/CombinedRawDataServiceTest.java b/src/test/java/fr/insee/genesis/domain/service/rawdata/CombinedRawDataServiceTest.java
@@ -0,0 +1,100 @@
+package fr.insee.genesis.domain.service.rawdata;
+
+import fr.insee.genesis.domain.model.surveyunit.Mode;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.CombinedRawData;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponse;
+import fr.insee.genesis.domain.ports.spi.LunaticJsonRawDataPersistencePort;
+import fr.insee.genesis.domain.ports.spi.RawResponsePersistencePort;
+import org.assertj.core.api.Assertions;
+import org.bson.types.ObjectId;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+@ExtendWith(MockitoExtension.class)
+class CombinedRawDataServiceTest {
+
+    @Mock
+    LunaticJsonRawDataPersistencePort lunaticJsonRawDataPersistencePort;
+
+    @Mock
+    RawResponsePersistencePort rawResponsePersistencePort;
+
+    @InjectMocks
+    CombinedRawDataService combinedRawDataService;
+
+    @Test
+    void getCombinedRawDataByInterrogationId_shouldReturnCombinedData() {
+        // GIVEN
+        String interrogationId = "INTERROGATION_1";
+
+        // Mock des RawResponses
+        RawResponse response1 = new RawResponse(
+                new ObjectId(),
+                interrogationId,
+                "COLLECTION_1",
+                Mode.WEB,
+                Map.of("question1", "answer1"),
+                LocalDateTime.now(),
+                null
+        );
+
+        RawResponse response2 = new RawResponse(
+                new ObjectId(),
+                interrogationId,
+                "COLLECTION_1",
+                Mode.WEB,
+                Map.of("question2", "answer2"),
+                LocalDateTime.now(),
+                null
+        );
+
+        List<RawResponse> rawResponses = List.of(response1, response2);
+
+        // Mock des LunaticJsonRawData
+        LunaticJsonRawDataModel lunatic1 = LunaticJsonRawDataModel.builder()
+                .campaignId("CAMPAIGN")
+                .questionnaireId("QUESTIONNAIRE")
+                .interrogationId(interrogationId)
+                .data(Map.of("key", "value"))
+                .mode(Mode.WEB)
+                .build();
+        List<LunaticJsonRawDataModel> lunaticRawData = List.of(lunatic1);
+
+        // WHEN
+        Mockito.when(rawResponsePersistencePort.findRawResponsesByInterrogationID(interrogationId))
+                .thenReturn(rawResponses);
+
+        Mockito.when(lunaticJsonRawDataPersistencePort.findRawDataByInterrogationID(interrogationId))
+                .thenReturn(lunaticRawData);
+
+        CombinedRawData result = combinedRawDataService.getCombinedRawDataByInterrogationId(interrogationId);
+
+        // THEN - assertions
+        Assertions.assertThat(result.rawResponses()).hasSize(2).containsExactlyInAnyOrderElementsOf(rawResponses);
+        Assertions.assertThat(result.lunaticRawData()).hasSize(1).containsExactlyInAnyOrderElementsOf(lunaticRawData);
+    }
+
+    @Test
+    void getCombinedRawData_shouldHandleEmptyLists() {
+        String interrogationId = "INTERROGATION_EMPTY";
+
+        Mockito.when(rawResponsePersistencePort.findRawResponsesByInterrogationID(interrogationId))
+                .thenReturn(List.of());
+        Mockito.when(lunaticJsonRawDataPersistencePort.findRawDataByInterrogationID(interrogationId))
+                .thenReturn(List.of());
+        CombinedRawData result = combinedRawDataService.getCombinedRawDataByInterrogationId(interrogationId);
+
+        Assertions.assertThat(result.rawResponses()).isEmpty();
+        Assertions.assertThat(result.lunaticRawData()).isEmpty();
+    }
+
+}
diff --git a/src/test/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataServiceTest.java b/src/test/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataServiceTest.java
@@ -379,6 +379,47 @@ void convertRawData_if_external_not_present_test() throws Exception {
         Assertions.assertThat(suModels.getFirst().getExternalVariables()).isEmpty();
     }
 
+
+    @Test
+    void getRawDataByInterrogationId_shouldReturnOnlyMatchingData() {
+        // GIVEN
+        lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
+
+        String InterrogationId = "INTERROGATION_1";
+        String secondInterrogationId = "INTERROGATION_2";
+
+        LunaticJsonRawDataModel rawData1 = LunaticJsonRawDataModel.builder()
+                .campaignId("CAMPAIGN")
+                .questionnaireId("QUESTIONNAIRE")
+                .interrogationId(InterrogationId)
+                .data(Map.of("key", "value1"))
+                .mode(Mode.WEB)
+                .build();
+
+        LunaticJsonRawDataModel rawData2 = LunaticJsonRawDataModel.builder()
+                .campaignId("CAMPAIGN")
+                .questionnaireId("QUESTIONNAIRE")
+                .interrogationId(secondInterrogationId)
+                .data(Map.of("key", "value2"))
+                .mode(Mode.WEB)
+                .build();
+
+        lunaticJsonRawDataService.save(rawData1);
+        lunaticJsonRawDataService.save(rawData2);
+
+        // WHEN
+        List<LunaticJsonRawDataModel> result =
+                lunaticJsonRawDataService.getRawDataByInterrogationId(InterrogationId);
+
+        // THEN
+        Assertions.assertThat(result)
+                .hasSize(1)
+                .allMatch(data -> InterrogationId.equals(data.interrogationId()));
+
+        Assertions.assertThat(result.getFirst().data())
+                .containsEntry("key", "value1");
+    }
+
     @Test
     void convertRawData_should_not_throw_exception_if_collected_not_present() throws Exception {
         //GIVEN
diff --git a/src/test/java/fr/insee/genesis/stubs/LunaticJsonMongoDBRepositoryStub.java b/src/test/java/fr/insee/genesis/stubs/LunaticJsonMongoDBRepositoryStub.java
diff --git a/src/test/java/fr/insee/genesis/stubs/LunaticJsonRawDataPersistanceStub.java b/src/test/java/fr/insee/genesis/stubs/LunaticJsonRawDataPersistanceStub.java

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public MetadataModel loadAndSaveIfNotExists(String campaignName, String collecti`
`58`	`58`	`MetadataModel metadataModel =`
`59`	`59`	`readMetadatas(campaignName, mode.getModeName(), fileUtils, errors);`
`60`	`60`
`61`		`- saveMetadata(questionnaireId.toUpperCase(), mode, metadataModel);`
	`61`	`+ saveMetadata(collectionInstrumentId.toUpperCase(), mode, metadataModel);`
`62`	`62`
`63`	`63`	`return metadataModel;`
`64`	`64`	`}`