Feat/add new end points to get raw data

CHANGELOG.md

@@ -9,6 +9,11 @@
 - Prevent missing contextual external or previous files from clearing existing contextual data.
 - Endpoint to get data by dates
 
+### Added
+- Endpoint to retrieve raw response by collectionInstrumentId and interrogationId
+- Endpoint to retrieve lunatic JSON data by questionnaireId and interrogationId
+- Endpoint to retrieve raw/lunatic data identifiers by collectionInstrumentId
+
 ### Changed
 - Refactor all tests
 - Begin to handle exceptions

src/main/java/fr/insee/genesis/controller/dto/rawdata/RawDataIdentifierDto.java

@@ -0,0 +1,10 @@
+package fr.insee.genesis.controller.dto.rawdata;
+
+import java.time.LocalDateTime;
+
+public record RawDataIdentifierDto(
+        String interrogationId,
+        String usualSurveyUnitId,
+        LocalDateTime recordDate,
+        LocalDateTime processDate
+) {}

src/main/java/fr/insee/genesis/controller/dto/rawdata/RawDataIdentifiersDto.java

@@ -0,0 +1,8 @@
+package fr.insee.genesis.controller.dto.rawdata;
+
+import java.util.List;
+
+public record RawDataIdentifiersDto(
+        String campaignId,
+        List<RawDataIdentifierDto> interrogations
+) {}

src/main/java/fr/insee/genesis/controller/rest/CombinedRawDataController.java

@@ -1,14 +1,17 @@
 package fr.insee.genesis.controller.rest;
 
 import fr.insee.genesis.controller.dto.rawdata.CombinedRawDataDto;
+import fr.insee.genesis.controller.dto.rawdata.RawDataIdentifiersDto;
 import fr.insee.genesis.domain.service.rawdata.CombinedRawDataService;
+import fr.insee.genesis.exceptions.NoDataException;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 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.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -36,5 +39,14 @@ public ResponseEntity<CombinedRawDataDto> getCombinedRawData(
 
         return ResponseEntity.ok(data);
     }
-
+    @Operation(summary = "Get raw data identifiers by collection instrument ID")
+    @GetMapping("/collection-instruments/{collectionInstrumentId}/ids")
+    @PreAuthorize("hasRole('ADMIN')")
+    public ResponseEntity<RawDataIdentifiersDto> getRawDataIdentifiers(
+            @PathVariable String collectionInstrumentId
+    ) throws NoDataException {
+        return ResponseEntity.ok(
+                combinedRawDataService.getRawDataIdentifiersByCollectionInstrumentId(collectionInstrumentId)
+        );
+    }
     }

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

@@ -9,6 +9,7 @@
 import fr.insee.genesis.domain.ports.api.RawResponseApiPort;
 import fr.insee.genesis.exceptions.GenesisError;
 import fr.insee.genesis.exceptions.GenesisException;
+import fr.insee.genesis.exceptions.NoDataException;
 import fr.insee.genesis.infrastructure.repository.RawResponseInputRepository;
 import fr.insee.modelefiliere.RawResponseDto;
 import io.swagger.v3.oas.annotations.Operation;
@@ -93,6 +94,16 @@ public ResponseEntity<String> saveRawResponsesFromRawResponseDto(
         return ResponseEntity.status(201).body(String.format(SUCCESS_MESSAGE, dto.getInterrogationId()));
     }
 
+    @Operation(summary = "Get a raw response by collection instrument ID and interrogation ID")
+    @GetMapping("/raw-responses/collection-instruments/{collectionInstrumentId}/interrogations/{interrogationId}")
+    @PreAuthorize("hasRole('ADMIN')")
+    public ResponseEntity<RawResponseModel> getRawResponse(
+            @PathVariable String collectionInstrumentId,
+            @PathVariable String interrogationId
+            ) throws NoDataException {
+        return ResponseEntity.ok(rawResponseApiPort.getRawResponseByCollectionInstrumentIdAndInterrogationId(collectionInstrumentId, interrogationId));
+    }
+
     //PROCESS
     @Operation(summary = "Process raw data for a list of interrogations")
     @PostMapping(path = "/raw-responses/process")
@@ -215,6 +226,21 @@ public ResponseEntity<PagedModel<LunaticJsonRawDataModel>> getLunaticJsonRawData
         return ResponseEntity.status(HttpStatus.OK).body(new PagedModel<>(rawResponses));
     }
 
+    @Operation(summary = "Get lunatic json data by questionnaire ID and interrogation ID")
+    @GetMapping("/responses/raw/lunatic-json/collection-instruments/{collectionInstrumentId}/interrogations/{interrogationId}")
+    @PreAuthorize("hasRole('ADMIN')")
+    public ResponseEntity<LunaticJsonRawDataModel> getLunaticJsonData(
+            @PathVariable String questionnaireId,
+            @PathVariable String interrogationId
+            ) throws NoDataException{
+        return ResponseEntity.ok(
+                lunaticJsonRawDataApiPort.getLunaticJsonDataByQuestionnaireIdAndInterrogationId(
+                        questionnaireId,
+                        interrogationId
+                )
+        );
+    }
+
     @Operation(summary = "Check existence of an interrogation")
     @RequestMapping(value = "/responses/raw/lunatic-json/{interrogationId}", method = RequestMethod.HEAD)
     @PreAuthorize("hasRole('ADMIN')")
@@ -266,4 +292,7 @@ public ResponseEntity<Void> exists(@PathVariable String interrogationId) {
         }
         return ResponseEntity.notFound().build();
     }
+
+
+
 }

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

@@ -0,0 +1,13 @@
+package fr.insee.genesis.domain.ports.api;
+
+import fr.insee.genesis.controller.dto.rawdata.CombinedRawDataDto;
+import fr.insee.genesis.controller.dto.rawdata.RawDataIdentifiersDto;
+import fr.insee.genesis.exceptions.NoDataException;
+
+public interface CombinedRawDataApiPort {
+
+    CombinedRawDataDto getCombinedRawDataByInterrogationId(String interrogationId);
+    RawDataIdentifiersDto getRawDataIdentifiersByCollectionInstrumentId(
+            String collectionInstrumentId
+    ) throws NoDataException;
+}

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

@@ -8,6 +8,7 @@
 import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
 import fr.insee.genesis.exceptions.GenesisError;
 import fr.insee.genesis.exceptions.GenesisException;
+import fr.insee.genesis.exceptions.NoDataException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -22,7 +23,7 @@ public interface LunaticJsonRawDataApiPort {
     void save(LunaticJsonRawDataModel rawData) throws GenesisException;
     List<LunaticJsonRawDataModel> getRawDataByQuestionnaireId(String questionnaireId, Mode mode, List<String> interrogationIdList);
     List<SurveyUnitModel> convertRawData(List<LunaticJsonRawDataModel> rawData, VariablesMap variablesMap);
-
+    LunaticJsonRawDataModel getLunaticJsonDataByQuestionnaireIdAndInterrogationId(String questionnaireId, String interrogationId) throws NoDataException;
     List<LunaticJsonRawDataUnprocessedDto> getUnprocessedDataIds();
     Set<String> getUnprocessedDataQuestionnaireIds();
     void updateProcessDates(List<SurveyUnitModel> surveyUnitModels);

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

@@ -7,6 +7,7 @@
 import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
 import fr.insee.genesis.exceptions.GenesisError;
 import fr.insee.genesis.exceptions.GenesisException;
+import fr.insee.genesis.exceptions.NoDataException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -18,6 +19,7 @@ public interface RawResponseApiPort {
 
     List<RawResponseModel> getRawResponses(String collectionInstrumentId, Mode mode, List<String> interrogationIdList);
     List<RawResponseModel> getRawResponsesByInterrogationID(String interrogationId);
+    RawResponseModel getRawResponseByCollectionInstrumentIdAndInterrogationId(String collectionInstrumentId, String interrogationId) throws NoDataException;
     DataProcessResult processRawResponsesByInterrogationIds(String collectionInstrumentId, List<String> interrogationIdList, List<GenesisError> errors) throws GenesisException;
     DataProcessResult processRawResponsesByInterrogationIds(String collectionInstrumentId) throws GenesisException;
 

src/main/java/fr/insee/genesis/domain/ports/spi/LunaticJsonRawDataPersistencePort.java

@@ -1,5 +1,6 @@
 package fr.insee.genesis.domain.ports.spi;
 
+import fr.insee.genesis.controller.dto.rawdata.RawDataIdentifiersDto;
 import fr.insee.genesis.domain.model.surveyunit.GroupedInterrogation;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
@@ -16,9 +17,15 @@ public interface LunaticJsonRawDataPersistencePort {
     void save(LunaticJsonRawDataModel rawData);
     List<LunaticJsonRawDataModel> findRawDataByQuestionnaireId(String questionnaireId, Mode mode, List<String> interrogationIdList);
     Page<LunaticJsonRawDataModel> findRawDataByQuestionnaireId(String questionnaireId, Pageable pageable);
+
+    RawDataIdentifiersDto findLunaticJsonRawDataIdentifiersByQuestionnaireId(
+            String questionnaireId
+    );
+
     List<LunaticJsonRawDataModel> findRawDataByInterrogationId(String interrogationId);
     List<LunaticJsonRawDataModel> getAllUnprocessedData();
     void updateProcessDates(String campaignId, Set<String> interrogationIds);
+    LunaticJsonRawDataModel findLunaticJsonDataByQuestionnaireIdAndInterrogationId(String questionnaireId, String interrogationId);
 
     Set<String> findDistinctQuestionnaireIds();
     Set<String> findDistinctQuestionnaireIdsByNullProcessDate();

src/main/java/fr/insee/genesis/domain/ports/spi/RawResponsePersistencePort.java

@@ -1,5 +1,6 @@
 package fr.insee.genesis.domain.ports.spi;
 
+import fr.insee.genesis.controller.dto.rawdata.RawDataIdentifiersDto;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
 import fr.insee.modelefiliere.ModeDto;
@@ -14,6 +15,12 @@ public interface RawResponsePersistencePort {
 
     List<RawResponseModel> findRawResponses(String collectionInstrumentId, Mode mode, List<String> interrogationIdList);
     List<RawResponseModel> findRawResponsesByInterrogationID(String interrogationId);
+    RawResponseModel findRawResponseByCollectionInstrumentIdAndInterrogationId(String collectionInstrumentId, String interrogationId);
+
+    RawDataIdentifiersDto findRawResponseIdentifiersByCollectionInstrumentId(
+            String collectionInstrumentId
+    );
+
     void updateProcessDates(String collectionInstrumentId, Set<String> interrogationIds);
     List<String> getUnprocessedCollectionIds();
     Set<String> findUnprocessedInterrogationIdsByCollectionInstrumentId(String collectionInstrumentId);

src/main/java/fr/insee/genesis/domain/service/context/DataProcessingContextService.java

@@ -302,7 +302,6 @@ public long countContexts() {
         return dataProcessingContextPersistancePort.count();
     }
 
-    //TODO get context by collectionInstrumentId
     @Override
     public DataProcessingContextModel getContext(String interrogationId) throws GenesisException {
         List<SurveyUnitModel> surveyUnitModels = surveyUnitPersistencePort.findByInterrogationId(interrogationId);
@@ -326,7 +325,6 @@ public DataProcessingContextModel getContext(String interrogationId) throws Gene
         }
 
         return dataProcessingContextPersistancePort.findByCollectionInstrumentId(collectionInstrumentIds.stream().toList().getFirst());
-        //TODO if multiple contexts, priorize withReview false
     }
 
     @Override

src/main/java/fr/insee/genesis/domain/service/rawdata/CombinedRawDataService.java

@@ -1,10 +1,13 @@
 package fr.insee.genesis.domain.service.rawdata;
 
 import fr.insee.genesis.controller.dto.rawdata.CombinedRawDataDto;
+import fr.insee.genesis.controller.dto.rawdata.RawDataIdentifiersDto;
 import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
 import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
+import fr.insee.genesis.domain.ports.api.CombinedRawDataApiPort;
 import fr.insee.genesis.domain.ports.spi.LunaticJsonRawDataPersistencePort;
 import fr.insee.genesis.domain.ports.spi.RawResponsePersistencePort;
+import fr.insee.genesis.exceptions.NoDataException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -15,8 +18,7 @@
 @Service
 @Slf4j
 @RequiredArgsConstructor
-//TODO create API port interface
-public class CombinedRawDataService {
+public class CombinedRawDataService implements CombinedRawDataApiPort {
 
     @Qualifier("lunaticJsonMongoAdapter")
     private final LunaticJsonRawDataPersistencePort lunaticJsonRawDataPersistencePort;
@@ -37,5 +39,31 @@ public CombinedRawDataDto getCombinedRawDataByInterrogationId(String interrogati
         );
     }
 
+    public RawDataIdentifiersDto getRawDataIdentifiersByCollectionInstrumentId(
+            String collectionInstrumentId
+    ) throws NoDataException {
+
+        RawDataIdentifiersDto rawResult =
+                rawResponsePersistencePort.findRawResponseIdentifiersByCollectionInstrumentId(
+                        collectionInstrumentId
+                );
+
+        if (rawResult != null) {
+            return rawResult;
+        }
+
+        RawDataIdentifiersDto lunaticResult =
+                lunaticJsonRawDataPersistencePort.findLunaticJsonRawDataIdentifiersByQuestionnaireId(
+                        collectionInstrumentId
+                );
+
+        if (lunaticResult != null) {
+            return lunaticResult;
+        }
+
+        throw new NoDataException(
+                "No raw data found for collectionInstrumentId=%s".formatted(collectionInstrumentId)
+        );
+    }
 
 }

src/main/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataService.java

@@ -27,6 +27,7 @@
 import fr.insee.genesis.domain.utils.JsonUtils;
 import fr.insee.genesis.exceptions.GenesisError;
 import fr.insee.genesis.exceptions.GenesisException;
+import fr.insee.genesis.exceptions.NoDataException;
 import fr.insee.genesis.infrastructure.utils.FileUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -577,6 +578,19 @@ public Page<LunaticJsonRawDataModel> findRawDataByQuestionnaireId(String questio
         return lunaticJsonRawDataPersistencePort.findRawDataByQuestionnaireId(questionnaireId, pageable);
     }
 
+    @Override
+    public LunaticJsonRawDataModel getLunaticJsonDataByQuestionnaireIdAndInterrogationId(String questionnaireId, String interrogationId) throws NoDataException {
+
+        LunaticJsonRawDataModel lunaticJsonRawDataModel = lunaticJsonRawDataPersistencePort.findLunaticJsonDataByQuestionnaireIdAndInterrogationId(questionnaireId, interrogationId);
+        if(lunaticJsonRawDataModel == null){
+            throw new NoDataException(
+                    "No lunatic JSON data found for questionnaireId=%s and interrogationId=%s"
+                            .formatted(questionnaireId, interrogationId)
+            );      
+        }
+        return lunaticJsonRawDataModel;
+    }
+
     @Override
     public boolean existsByInterrogationId(String interrogationId) {
         return lunaticJsonRawDataPersistencePort.existsByInterrogationId(interrogationId);

src/main/java/fr/insee/genesis/domain/service/rawdata/RawResponseService.java

@@ -23,6 +23,7 @@
 import fr.insee.genesis.domain.utils.JsonUtils;
 import fr.insee.genesis.exceptions.GenesisError;
 import fr.insee.genesis.exceptions.GenesisException;
+import fr.insee.genesis.exceptions.NoDataException;
 import fr.insee.genesis.infrastructure.utils.FileUtils;
 import fr.insee.modelefiliere.ModeDto;
 import fr.insee.modelefiliere.RawResponseDto;
@@ -81,6 +82,27 @@ public List<RawResponseModel> getRawResponsesByInterrogationID(String interrogat
         return rawResponsePersistencePort.findRawResponsesByInterrogationID(interrogationId);
     }
 
+    @Override
+    public RawResponseModel getRawResponseByCollectionInstrumentIdAndInterrogationId(
+            String collectionInstrumentId,
+            String interrogationId
+    ) throws NoDataException {
+        RawResponseModel rawResponse = rawResponsePersistencePort
+                .findRawResponseByCollectionInstrumentIdAndInterrogationId(
+                        collectionInstrumentId,
+                        interrogationId
+                );
+
+        if (rawResponse == null) {
+            throw new NoDataException(
+                    "No raw response found for collectionInstrumentId=%s and interrogationId=%s"
+                            .formatted(collectionInstrumentId, interrogationId)
+            );
+        }
+
+        return rawResponse;
+    }
+
     @Override
     public DataProcessResult processRawResponsesByInterrogationIds(String collectionInstrumentId, List<String> interrogationIdList, List<GenesisError> errors) throws GenesisException {
         int dataCount=0;