diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml
index 71193153..adda5a0d 100644
--- a/.github/workflows/create-release.yaml
+++ b/.github/workflows/create-release.yaml
@@ -69,6 +69,9 @@ jobs:
distribution: 'temurin'
java-version: '21'
+ - name: install model filiere
+ run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.1.0.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.1.0 -Dpackaging=jar -DgeneratePom=true
+
- name: Clone BPM
uses: actions/checkout@v6
with:
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 92fd0f93..0b3a6722 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -26,6 +26,9 @@ jobs:
distribution: "temurin"
java-version: "21"
+ - name: install model filiere
+ run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.1.0.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.1.0 -Dpackaging=jar -DgeneratePom=true
+
- name: Clone BPM
uses: actions/checkout@master
with:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index aaa5a334..a9c97360 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -29,6 +29,9 @@ jobs:
distribution: 'temurin'
cache: maven
+ - name: install model filiere
+ run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.1.0.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.1.0 -Dpackaging=jar -DgeneratePom=true
+
- name: Clone BPM
uses: actions/checkout@master
with:
diff --git a/.github/workflows/scheduled-version-update.yaml b/.github/workflows/scheduled-version-update.yaml
index 941fe43a..fee02594 100644
--- a/.github/workflows/scheduled-version-update.yaml
+++ b/.github/workflows/scheduled-version-update.yaml
@@ -85,6 +85,9 @@ jobs:
fi
echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
+ - name: install model filiere
+ run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.1.0.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.1.0 -Dpackaging=jar -DgeneratePom=true
+
- name: Clone BPM
uses: actions/checkout@master
with:
diff --git a/.runtests/Unit tests GENESIS.run.xml b/.runtests/Unit tests GENESIS.run.xml
new file mode 100644
index 00000000..9836f071
--- /dev/null
+++ b/.runtests/Unit tests GENESIS.run.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25a29a73..cb7f4a32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,8 @@
# Changelog
+## 2.0.0 [TODO]
+### Changed
+- Use filière model
+
## 1.13.0 [2025-12-04]
### Changed
- New raw data process endpoint
diff --git a/libs/modelefiliere-2.1.0.jar b/libs/modelefiliere-2.1.0.jar
new file mode 100644
index 00000000..cadda87e
Binary files /dev/null and b/libs/modelefiliere-2.1.0.jar differ
diff --git a/pom.xml b/pom.xml
index a7ac3cbd..5af4d45d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
1.22.0
1.2.3
2.19.0
- 1.0.21
+ 1.0.23
@@ -101,7 +101,7 @@
fr.insee
modelefiliere
- 2.0.0
+ 2.1.0
com.networknt
diff --git a/src/main/java/fr/insee/genesis/controller/dto/rawdata/CombinedRawDataDto.java b/src/main/java/fr/insee/genesis/controller/dto/rawdata/CombinedRawDataDto.java
new file mode 100644
index 00000000..d9a334ac
--- /dev/null
+++ b/src/main/java/fr/insee/genesis/controller/dto/rawdata/CombinedRawDataDto.java
@@ -0,0 +1,13 @@
+package fr.insee.genesis.controller.dto.rawdata;
+
+import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
+
+import java.util.List;
+
+public record CombinedRawDataDto(
+ List rawResponseModels,
+ List lunaticRawDataModels
+) {
+}
+
diff --git a/src/main/java/fr/insee/genesis/controller/rest/CombinedRawDataController.java b/src/main/java/fr/insee/genesis/controller/rest/CombinedRawDataController.java
new file mode 100644
index 00000000..a35397ab
--- /dev/null
+++ b/src/main/java/fr/insee/genesis/controller/rest/CombinedRawDataController.java
@@ -0,0 +1,40 @@
+package fr.insee.genesis.controller.rest;
+
+import fr.insee.genesis.controller.dto.rawdata.CombinedRawDataDto;
+import fr.insee.genesis.domain.service.rawdata.CombinedRawDataService;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Slf4j
+@Controller
+@RequestMapping(path = "/combined-raw-data" )
+@RequiredArgsConstructor
+public class CombinedRawDataController {
+
+ private static final String INTERROGATION_ID = "interrogationId";
+ private final CombinedRawDataService combinedRawDataService;
+
+
+ @Operation(summary = "Retrieve combined raw responses and Lunatic raw data for a given interrogationId")
+ @GetMapping
+ @PreAuthorize("hasAnyRole('ADMIN', 'USER_PLATINE')")
+ public ResponseEntity getCombinetRawData(
+ @RequestParam(INTERROGATION_ID) String interrogationId
+ ){
+ CombinedRawDataDto data = combinedRawDataService.getCombinedRawDataByInterrogationId(interrogationId);
+
+ if (data.rawResponseModels().isEmpty()) {
+ return ResponseEntity.notFound().build();
+ }
+
+ return ResponseEntity.ok(data);
+ }
+
+ }
diff --git a/src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseController.java b/src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseController.java
index b51aeb0e..846cd5aa 100644
--- a/src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseController.java
+++ b/src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseController.java
@@ -12,6 +12,7 @@
import fr.insee.genesis.domain.model.surveyunit.Mode;
import fr.insee.genesis.domain.model.surveyunit.rawdata.DataProcessResult;
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.LunaticJsonRawDataApiPort;
import fr.insee.genesis.domain.ports.api.RawResponseApiPort;
import fr.insee.genesis.exceptions.GenesisError;
@@ -46,6 +47,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
@Slf4j
@Controller
@@ -201,6 +203,14 @@ public ResponseEntity> getUnprocessedJson
return ResponseEntity.ok(lunaticJsonRawDataApiPort.getUnprocessedDataIds());
}
+ @Operation(summary = "Get campaign id and interrogationId from all unprocessed raw json data")
+ @GetMapping(path = "/responses/raw/lunatic-json/get/unprocessed/questionnaireIds")
+ @PreAuthorize("hasRole('SCHEDULER')")
+ public ResponseEntity> getUnprocessedJsonRawDataQuestionnairesIds() {
+ log.info("Try to get unprocessed raw JSON datas questionniares...");
+ return ResponseEntity.ok(lunaticJsonRawDataApiPort.getUnprocessedDataQuestionnaireIds());
+ }
+
@Hidden
@GetMapping(path = "/responses/raw/lunatic-json/get/by-interrogation-mode-and-campaign")
@PreAuthorize("hasRole('ADMIN')")
@@ -237,15 +247,15 @@ public ResponseEntity processJsonRawData(
}
}
- @Operation(summary = "Process raw data of a questionnaire")
- @PostMapping(path = "/responses/raw/lunatic-json/{collectionInstrumentId}/process")
+ @Operation(summary = "Process raw data of a questionnaire (old raw model)")
+ @PostMapping(path = "/responses/raw/lunatic-json/{questionnaireId}/process")
@PreAuthorize("hasRole('SCHEDULER')")
public ResponseEntity processJsonRawData(
- @PathVariable String collectionInstrumentId
+ @PathVariable String questionnaireId
) {
- log.info("Try to process raw JSON datas for questionnaire {}",collectionInstrumentId);
+ log.info("Try to process raw JSON datas for questionnaire {}",questionnaireId);
try {
- DataProcessResult result = lunaticJsonRawDataApiPort.processRawData(collectionInstrumentId);
+ DataProcessResult result = lunaticJsonRawDataApiPort.processRawData(questionnaireId);
return result.formattedDataCount() == 0 ?
ResponseEntity.ok("%d document(s) processed".formatted(result.dataCount()))
: ResponseEntity.ok("%d document(s) processed, including %d FORMATTED after data verification"
@@ -270,7 +280,7 @@ public ResponseEntity>> getProcessedDataIdsSinceHours(
@Operation(summary = "Get lunatic JSON data from one campaign in Genesis Database, filtered by start and end dates")
@GetMapping(path = "/responses/raw/lunatic-json/{campaignId}")
@PreAuthorize("hasRole('USER_BATCH_GENERIC')")
- public ResponseEntity> getRawResponsesFromJsonBody(
+ public ResponseEntity> getLunaticJsonRawDataModelFromJsonBody(
@PathVariable String campaignId,
@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Instant startDate,
@RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Instant endDate,
@@ -284,5 +294,20 @@ public ResponseEntity> getRawResponsesFromJs
return ResponseEntity.status(HttpStatus.OK).body(new PagedModel<>(rawResponses));
}
-
+ @Operation(summary = "Get rawResponse JSON data from one campaign in Genesis Database, filtered by start and end dates")
+ @GetMapping(path = "/raw-responses/{campaignId}")
+ @PreAuthorize("hasRole('USER_BATCH_GENERIC')")
+ public ResponseEntity> getRawResponsesFromJsonBody(
+ @PathVariable String campaignId,
+ @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Instant startDate,
+ @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Instant endDate,
+ @RequestParam(value = "page", defaultValue = "0") int page,
+ @RequestParam(value = "size", defaultValue = "1000") int size
+ ) {
+ log.info("Try to read raw JSONs for campaign {}, with startDate={} and endDate={} - page={} - size={}", campaignId, startDate, endDate,page,size);
+ Pageable pageable = PageRequest.of(page, size);
+ Page rawResponses = rawResponseApiPort.findRawResponseDataByCampaignIdAndDate(campaignId, startDate, endDate, pageable);
+ log.info("rawResponses={}", rawResponses.getContent().size());
+ return ResponseEntity.status(HttpStatus.OK).body(new PagedModel<>(rawResponses));
+ }
}
diff --git a/src/main/java/fr/insee/genesis/controller/rest/responses/ResponseController.java b/src/main/java/fr/insee/genesis/controller/rest/responses/ResponseController.java
index f8d575ba..3d3c6f10 100644
--- a/src/main/java/fr/insee/genesis/controller/rest/responses/ResponseController.java
+++ b/src/main/java/fr/insee/genesis/controller/rest/responses/ResponseController.java
@@ -53,7 +53,11 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLStreamException;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.MalformedURLException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -296,6 +300,7 @@ public ResponseEntity getLatestByInterrogationOneObject(@R
"For a given id, the endpoint returns a document by collection mode (if there is more than one).")
@PostMapping(path = "/simplified/by-list-interrogation-and-collection-instrument/latest")
@PreAuthorize("hasRole('USER_KRAFTWERK')")
+ //TODO move logic and unit test to surveyUnitService (also extract some methods instead of multiple lambdas)
public ResponseEntity> getLatestForInterrogationListAndCollectionInstrument(
@RequestParam("collectionInstrumentId") String collectionInstrumentId,
@RequestBody List interrogationIds)
@@ -307,16 +312,20 @@ public ResponseEntity> getLatestForInterrogationListA
modes.forEach(mode -> {
List outputVariables = new ArrayList<>();
List outputExternalVariables = new ArrayList<>();
+ List usualSurveyUnitIds = new ArrayList<>();
responses.stream().filter(rep -> rep.getMode().equals(mode)).forEach(response -> {
outputVariables.addAll(response.getCollectedVariables());
outputExternalVariables.addAll(response.getExternalVariables());
+ if(response.getUsualSurveyUnitId() != null){
+ usualSurveyUnitIds.add(response.getUsualSurveyUnitId());
+ }
});
if (!outputVariables.isEmpty() || !outputExternalVariables.isEmpty()) {
results.add(SurveyUnitSimplified.builder()
.collectionInstrumentId(responses.getFirst().getCollectionInstrumentId())
.campaignId(responses.getFirst().getCampaignId())
- .interrogationId(responses.getFirst().getInterrogationId())
- .usualSurveyUnitId(responses.getFirst().getUsualSurveyUnitId())
+ .interrogationId(interrogationId.getInterrogationId())
+ .usualSurveyUnitId(!usualSurveyUnitIds.isEmpty() ? usualSurveyUnitIds.getFirst() : null)
.mode(mode)
.variablesUpdate(outputVariables)
.externalVariables(outputExternalVariables)
diff --git a/src/main/java/fr/insee/genesis/domain/model/surveyunit/SurveyUnitModel.java b/src/main/java/fr/insee/genesis/domain/model/surveyunit/SurveyUnitModel.java
index 212adb42..050c39cc 100644
--- a/src/main/java/fr/insee/genesis/domain/model/surveyunit/SurveyUnitModel.java
+++ b/src/main/java/fr/insee/genesis/domain/model/surveyunit/SurveyUnitModel.java
@@ -1,6 +1,7 @@
package fr.insee.genesis.domain.model.surveyunit;
import com.fasterxml.jackson.annotation.JsonFormat;
+import fr.insee.modelefiliere.RawResponseDto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -38,6 +39,7 @@ public class SurveyUnitModel {
private DataState state;
private Mode mode;
private Boolean isCapturedIndirectly;
+ private RawResponseDto.QuestionnaireStateEnum questionnaireState;
private LocalDateTime validationDate;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'hh:mm")
private LocalDateTime recordDate;
diff --git a/src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/RawResponse.java b/src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/RawResponseModel.java
similarity index 88%
rename from src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/RawResponse.java
rename to src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/RawResponseModel.java
index 7f50b76c..f92606af 100644
--- a/src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/RawResponse.java
+++ b/src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/RawResponseModel.java
@@ -1,12 +1,13 @@
package fr.insee.genesis.domain.model.surveyunit.rawdata;
import fr.insee.genesis.domain.model.surveyunit.Mode;
+import lombok.Builder;
import org.bson.types.ObjectId;
import java.time.LocalDateTime;
import java.util.Map;
-public record RawResponse(
+public record RawResponseModel(
ObjectId id,
String interrogationId,
String collectionInstrumentId,
diff --git a/src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/combinedRawDataModel.java b/src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/combinedRawDataModel.java
new file mode 100644
index 00000000..c66040a0
--- /dev/null
+++ b/src/main/java/fr/insee/genesis/domain/model/surveyunit/rawdata/combinedRawDataModel.java
@@ -0,0 +1,7 @@
+package fr.insee.genesis.domain.model.surveyunit.rawdata;
+
+import java.util.List;
+
+public record combinedRawDataModel(List rawResponseModels,
+ List lunaticRawDataModels) {
+}
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
index e8bad50c..ba3e28a8 100644
--- a/src/main/java/fr/insee/genesis/domain/ports/api/LunaticJsonRawDataApiPort.java
+++ b/src/main/java/fr/insee/genesis/domain/ports/api/LunaticJsonRawDataApiPort.java
@@ -23,11 +23,14 @@ public interface LunaticJsonRawDataApiPort {
List getRawData(String campaignName, Mode mode, List interrogationIdList);
List convertRawData(List rawData, VariablesMap variablesMap);
List getUnprocessedDataIds();
+ Set getUnprocessedDataQuestionnaireIds();
void updateProcessDates(List surveyUnitModels);
Set findDistinctQuestionnaireIds();
long countResponsesByQuestionnaireId(String campaignId);
Page findRawDataByCampaignIdAndDate(String campaignId, Instant startDt, Instant endDt, Pageable pageable);
+ List getRawDataByInterrogationId(String interrogationId);
+
@Deprecated(since = "1.13.0")
DataProcessResult processRawData(String campaignName, List interrogationIdList, List 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
index d17a1141..2b13bd31 100644
--- a/src/main/java/fr/insee/genesis/domain/ports/api/RawResponseApiPort.java
+++ b/src/main/java/fr/insee/genesis/domain/ports/api/RawResponseApiPort.java
@@ -4,19 +4,23 @@
import fr.insee.genesis.domain.model.surveyunit.Mode;
import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
import fr.insee.genesis.domain.model.surveyunit.rawdata.DataProcessResult;
-import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponse;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
import fr.insee.genesis.exceptions.GenesisError;
import fr.insee.genesis.exceptions.GenesisException;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import java.time.Instant;
import java.util.List;
public interface RawResponseApiPort {
- List getRawResponses(String collectionInstrumentId, Mode mode, List interrogationIdList);
+ List getRawResponses(String collectionInstrumentId, Mode mode, List interrogationIdList);
+ List getRawResponsesByInterrogationID(String interrogationId);
DataProcessResult processRawResponses(String collectionInstrumentId, List interrogationIdList, List errors) throws GenesisException;
DataProcessResult processRawResponses(String collectionInstrumentId) throws GenesisException;
- List convertRawResponse(List rawResponses, VariablesMap variablesMap);
+ List convertRawResponse(List rawResponses, VariablesMap variablesMap);
List getUnprocessedCollectionInstrumentIds();
void updateProcessDates(List surveyUnitModels);
-
+ Page findRawResponseDataByCampaignIdAndDate(String campaignId, Instant startDate, Instant endDate, Pageable pageable);
}
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
index 399fefde..bbbf2951 100644
--- a/src/main/java/fr/insee/genesis/domain/ports/spi/LunaticJsonRawDataPersistencePort.java
+++ b/src/main/java/fr/insee/genesis/domain/ports/spi/LunaticJsonRawDataPersistencePort.java
@@ -6,8 +6,8 @@
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import java.time.LocalDateTime;
import java.time.Instant;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Set;
@@ -15,9 +15,12 @@ public interface LunaticJsonRawDataPersistencePort {
void save(LunaticJsonRawDataModel rawData);
List findRawData(String campaignName, Mode mode, List interrogationIdList);
+ List findRawDataByInterrogationID(String interrogationId);
List getAllUnprocessedData();
void updateProcessDates(String campaignId, Set interrogationIds);
Set findDistinctQuestionnaireIds();
+ Set findDistinctQuestionnaireIdsByNullProcessDate();
+ Set findModesByQuestionnaire(String questionnaireId);
Page findByCampaignIdAndDate(String campaignId, Instant startDt, Instant endDt, Pageable pageable);
long countResponsesByQuestionnaireId(String questionnaireId);
List findProcessedIdsGroupedByQuestionnaireSince(LocalDateTime since);
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
index 640bd9b3..14b30043 100644
--- a/src/main/java/fr/insee/genesis/domain/ports/spi/RawResponsePersistencePort.java
+++ b/src/main/java/fr/insee/genesis/domain/ports/spi/RawResponsePersistencePort.java
@@ -1,15 +1,21 @@
package fr.insee.genesis.domain.ports.spi;
import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponse;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import java.time.Instant;
import java.util.List;
import java.util.Set;
public interface RawResponsePersistencePort {
- List findRawResponses(String collectionInstrumentId, Mode mode, List interrogationIdList);
+ List findRawResponses(String collectionInstrumentId, Mode mode, List interrogationIdList);
+ List findRawResponsesByInterrogationID(String interrogationId);
void updateProcessDates(String collectionInstrumentId, Set interrogationIds);
List getUnprocessedCollectionIds();
Set findUnprocessedInterrogationIdsByCollectionInstrumentId(String collectionInstrumentId);
- }
+ List findModesByCollectionInstrument(String collectionInstrumentId);
+ Page findByCampaignIdAndDate(String campaignId, Instant startDate, Instant endDate, Pageable pageable);
+}
diff --git a/src/main/java/fr/insee/genesis/domain/service/contextualvariable/ContextualVariableJsonService.java b/src/main/java/fr/insee/genesis/domain/service/contextualvariable/ContextualVariableJsonService.java
index 987a0d5d..7084f101 100644
--- a/src/main/java/fr/insee/genesis/domain/service/contextualvariable/ContextualVariableJsonService.java
+++ b/src/main/java/fr/insee/genesis/domain/service/contextualvariable/ContextualVariableJsonService.java
@@ -79,9 +79,7 @@ public int saveContextualVariableFiles(String collectionInstrumentId, FileUtils
int fileCount = 0;
for (Mode mode : Mode.values()) {
- try (Stream filePaths = Files.list(Path.of(fileUtils.getDataFolder(collectionInstrumentId,
- mode.getFolder()
- , null)))) {
+ try (Stream filePaths = Files.list(Path.of(contextualFolderPath))) {
Iterator it = filePaths
.filter(path -> path.toString().endsWith(".json"))
.iterator();
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
index 0b1ee957..2e254a87 100644
--- a/src/main/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataService.java
+++ b/src/main/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataService.java
@@ -50,17 +50,13 @@ public MetadataModel loadAndSaveIfNotExists(String campaignName, String collecti
List questionnaireMetadataModels =
questionnaireMetadataPersistencePort.find(collectionInstrumentId.toUpperCase(), mode);
if(questionnaireMetadataModels.isEmpty() || questionnaireMetadataModels.getFirst().metadataModel() == null){
- MetadataModel metadataModel = readMetadatas(campaignName, mode.getModeName(), fileUtils, errors);
+ MetadataModel metadataModel = readMetadatas(collectionInstrumentId, mode.getModeName(), fileUtils, errors);
saveMetadata(collectionInstrumentId.toUpperCase(), mode, metadataModel);
return metadataModel;
}
- MetadataModel metadataModel =
- readMetadatas(campaignName, mode.getModeName(), fileUtils, errors);
-
- saveMetadata(questionnaireId.toUpperCase(), mode, metadataModel);
-
- return metadataModel;
+
+ return questionnaireMetadataModels.getFirst().metadataModel();
}
private void saveMetadata(String collectionInstrumentId, Mode mode, MetadataModel metadataModel) {
@@ -87,11 +83,12 @@ private MetadataModel readMetadatas(String campaignName, String modeName, FileUt
List errors) throws GenesisException{
Path ddiFilePath;
+ Path lunaticFilePath;
MetadataModel metadataModel = null;
try {
ddiFilePath = fileUtils.findFile(String.format("%s/%s", fileUtils.getSpecFolder(campaignName), modeName), DDI_FILE_PATTERN);
- metadataModel = parseMetadata(ddiFilePath.toString(), true);
-
+ lunaticFilePath = fileUtils.findFile(String.format("%s/%s", fileUtils.getSpecFolder(campaignName), modeName), LUNATIC_FILE_PATTERN);
+ metadataModel = parseMetadata(lunaticFilePath, ddiFilePath);
} catch (RuntimeException e) {
//DDI file not found and already log - Go to next step
} catch (IOException e) {
@@ -100,8 +97,8 @@ private MetadataModel readMetadatas(String campaignName, String modeName, FileUt
if(metadataModel == null ){
log.warn("DDI not found or error occurred. Trying Lunatic metadata...for {}, {} mode", campaignName, modeName);
try {
- Path lunaticFilePath = fileUtils.findFile(String.format("%s/%s", fileUtils.getSpecFolder(campaignName), modeName), LUNATIC_FILE_PATTERN);
- return parseMetadata(lunaticFilePath.toString(), false);
+ lunaticFilePath = fileUtils.findFile(String.format("%s/%s", fileUtils.getSpecFolder(campaignName), modeName), LUNATIC_FILE_PATTERN);
+ return parseMetadata(lunaticFilePath, null);
} catch (Exception ex) {
log.error("Error reading Lunatic metadata file", ex);
errors.add(new GenesisError(ex.toString()));
@@ -116,20 +113,24 @@ private MetadataModel readMetadatas(String campaignName, String modeName, FileUt
}
/**
- * Parse metadata file, either DDI or Lunatic, depending on the withDDI flag.
+ * Parse metadata file
*
- * @param metadataFilePath path to the metadata file
- * @param withDDI true for DDI parsing, false for Lunatic parsing
+ * @param lunaticFilePath path to the DDI metadata file
+ * @param ddiFilePath path to the DDI metadata file, will parse only lunatic if null
* @return VariablesMap or null if an error occurs
*/
- private MetadataModel parseMetadata(String metadataFilePath, boolean withDDI) {
+ private MetadataModel parseMetadata(Path lunaticFilePath, Path ddiFilePath) {
try {
- log.info("Try to read {} file: {}", withDDI ? "DDI" : "Lunatic", metadataFilePath);
- if (withDDI) {
- InputStream metadataInputStream = new FileInputStream(metadataFilePath);
+ log.info("Try to read {} file: {}", ddiFilePath != null ? "DDI" : "Lunatic", ddiFilePath);
+
+ if (ddiFilePath != null) {
+ InputStream metadataInputStream = new FileInputStream(ddiFilePath.toFile());
+ InputStream lunaticInputStream = new FileInputStream(lunaticFilePath.toFile());
MetadataModel metadataModel = ReaderUtils.getMetadataFromDDIAndLunatic(
- Path.of(metadataFilePath).toFile().toURI().toURL().toString(),
- metadataInputStream,metadataInputStream);
+ ddiFilePath.toFile().toURI().toURL().toString(),
+ metadataInputStream,
+ lunaticInputStream
+ );
// Temporary solution
// the logic of adding variables from lunatic to the ones present in the DDI needs to be implemented in BPM
// (only in Kraftwerk for the moment)
@@ -137,11 +138,8 @@ private MetadataModel parseMetadata(String metadataFilePath, boolean withDDI) {
metadataModel.getVariables().putVariable(new Variable(enoVar, metadataModel.getRootGroup(), VariableType.STRING));
}
return metadataModel;
-
- } else {
- return LunaticReader.getMetadataFromLunatic(
- new FileInputStream(metadataFilePath));
}
+ return LunaticReader.getMetadataFromLunatic(new FileInputStream(lunaticFilePath.toFile()));
} catch (MetadataParserException | IOException e) {
log.error("Error reading metadata file", e);
return null;
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
new file mode 100644
index 00000000..a6f4e28a
--- /dev/null
+++ b/src/main/java/fr/insee/genesis/domain/service/rawdata/CombinedRawDataService.java
@@ -0,0 +1,40 @@
+package fr.insee.genesis.domain.service.rawdata;
+
+import fr.insee.genesis.controller.dto.rawdata.CombinedRawDataDto;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
+import fr.insee.genesis.domain.ports.spi.LunaticJsonRawDataPersistencePort;
+import fr.insee.genesis.domain.ports.spi.RawResponsePersistencePort;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class CombinedRawDataService {
+
+ @Qualifier("lunaticJsonMongoAdapter")
+ private final LunaticJsonRawDataPersistencePort lunaticJsonRawDataPersistencePort;
+ @Qualifier("rawResponseMongoAdapter")
+ private final RawResponsePersistencePort rawResponsePersistencePort;
+
+ public CombinedRawDataDto getCombinedRawDataByInterrogationId(String interrogationId) {
+
+ List rawResponseModels =
+ rawResponsePersistencePort.findRawResponsesByInterrogationID(interrogationId);
+
+ List lunaticRawDataModels =
+ lunaticJsonRawDataPersistencePort.findRawDataByInterrogationID(interrogationId);
+
+ return new CombinedRawDataDto(
+ rawResponseModels,
+ lunaticRawDataModels
+ );
+ }
+
+
+}
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
index efb17ff4..abb3df06 100644
--- a/src/main/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataService.java
+++ b/src/main/java/fr/insee/genesis/domain/service/rawdata/LunaticJsonRawDataService.java
@@ -1,5 +1,6 @@
package fr.insee.genesis.domain.service.rawdata;
+import fr.insee.bpm.metadata.model.MetadataModel;
import fr.insee.bpm.metadata.model.VariablesMap;
import fr.insee.genesis.Constants;
import fr.insee.genesis.configuration.Config;
@@ -99,6 +100,11 @@ public List getRawData(String campaignName, Mode mode,
return lunaticJsonRawDataPersistencePort.findRawData(campaignName, mode, interrogationIdList);
}
+ @Override
+ public List getRawDataByInterrogationId(String interrogationId) {
+ return lunaticJsonRawDataPersistencePort.findRawDataByInterrogationID(interrogationId);
+ }
+
@Override
@Deprecated(since = "1.13.0")
public DataProcessResult processRawData(String campaignName, List interrogationIdList, List errors) throws GenesisException {
@@ -353,6 +359,48 @@ public List getUnprocessedDataIds() {
return dtos;
}
+ @Override
+ public Set getUnprocessedDataQuestionnaireIds() {
+ Set unprocessedQuestionnaireIds = lunaticJsonRawDataPersistencePort.findDistinctQuestionnaireIdsByNullProcessDate();
+ Set unprocessedQuestionnaireIdsWithSpecs = new HashSet<>();
+ for (String unprocessedQuestionnaireId : unprocessedQuestionnaireIds){
+ Set modes = lunaticJsonRawDataPersistencePort.findModesByQuestionnaire(unprocessedQuestionnaireId);
+ if (modes.isEmpty()){
+ continue;
+ }
+
+ boolean areAllSpecsOK = true;
+ for(Mode mode : modes){
+ if(!isSpecsPresentForQuestionnaireAndMode(unprocessedQuestionnaireId, mode)){
+ areAllSpecsOK = false;
+ }
+ }
+ if(areAllSpecsOK){
+ unprocessedQuestionnaireIdsWithSpecs.add(unprocessedQuestionnaireId);
+ }
+ }
+
+ return unprocessedQuestionnaireIdsWithSpecs;
+ }
+
+ private boolean isSpecsPresentForQuestionnaireAndMode(String unprocessedQuestionnaireId, Mode mode) {
+ List genesisErrors = new ArrayList<>();
+ MetadataModel metadataModel;
+ try {
+ metadataModel = metadataService.loadAndSaveIfNotExists(
+ unprocessedQuestionnaireId,
+ unprocessedQuestionnaireId,
+ mode,
+ fileUtils,
+ genesisErrors
+ );
+ } catch (GenesisException ge) {
+ log.warn("Genesis exception thrown for questionnaire %s and mode %s, excluding from get questionnaire ids...".formatted(unprocessedQuestionnaireId, mode));
+ return false;
+ }
+ return metadataModel != null && genesisErrors.isEmpty();
+ }
+
@SuppressWarnings("unchecked")
private static void convertRawDataExternalVariables(
LunaticJsonRawDataModel srcRawData,
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
index 6f343237..17911b1f 100644
--- a/src/main/java/fr/insee/genesis/domain/service/rawdata/RawResponseService.java
+++ b/src/main/java/fr/insee/genesis/domain/service/rawdata/RawResponseService.java
@@ -1,5 +1,6 @@
package fr.insee.genesis.domain.service.rawdata;
+import fr.insee.bpm.metadata.model.MetadataModel;
import fr.insee.bpm.metadata.model.VariablesMap;
import fr.insee.genesis.Constants;
import fr.insee.genesis.configuration.Config;
@@ -10,7 +11,7 @@
import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
import fr.insee.genesis.domain.model.surveyunit.VariableModel;
import fr.insee.genesis.domain.model.surveyunit.rawdata.DataProcessResult;
-import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponse;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
import fr.insee.genesis.domain.ports.api.RawResponseApiPort;
import fr.insee.genesis.domain.ports.spi.RawResponsePersistencePort;
import fr.insee.genesis.domain.ports.spi.SurveyUnitQualityToolPort;
@@ -23,13 +24,18 @@
import fr.insee.genesis.exceptions.GenesisError;
import fr.insee.genesis.exceptions.GenesisException;
import fr.insee.genesis.infrastructure.utils.FileUtils;
+import fr.insee.modelefiliere.RawResponseDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import java.io.IOException;
+import java.time.Instant;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -40,7 +46,7 @@
@Service
@Slf4j
-public class RawResponseService implements RawResponseApiPort {
+public class RawResponseService implements RawResponseApiPort {
private final ControllerUtils controllerUtils;
private final QuestionnaireMetadataService metadataService;
@@ -67,10 +73,15 @@ public RawResponseService(ControllerUtils controllerUtils, QuestionnaireMetadata
}
@Override
- public List getRawResponses(String collectionInstrumentId, Mode mode, List interrogationIdList) {
+ public List getRawResponses(String collectionInstrumentId, Mode mode, List interrogationIdList) {
return rawResponsePersistencePort.findRawResponses(collectionInstrumentId,mode,interrogationIdList);
}
+ @Override
+ public List getRawResponsesByInterrogationID(String interrogationId) {
+ return rawResponsePersistencePort.findRawResponsesByInterrogationID(interrogationId);
+ }
+
@Override
public DataProcessResult processRawResponses(String collectionInstrumentId, List interrogationIdList, List errors) throws GenesisException {
int dataCount=0;
@@ -89,10 +100,10 @@ public DataProcessResult processRawResponses(String collectionInstrumentId, List
int maxIndex = Math.min(interrogationIdListForMode.size(), config.getRawDataProcessingBatchSize());
List interrogationIdToProcess = interrogationIdListForMode.subList(0, maxIndex);
- List rawResponses = getRawResponses(collectionInstrumentId, mode, interrogationIdToProcess);
+ List rawResponseModels = getRawResponses(collectionInstrumentId, mode, interrogationIdToProcess);
List surveyUnitModels = convertRawResponse(
- rawResponses,
+ rawResponseModels,
variablesMap
);
@@ -182,9 +193,9 @@ public DataProcessResult processRawResponses(String collectionInstrumentId) thro
private List getConvertedSurveyUnits(String collectionInstrumentId, Mode mode, List interrogationIdListForMode, int maxIndex, VariablesMap variablesMap) {
List interrogationIdToProcess = interrogationIdListForMode.subList(0, maxIndex);
- List rawResponses = getRawResponses(collectionInstrumentId, mode, interrogationIdToProcess);
+ List rawResponseModels = getRawResponses(collectionInstrumentId, mode, interrogationIdToProcess);
return convertRawResponse(
- rawResponses,
+ rawResponseModels,
variablesMap
);
}
@@ -202,39 +213,47 @@ private VariablesMap getVariablesMap(String collectionInstrumentId, Mode mode, L
}
@Override
- public List convertRawResponse(List rawResponses, VariablesMap variablesMap) {
+ public List convertRawResponse(List rawResponseModels, VariablesMap variablesMap) {
//Convert to genesis model
List surveyUnitModels = new ArrayList<>();
//For each possible data state (we receive COLLECTED or EDITED)
for(DataState dataState : List.of(DataState.COLLECTED,DataState.EDITED)){
- for (RawResponse rawResponse : rawResponses) {
+ for (RawResponseModel rawResponseModel : rawResponseModels) {
//Get optional fields
- Boolean isCapturedIndirectly = getIsCapturedIndirectly(rawResponse);
- LocalDateTime validationDate = getValidationDate(rawResponse);
- String usualSurveyUnitId = getStringFieldInPayload(rawResponse,"usualSurveyUnitId");
- String majorModelVersion = getStringFieldInPayload(rawResponse, "majorModelVersion");
+ Boolean isCapturedIndirectly = getIsCapturedIndirectly(rawResponseModel);
+ String questionnaireStateString = getStringFieldInPayload(rawResponseModel, "questionnaireState");
+ RawResponseDto.QuestionnaireStateEnum questionnaireStateEnum = null;
+ try{
+ questionnaireStateEnum = RawResponseDto.QuestionnaireStateEnum.valueOf(questionnaireStateString);
+ } catch (IllegalArgumentException iae){
+ log.warn("'{}' is not a valid questionnaire state according to filiere model", questionnaireStateString);
+ }
+ LocalDateTime validationDate = getValidationDate(rawResponseModel);
+ String usualSurveyUnitId = getStringFieldInPayload(rawResponseModel,"usualSurveyUnitId");
+ String majorModelVersion = getStringFieldInPayload(rawResponseModel, "majorModelVersion");
SurveyUnitModel surveyUnitModel = SurveyUnitModel.builder()
- .collectionInstrumentId(rawResponse.collectionInstrumentId())
+ .collectionInstrumentId(rawResponseModel.collectionInstrumentId())
.majorModelVersion(majorModelVersion)
- .mode(rawResponse.mode())
- .interrogationId(rawResponse.interrogationId())
+ .mode(rawResponseModel.mode())
+ .interrogationId(rawResponseModel.interrogationId())
.usualSurveyUnitId(usualSurveyUnitId)
+ .questionnaireState(questionnaireStateEnum)
.validationDate(validationDate)
.isCapturedIndirectly(isCapturedIndirectly)
.state(dataState)
- .fileDate(rawResponse.recordDate())
+ .fileDate(rawResponseModel.recordDate())
.recordDate(LocalDateTime.now())
.collectedVariables(new ArrayList<>())
.externalVariables(new ArrayList<>())
.build();
//Data collected variables conversion
- convertRawDataCollectedVariables(rawResponse, surveyUnitModel, dataState, variablesMap);
+ convertRawDataCollectedVariables(rawResponseModel, surveyUnitModel, dataState, variablesMap);
//External variables conversion into COLLECTED document
if(dataState == DataState.COLLECTED){
- convertRawDataExternalVariables(rawResponse, surveyUnitModel, variablesMap);
+ convertRawDataExternalVariables(rawResponseModel, surveyUnitModel, variablesMap);
}
boolean hasNoVariable = surveyUnitModel.getCollectedVariables().isEmpty()
@@ -242,7 +261,7 @@ public List convertRawResponse(List rawResponses,
if(hasNoVariable){
if(surveyUnitModel.getState() == DataState.COLLECTED){
- log.warn("No collected or external variable for interrogation {}, raw data is ignored.", rawResponse.interrogationId());
+ log.warn("No collected or external variable for interrogation {}, raw data is ignored.", rawResponseModel.interrogationId());
}
continue;// don't add suModel
}
@@ -254,7 +273,45 @@ public List convertRawResponse(List rawResponses,
@Override
public List getUnprocessedCollectionInstrumentIds() {
- return rawResponsePersistencePort.getUnprocessedCollectionIds();
+ List unprocessedCollectionInstrumentIds = rawResponsePersistencePort.getUnprocessedCollectionIds();
+ List unprocessedCollectionInstrumentIdsWithSpecs = new ArrayList<>();
+ for (String unprocessedCollectionInstrumentId : unprocessedCollectionInstrumentIds){
+ Set modes = new HashSet<>(rawResponsePersistencePort.findModesByCollectionInstrument(unprocessedCollectionInstrumentId));
+ if (modes.isEmpty()){
+ continue;
+ }
+
+ boolean areAllSpecsOK = true;
+ for(Mode mode : modes){
+ if(!isSpecsPresentForCollectionInstrumentAndMode(unprocessedCollectionInstrumentId, mode)){
+ areAllSpecsOK = false;
+ }
+ }
+ if(areAllSpecsOK){
+ unprocessedCollectionInstrumentIdsWithSpecs.add(unprocessedCollectionInstrumentId);
+ }
+ }
+
+ return unprocessedCollectionInstrumentIdsWithSpecs;
+ }
+
+ private boolean isSpecsPresentForCollectionInstrumentAndMode(String unprocessedCollectionInstrumentId, Mode mode) {
+ List genesisErrors = new ArrayList<>();
+ MetadataModel metadataModel;
+ try {
+ metadataModel = metadataService.loadAndSaveIfNotExists(
+ unprocessedCollectionInstrumentId,
+ unprocessedCollectionInstrumentId,
+ mode,
+ fileUtils,
+ genesisErrors
+ );
+ } catch (GenesisException ge) {
+ log.warn("Genesis exception thrown for collection instrument %s and mode %s, excluding from get collection instrument ids..."
+ .formatted(unprocessedCollectionInstrumentId, mode));
+ return false;
+ }
+ return metadataModel != null && genesisErrors.isEmpty();
}
@Override
@@ -300,29 +357,29 @@ private void sendProcessedIdsToQualityTool(List surveyUnitModel
}
}
- private static Boolean getIsCapturedIndirectly(RawResponse rawResponse) {
+ private static Boolean getIsCapturedIndirectly(RawResponseModel rawResponseModel) {
try{
- return rawResponse.payload().get("isCapturedIndirectly") == null ? null :
- Boolean.parseBoolean(rawResponse.payload().get("isCapturedIndirectly").toString());
+ return rawResponseModel.payload().get("isCapturedIndirectly") == null ? null :
+ Boolean.parseBoolean(rawResponseModel.payload().get("isCapturedIndirectly").toString());
}catch(Exception e){
log.warn("Exception when parsing isCapturedIndirectly : {}",e.toString());
return Boolean.FALSE;
}
}
- private static LocalDateTime getValidationDate(RawResponse rawResponse) {
+ private static LocalDateTime getValidationDate(RawResponseModel rawResponseModel) {
try{
- return rawResponse.payload().get("validationDate") == null ? null :
- LocalDateTime.parse(rawResponse.payload().get("validationDate").toString());
+ return rawResponseModel.payload().get("validationDate") == null ? null :
+ LocalDateTime.parse(rawResponseModel.payload().get("validationDate").toString(), DateTimeFormatter.ISO_OFFSET_DATE_TIME);
}catch(Exception e){
log.warn("Exception when parsing validation date : {}",e.toString());
return null;
}
}
- private static String getStringFieldInPayload(RawResponse rawResponse, String field) {
+ private static String getStringFieldInPayload(RawResponseModel rawResponseModel, String field) {
try{
- return rawResponse.payload().get(field).toString();
+ return rawResponseModel.payload().get(field).toString();
}catch(Exception e){
log.warn("Exception when parsing {} : {}",field, e.toString());
return null;
@@ -331,12 +388,12 @@ private static String getStringFieldInPayload(RawResponse rawResponse, String fi
@SuppressWarnings("unchecked")
private void convertRawDataCollectedVariables(
- RawResponse rawResponse,
+ RawResponseModel rawResponseModel,
SurveyUnitModel dstSurveyUnitModel,
DataState dataState,
VariablesMap variablesMap
) {
- Map dataMap = rawResponse.payload();
+ Map dataMap = rawResponseModel.payload();
dataMap = (Map) dataMap.get("data");
dataMap = (Map)dataMap.get("COLLECTED");
@@ -345,7 +402,7 @@ private void convertRawDataCollectedVariables(
Map collectedMap = JsonUtils.asMap(dataMap);
if (collectedMap == null || collectedMap.isEmpty()){
if(dataState.equals(DataState.COLLECTED)) {
- log.warn("No collected data for interrogation {}", rawResponse.interrogationId());
+ log.warn("No collected data for interrogation {}", rawResponseModel.interrogationId());
}
return;
}
@@ -415,11 +472,11 @@ private static String getIdLoop(VariablesMap variablesMap, String variableName)
@SuppressWarnings("unchecked")
private static void convertRawDataExternalVariables(
- RawResponse rawResponse,
+ RawResponseModel rawResponseModel,
SurveyUnitModel dstSurveyUnitModel,
VariablesMap variablesMap
) {
- Map dataMap = rawResponse.payload();
+ Map dataMap = rawResponseModel.payload();
dataMap = (Map) dataMap.get("data");
@@ -444,4 +501,9 @@ private static void convertToExternalVar(SurveyUnitModel dstSurveyUnitModel, Var
}
}
}
+
+ @Override
+ public Page findRawResponseDataByCampaignIdAndDate(String campaignId, Instant startDate, Instant endDate, Pageable pageable) {
+ return rawResponsePersistencePort.findByCampaignIdAndDate(campaignId,startDate, endDate,pageable);
+ }
}
diff --git a/src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitQualityService.java b/src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitQualityService.java
index 100eb6c6..9b73551b 100644
--- a/src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitQualityService.java
+++ b/src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitQualityService.java
@@ -25,6 +25,7 @@ public void verifySurveyUnits(List surveyUnitModels, VariablesM
* @return A list of variables that are absent in metadata
*/
public List checkVariablesPresentInMetadata(List variableInputDtos, VariablesMap variablesMap) {
+
List absentVariableNames = new ArrayList<>();
for(VariableInputDto variableInputDto : variableInputDtos){
diff --git a/src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitService.java b/src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitService.java
index 89a082a5..6d6707d6 100644
--- a/src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitService.java
+++ b/src/main/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitService.java
@@ -248,7 +248,7 @@ public SurveyUnitDto findLatestValuesByStateByIdAndByCollectionInstrumentId(
for (SurveyUnitModel surveyUnitModel : suByMode) {
if (variablesMap == null) {
variablesMap = metadataService.loadAndSaveIfNotExists(
- surveyUnitModel.getCampaignId(),
+ surveyUnitModel.getCollectionInstrumentId(),
surveyUnitModel.getCollectionInstrumentId(),
surveyUnitModel.getMode(),
fileUtils,
diff --git a/src/main/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonRawDataMongoAdapter.java b/src/main/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonRawDataMongoAdapter.java
index 78ca2568..a913f526 100644
--- 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;
@@ -50,11 +49,31 @@ public List getAllUnprocessedData() {
return LunaticJsonRawDataDocumentMapper.INSTANCE.listDocumentToListModel(repository.findByNullProcessDate());
}
+ @Override
+ public Set findDistinctQuestionnaireIdsByNullProcessDate(){
+ Set questionnaireIds = new HashSet<>();
+ for(LunaticJsonRawDataDocument lunaticJsonRawDataDocument : repository.findByNullProcessDate()){
+ questionnaireIds.add(lunaticJsonRawDataDocument.questionnaireId());
+ }
+ return questionnaireIds;
+ }
+
+ @Override
+ public Set findModesByQuestionnaire(String questionnaireId) {
+ return new HashSet<>(repository.findModesByQuestionnaireId(questionnaireId));
+ }
+
@Override
public List findRawData(String campaignName, Mode mode, List interrogationIdList) {
List rawDataDocs = repository.findModesByCampaignIdAndByModeAndinterrogationIdIninterrogationIdList(campaignName, mode, interrogationIdList);return LunaticJsonRawDataDocumentMapper.INSTANCE.listDocumentToListModel(rawDataDocs);
}
+ @Override
+ public List findRawDataByInterrogationID(String interrogationId) {
+ List rawDataDocs = repository.findByInterrogationId(interrogationId);
+ return LunaticJsonRawDataDocumentMapper.INSTANCE.listDocumentToListModel(rawDataDocs);
+ }
+
@Override
public void updateProcessDates(String campaignId, Set interrogationIds) {
mongoTemplate.updateMulti(
@@ -67,9 +86,9 @@ public void updateProcessDates(String campaignId, Set interrogationIds)
@Override
public Set findDistinctQuestionnaireIds() {
Set questionnaireIds = new HashSet<>();
- for(String questionnaireId : mongoTemplate.getCollection(Constants.MONGODB_RAW_RESPONSES_COLLECTION_NAME).distinct(
+ for (String questionnaireId : mongoTemplate.getCollection(Constants.MONGODB_RAW_RESPONSES_COLLECTION_NAME).distinct(
"questionnaireId",
- String.class)){
+ String.class)) {
questionnaireIds.add(questionnaireId);
}
return questionnaireIds;
diff --git a/src/main/java/fr/insee/genesis/infrastructure/adapter/RawResponseMongoAdapter.java b/src/main/java/fr/insee/genesis/infrastructure/adapter/RawResponseMongoAdapter.java
index 77f2d29d..f3fb2c6e 100644
--- a/src/main/java/fr/insee/genesis/infrastructure/adapter/RawResponseMongoAdapter.java
+++ b/src/main/java/fr/insee/genesis/infrastructure/adapter/RawResponseMongoAdapter.java
@@ -2,19 +2,23 @@
import fr.insee.genesis.Constants;
import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponse;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
import fr.insee.genesis.domain.ports.spi.RawResponsePersistencePort;
import fr.insee.genesis.infrastructure.document.rawdata.RawResponseDocument;
import fr.insee.genesis.infrastructure.mappers.RawResponseDocumentMapper;
import fr.insee.genesis.infrastructure.repository.RawResponseRepository;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Service;
+import java.time.Instant;
import java.time.LocalDateTime;
import java.util.HashSet;
import java.util.List;
@@ -34,11 +38,17 @@ public RawResponseMongoAdapter(RawResponseRepository repository, MongoTemplate m
}
@Override
- public List findRawResponses(String collectionInstrumentId, Mode mode, List interrogationIdList) {
+ public List findRawResponses(String collectionInstrumentId, Mode mode, List interrogationIdList) {
List rawDataDocs = repository.findByCollectionInstrumentIdAndModeAndInterrogationIdList(collectionInstrumentId, mode.getJsonName(), interrogationIdList);
return RawResponseDocumentMapper.INSTANCE.listDocumentToListModel(rawDataDocs);
}
+ @Override
+ public List findRawResponsesByInterrogationID(String interrogationId) {
+ List rawResponseDocumentList = repository.findByInterrogationId(interrogationId);
+ return RawResponseDocumentMapper.INSTANCE.listDocumentToListModel(rawResponseDocumentList);
+ }
+
@Override
public void updateProcessDates(String collectionInstrumentId, Set interrogationIds) {
mongoTemplate.updateMulti(
@@ -58,4 +68,16 @@ public Set findUnprocessedInterrogationIdsByCollectionInstrumentId(Strin
// We remove duplicate ids
return new HashSet<>(repository.findInterrogationIdByCollectionInstrumentIdAndProcessDateIsNull(collectionInstrumentId));
}
+
+ @Override
+ public List findModesByCollectionInstrument(String collectionInstrumentId) {
+ return repository.findModesByCollectionInstrumentId(collectionInstrumentId);
+ }
+
+ @Override
+ public Page findByCampaignIdAndDate(String campaignId, Instant startDate, Instant endDate, Pageable pageable) {
+ Page rawDataDocs = repository.findByCampaignIdAndDate(campaignId, startDate, endDate, pageable);
+ List modelList = RawResponseDocumentMapper.INSTANCE.listDocumentToListModel(rawDataDocs.getContent());
+ return new PageImpl<>(modelList, rawDataDocs.getPageable(), rawDataDocs.getTotalElements());
+ }
}
diff --git a/src/main/java/fr/insee/genesis/infrastructure/adapter/SurveyUnitMongoAdapter.java b/src/main/java/fr/insee/genesis/infrastructure/adapter/SurveyUnitMongoAdapter.java
index 79de453a..50f27f76 100644
--- a/src/main/java/fr/insee/genesis/infrastructure/adapter/SurveyUnitMongoAdapter.java
+++ b/src/main/java/fr/insee/genesis/infrastructure/adapter/SurveyUnitMongoAdapter.java
@@ -161,8 +161,10 @@ public List findInterrogationIdsByCollectionInstrumentId(String
@Override
public List findInterrogationIdsByQuestionnaireIdAndDateAfter(String questionnaireId, LocalDateTime since) {
- List surveyUnits = mongoRepository.findInterrogationIdsByQuestionnaireIdAndDateAfter(questionnaireId, since);
- return surveyUnits.isEmpty() ? Collections.emptyList() : SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(surveyUnits);
+ List results = new ArrayList<>();
+ results.addAll(mongoRepository.findInterrogationIdsByQuestionnaireIdAndDateAfter(questionnaireId, since));
+ results.addAll(mongoRepository.findInterrogationIdsByCollectionInstrumentIdAndDateAfter(questionnaireId, since));
+ return results.isEmpty() ? Collections.emptyList() : SurveyUnitDocumentMapper.INSTANCE.listDocumentToListModel(results);
}
//========== OPTIMISATIONS PERFS (START) ===========
diff --git a/src/main/java/fr/insee/genesis/infrastructure/document/rawdata/LunaticJsonRawDataDocument.java b/src/main/java/fr/insee/genesis/infrastructure/document/rawdata/LunaticJsonRawDataDocument.java
index 88961d0b..c29536a6 100644
--- a/src/main/java/fr/insee/genesis/infrastructure/document/rawdata/LunaticJsonRawDataDocument.java
+++ b/src/main/java/fr/insee/genesis/infrastructure/document/rawdata/LunaticJsonRawDataDocument.java
@@ -19,6 +19,7 @@ public record LunaticJsonRawDataDocument(
String campaignId,
@Indexed
String questionnaireId,
+ @Indexed
String interrogationId,
String idUE,
Mode mode,
diff --git a/src/main/java/fr/insee/genesis/infrastructure/document/rawdata/RawResponseDocument.java b/src/main/java/fr/insee/genesis/infrastructure/document/rawdata/RawResponseDocument.java
index e62e5a4c..5b4d705a 100644
--- a/src/main/java/fr/insee/genesis/infrastructure/document/rawdata/RawResponseDocument.java
+++ b/src/main/java/fr/insee/genesis/infrastructure/document/rawdata/RawResponseDocument.java
@@ -15,11 +15,14 @@
public record RawResponseDocument (
@Id
ObjectId id,
+ @Indexed
String interrogationId,
String collectionInstrumentId,
String mode,
Map payload,
LocalDateTime recordDate,
@Indexed(direction = IndexDirection.DESCENDING)
- LocalDateTime processDate
+ LocalDateTime processDate,
+ @Indexed
+ String campaignId
){}
diff --git a/src/main/java/fr/insee/genesis/infrastructure/mappers/RawResponseDocumentMapper.java b/src/main/java/fr/insee/genesis/infrastructure/mappers/RawResponseDocumentMapper.java
index 96e5e073..b2103a66 100644
--- a/src/main/java/fr/insee/genesis/infrastructure/mappers/RawResponseDocumentMapper.java
+++ b/src/main/java/fr/insee/genesis/infrastructure/mappers/RawResponseDocumentMapper.java
@@ -1,7 +1,7 @@
package fr.insee.genesis.infrastructure.mappers;
import fr.insee.genesis.domain.model.surveyunit.Mode;
-import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponse;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
import fr.insee.genesis.infrastructure.document.rawdata.RawResponseDocument;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@@ -13,10 +13,10 @@ public interface RawResponseDocumentMapper {
RawResponseDocumentMapper INSTANCE = Mappers.getMapper(RawResponseDocumentMapper.class);
- RawResponse documentToModel(RawResponseDocument document);
- RawResponseDocument modelToDocument(RawResponse model);
- List listDocumentToListModel(List documentList);
- List listModelToListDocument(List modelList);
+ RawResponseModel documentToModel(RawResponseDocument document);
+ RawResponseDocument modelToDocument(RawResponseModel model);
+ List listDocumentToListModel(List documentList);
+ List listModelToListDocument(List modelList);
// --- Custom mapping: String -> Mode
default Mode stringToMode(String value) {
diff --git a/src/main/java/fr/insee/genesis/infrastructure/mappers/RundeckExecutionDocumentMapper.java b/src/main/java/fr/insee/genesis/infrastructure/mappers/RundeckExecutionDocumentMapper.java
index f0847f0e..30067d67 100644
--- a/src/main/java/fr/insee/genesis/infrastructure/mappers/RundeckExecutionDocumentMapper.java
+++ b/src/main/java/fr/insee/genesis/infrastructure/mappers/RundeckExecutionDocumentMapper.java
@@ -13,4 +13,4 @@ public interface RundeckExecutionDocumentMapper {
RundeckExecution documentToModel(RundeckExecutionDocument rundeckExecutionDocument);
RundeckExecutionDocument modelToDocument(RundeckExecution rundeckExecution);
-}
+}
\ No newline at end of file
diff --git a/src/main/java/fr/insee/genesis/infrastructure/mappers/SurveyUnitDocumentMapper.java b/src/main/java/fr/insee/genesis/infrastructure/mappers/SurveyUnitDocumentMapper.java
index 16fe8618..e1bba8ae 100644
--- a/src/main/java/fr/insee/genesis/infrastructure/mappers/SurveyUnitDocumentMapper.java
+++ b/src/main/java/fr/insee/genesis/infrastructure/mappers/SurveyUnitDocumentMapper.java
@@ -22,7 +22,8 @@ public interface SurveyUnitDocumentMapper {
List listModelToListDocument(List surveyUnitModels);
@AfterMapping
- default void fillModelAfterRead(SurveyUnitDocument doc,
+ @SuppressWarnings("deprecation")
+ default void handleDeprecatedFields(SurveyUnitDocument doc,
@MappingTarget SurveyUnitModel model) {
if (model.getUsualSurveyUnitId() == null) {
@@ -34,5 +35,4 @@ default void fillModelAfterRead(SurveyUnitDocument doc,
}
}
-
}
diff --git a/src/main/java/fr/insee/genesis/infrastructure/repository/LunaticJsonMongoDBRepository.java b/src/main/java/fr/insee/genesis/infrastructure/repository/LunaticJsonMongoDBRepository.java
index 58486bae..5959f002 100644
--- a/src/main/java/fr/insee/genesis/infrastructure/repository/LunaticJsonMongoDBRepository.java
+++ b/src/main/java/fr/insee/genesis/infrastructure/repository/LunaticJsonMongoDBRepository.java
@@ -23,9 +23,18 @@ public interface LunaticJsonMongoDBRepository extends MongoRepository findModesByCampaignId(String campaignId);
+ @Aggregation(pipeline = {
+ "{ '$match': { 'questionnaireId': ?0 } }",
+ "{ '$project': { '_id': 0, 'mode': 1 } }"
+ })
+ List findModesByQuestionnaireId(String questionnaireId);
+
@Query(value = "{ 'campaignId' : ?0, 'mode' : ?1, 'interrogationId': {$in: ?2} }")
List findModesByCampaignIdAndByModeAndinterrogationIdIninterrogationIdList(String campaignName, Mode mode, List interrogationIdList);
+ @Query(value = "{ 'interrogationId': ?0}")
+ List findByInterrogationId(String interrogationId);
+
Page 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
index e09e9fd7..894f1f48 100644
--- a/src/main/java/fr/insee/genesis/infrastructure/repository/RawResponseRepository.java
+++ b/src/main/java/fr/insee/genesis/infrastructure/repository/RawResponseRepository.java
@@ -1,11 +1,15 @@
package fr.insee.genesis.infrastructure.repository;
+import fr.insee.genesis.domain.model.surveyunit.Mode;
import fr.insee.genesis.infrastructure.document.rawdata.RawResponseDocument;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
import org.springframework.data.mongodb.repository.Aggregation;
import org.springframework.data.mongodb.repository.MongoRepository;
import org.springframework.data.mongodb.repository.Query;
import org.springframework.stereotype.Repository;
+import java.time.Instant;
import java.util.List;
@Repository
@@ -26,4 +30,15 @@ public interface RawResponseRepository extends MongoRepository findInterrogationIdByCollectionInstrumentIdAndProcessDateIsNull(String collectionInstrumentId);
+ @Aggregation(pipeline = {
+ "{ '$match': { 'collectionInstrumentId': ?0 } }",
+ "{ '$project': { '_id': 0, 'mode': 1 } }"
+ })
+ List findModesByCollectionInstrumentId(String collectionInstrumentId);
+
+ @Query(value = "{ 'payload.campaignId' : ?0, 'recordDate' : { $gte: ?1, $lte: ?2 } }")
+ Page findByCampaignIdAndDate(String campaignId, Instant startDate, Instant endDate, Pageable pageable);
+
+ @Query(value = "{ 'interrogationId': ?0}")
+ List findByInterrogationId(String interrogationId);
}
diff --git a/src/main/java/fr/insee/genesis/infrastructure/repository/SurveyUnitMongoDBRepository.java b/src/main/java/fr/insee/genesis/infrastructure/repository/SurveyUnitMongoDBRepository.java
index 63999e7c..a23283fe 100644
--- a/src/main/java/fr/insee/genesis/infrastructure/repository/SurveyUnitMongoDBRepository.java
+++ b/src/main/java/fr/insee/genesis/infrastructure/repository/SurveyUnitMongoDBRepository.java
@@ -37,6 +37,9 @@ public interface SurveyUnitMongoDBRepository extends MongoRepository findInterrogationIdsByQuestionnaireIdAndDateAfter(String questionnaireId, LocalDateTime since);
+ @Query(value = "{ 'collectionInstrumentId' : ?0, 'recordDate': { $gte: ?1 } }", fields = "{ 'interrogationId' : 1, 'mode' : 1 }")
+ List findInterrogationIdsByCollectionInstrumentIdAndDateAfter(String collectionInstrumentId, LocalDateTime since);
+
//========= OPTIMISATIONS PERFS (START) ==========
/**
* @author Adrien Marchal
diff --git a/src/test/resources/fr/insee/genesis/features/do_we_extract_data.feature b/src/test/java/cucumber/features/do_we_extract_data.feature
similarity index 98%
rename from src/test/resources/fr/insee/genesis/features/do_we_extract_data.feature
rename to src/test/java/cucumber/features/do_we_extract_data.feature
index 25818708..bfff4d96 100644
--- a/src/test/resources/fr/insee/genesis/features/do_we_extract_data.feature
+++ b/src/test/java/cucumber/features/do_we_extract_data.feature
@@ -34,7 +34,7 @@ Feature: Do we extract data ?
Examples:
| CampaignId | QuestionnaireId | InterrogationId | ExpectedCollectedVariablesCount | ExpectedExternalVariablesCount | ExpectedVariableType | ExpectedVariableName | ExpectedValue |
| TEST-TABLEAUX | TEST-TABLEAUX | AUTO11000 | 49 | 4 | Integer | TABLEAUTIC21 | 5 |
- | SAMPLETEST-PARADATA-v2 | quest_model_famille_AD_ttp | 0000007 | 96 | 17 | Boolean | AVIS_SUPPORT1 | true |
+ | SAMPLETEST-PARADATA-V2 | quest_model_famille_AD_ttp | 0000007 | 96 | 17 | Boolean | AVIS_SUPPORT1 | true |
Scenario Outline: Multiple different Contexts for one partitionId
Given We have data in directory ""
diff --git a/src/test/resources/fr/insee/genesis/features/do_we_process_raw_data.feature b/src/test/java/cucumber/features/do_we_process_raw_data.feature
similarity index 100%
rename from src/test/resources/fr/insee/genesis/features/do_we_process_raw_data.feature
rename to src/test/java/cucumber/features/do_we_process_raw_data.feature
diff --git a/src/test/resources/fr/insee/genesis/features/do_we_save_data.feature b/src/test/java/cucumber/features/do_we_save_data.feature
similarity index 80%
rename from src/test/resources/fr/insee/genesis/features/do_we_save_data.feature
rename to src/test/java/cucumber/features/do_we_save_data.feature
index 339b9fcc..32b34def 100644
--- a/src/test/resources/fr/insee/genesis/features/do_we_save_data.feature
+++ b/src/test/java/cucumber/features/do_we_save_data.feature
@@ -2,16 +2,16 @@ Feature: Do we save data ?
Everybody wants to know if we save data correctly
Scenario Outline: Collected data saving (COLLECTED only)
- Given We have data in directory "SAMPLETEST-PARADATA-v1"
- When We create survey unit models from file "reponse-platine/data.complete.validated.STPDv1.20231122164209.xml" with DDI "ddi-SAMPLETEST-PARADATA-v1.xml"
+ Given We have data in directory "SAMPLETEST-PARADATA-V1"
+ When We create survey unit models from file "reponse-platine/data.complete.validated.STPDv1.20231122164209.xml" with DDI "ddi-SAMPLETEST-PARADATA-V1.xml"
Then For SurveyUnit "" there should be at least one "" SurveyUnit Model
Examples:
| InterrogationId | ExpectedStatus |
| 0000007 | COLLECTED |
Scenario Outline: Collected data saving (COLLECTED only)
- Given We have data in directory "SAMPLETEST-PARADATA-v1"
- When We create survey unit models from file "reponse-platine/data.complete.validated.STPDv1.20231122164209.xml" with DDI "ddi-SAMPLETEST-PARADATA-v1.xml"
+ Given We have data in directory "SAMPLETEST-PARADATA-V1"
+ When We create survey unit models from file "reponse-platine/data.complete.validated.STPDv1.20231122164209.xml" with DDI "ddi-SAMPLETEST-PARADATA-V1.xml"
Then For SurveyUnit "" there shouldn't be a "" SurveyUnit Model
Examples:
| InterrogationId | UnexpectedStatus |
@@ -23,8 +23,8 @@ Feature: Do we save data ?
Scenario Outline: Collected data saving (all states)
- Given We have data in directory "SAMPLETEST-PARADATA-v2"
- When We create survey unit models from file "reponse-platine/data.complete.validated.STPDv2.20231122164209.xml" with DDI "ddi-SAMPLETEST-PARADATA-v2.xml"
+ Given We have data in directory "SAMPLETEST-PARADATA-V2"
+ When We create survey unit models from file "reponse-platine/data.complete.validated.STPDv2.20231122164209.xml" with DDI "ddi-SAMPLETEST-PARADATA-V2.xml"
Then For SurveyUnit "" there should be at least one "" SurveyUnit Model
Examples:
| InterrogationId | ExpectedStatus |
@@ -40,12 +40,12 @@ Feature: Do we save data ?
Then We should have a "" Survey Unit model for survey unit "" with "" filled with "" for iteration
Examples:
| Directory | FileName | DDIFileName | ExpectedDataState | interrogationId | VariableName | ExpectedValue | Iteration |
- | SAMPLETEST-PARADATA-v1 | reponse-platine/data.complete.validated.STPDv1.20231122164209.xml |ddi-SAMPLETEST-PARADATA-v1.xml | COLLECTED | 0000007 | PRENOM_C | TESTPRENOM7 | 1 |
- | SAMPLETEST-PARADATA-v2 | reponse-platine/data.complete.validated.STPDv2.20231122164209.xml |ddi-SAMPLETEST-PARADATA-v2.xml | COLLECTED | 0000007 | PRENOM_C | TESTPRENOM7 | 1 |
- | SAMPLETEST-PARADATA-v2 | reponse-platine/data.complete.validated.STPDv2.20231122164209.xml |ddi-SAMPLETEST-PARADATA-v2.xml | EDITED | 0000007 | SANTE_ENFLOG71 | TESTSANTE7E | 1 |
- | SAMPLETEST-PARADATA-v2 | reponse-platine/data.complete.validated.STPDv2.20231122164209.xml |ddi-SAMPLETEST-PARADATA-v2.xml | INPUTED | 0000007 | PETIT_ENF | TESTPETITENF7I | 1 |
- | SAMPLETEST-PARADATA-v2 | reponse-platine/data.complete.validated.STPDv2.20231122164209.xml |ddi-SAMPLETEST-PARADATA-v2.xml | FORCED | 0000007 | LANGUE2_ENTOU | FR | 1 |
- | SAMPLETEST-PARADATA-v2 | reponse-platine/data.complete.validated.STPDv2.20231122164209.xml |ddi-SAMPLETEST-PARADATA-v2.xml | PREVIOUS | 0000007 | AVIS_FILTRE | 1 | 1 |
+ | SAMPLETEST-PARADATA-V1 | reponse-platine/data.complete.validated.STPDv1.20231122164209.xml |ddi-SAMPLETEST-PARADATA-V1.xml | COLLECTED | 0000007 | PRENOM_C | TESTPRENOM7 | 1 |
+ | SAMPLETEST-PARADATA-V2 | reponse-platine/data.complete.validated.STPDv2.20231122164209.xml |ddi-SAMPLETEST-PARADATA-V2.xml | COLLECTED | 0000007 | PRENOM_C | TESTPRENOM7 | 1 |
+ | SAMPLETEST-PARADATA-V2 | reponse-platine/data.complete.validated.STPDv2.20231122164209.xml |ddi-SAMPLETEST-PARADATA-V2.xml | EDITED | 0000007 | SANTE_ENFLOG71 | TESTSANTE7E | 1 |
+ | SAMPLETEST-PARADATA-V2 | reponse-platine/data.complete.validated.STPDv2.20231122164209.xml |ddi-SAMPLETEST-PARADATA-V2.xml | INPUTED | 0000007 | PETIT_ENF | TESTPETITENF7I | 1 |
+ | SAMPLETEST-PARADATA-V2 | reponse-platine/data.complete.validated.STPDv2.20231122164209.xml |ddi-SAMPLETEST-PARADATA-V2.xml | FORCED | 0000007 | LANGUE2_ENTOU | FR | 1 |
+ | SAMPLETEST-PARADATA-V2 | reponse-platine/data.complete.validated.STPDv2.20231122164209.xml |ddi-SAMPLETEST-PARADATA-V2.xml | PREVIOUS | 0000007 | AVIS_FILTRE | 1 | 1 |
Scenario Outline: External data saving
diff --git a/src/test/resources/fr/insee/genesis/features/do_we_save_loops.feature b/src/test/java/cucumber/features/do_we_save_loops.feature
similarity index 100%
rename from src/test/resources/fr/insee/genesis/features/do_we_save_loops.feature
rename to src/test/java/cucumber/features/do_we_save_loops.feature
diff --git a/src/test/resources/fr/insee/genesis/features/do_we_save_raw_data.feature b/src/test/java/cucumber/features/do_we_save_raw_data.feature
similarity index 100%
rename from src/test/resources/fr/insee/genesis/features/do_we_save_raw_data.feature
rename to src/test/java/cucumber/features/do_we_save_raw_data.feature
diff --git a/src/test/resources/fr/insee/genesis/features/get_lunatic_model.feature b/src/test/java/cucumber/features/get_lunatic_model.feature
similarity index 100%
rename from src/test/resources/fr/insee/genesis/features/get_lunatic_model.feature
rename to src/test/java/cucumber/features/get_lunatic_model.feature
diff --git a/src/test/resources/fr/insee/genesis/features/save_data_processing_context.feature b/src/test/java/cucumber/features/save_data_processing_context.feature
similarity index 100%
rename from src/test/resources/fr/insee/genesis/features/save_data_processing_context.feature
rename to src/test/java/cucumber/features/save_data_processing_context.feature
diff --git a/src/test/resources/fr/insee/genesis/features/save_lunatic_model.feature b/src/test/java/cucumber/features/save_lunatic_model.feature
similarity index 100%
rename from src/test/resources/fr/insee/genesis/features/save_lunatic_model.feature
rename to src/test/java/cucumber/features/save_lunatic_model.feature
diff --git a/src/test/resources/fr/insee/genesis/features/scheduling.feature b/src/test/java/cucumber/features/scheduling.feature
similarity index 100%
rename from src/test/resources/fr/insee/genesis/features/scheduling.feature
rename to src/test/java/cucumber/features/scheduling.feature
diff --git a/src/test/java/cucumber/functional_tests/LunaticModelDefinitions.java b/src/test/java/cucumber/functional_tests/LunaticModelDefinitions.java
index dca3aac2..16e9c0cd 100644
--- a/src/test/java/cucumber/functional_tests/LunaticModelDefinitions.java
+++ b/src/test/java/cucumber/functional_tests/LunaticModelDefinitions.java
@@ -125,6 +125,7 @@ public void save_lunatic_model(String questionnaireId) throws Exception {
JsonUtils.jsonToMap(lunaticModelSaveBody)
);
}
+
@When("We try to save that lunatic model json file with questionnaire id {string} with Spring context")
public void save_lunatic_model_spring(String questionnaireId) throws IOException {
lunaticModelSaveBody = Files.readString(lunaticModelJsonPath);
diff --git a/src/test/java/cucumber/functional_tests/RawDataDefinitions.java b/src/test/java/cucumber/functional_tests/RawDataDefinitions.java
index c2005dba..dc0587eb 100644
--- a/src/test/java/cucumber/functional_tests/RawDataDefinitions.java
+++ b/src/test/java/cucumber/functional_tests/RawDataDefinitions.java
@@ -11,7 +11,7 @@
import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
import fr.insee.genesis.domain.model.surveyunit.VariableModel;
import fr.insee.genesis.domain.model.surveyunit.rawdata.DataProcessResult;
-import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponse;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
import fr.insee.genesis.domain.ports.api.RawResponseApiPort;
import fr.insee.genesis.domain.service.context.DataProcessingContextService;
import fr.insee.genesis.domain.service.metadata.QuestionnaireMetadataService;
@@ -39,6 +39,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -54,6 +56,7 @@
import java.security.KeyPairGenerator;
import java.security.NoSuchAlgorithmException;
import java.security.interfaces.RSAPublicKey;
+import java.time.Instant;
import java.util.Collections;
import java.util.List;
@@ -106,7 +109,12 @@ public void saveAsRawJson(RawResponseDto dto) {
RawResponseApiPort rawResponseApiPortStub = new RawResponseApiPort() {
@Override
- public List getRawResponses(String questionnaireModelId, Mode mode, List interrogationIdList) {
+ public List getRawResponses(String questionnaireModelId, Mode mode, List interrogationIdList) {
+ return List.of();
+ }
+
+ @Override
+ public List getRawResponsesByInterrogationID(String interrogationId) {
return List.of();
}
@@ -121,7 +129,7 @@ public DataProcessResult processRawResponses(String collectionInstrumentId) thro
}
@Override
- public List convertRawResponse(List rawResponses, VariablesMap variablesMap) {
+ public List convertRawResponse(List rawResponsModels, VariablesMap variablesMap) {
return List.of();
}
@@ -134,6 +142,11 @@ public List getUnprocessedCollectionInstrumentIds() {
public void updateProcessDates(List surveyUnitModels) {
// Do nothing - stub for test
}
+
+ @Override
+ public Page findRawResponseDataByCampaignIdAndDate(String campaignId, Instant startDate, Instant endDate, Pageable pageable) {
+ return null;
+ }
};
RawResponseController rawResponseController = new RawResponseController(
diff --git a/src/test/java/fr/insee/genesis/TestConstants.java b/src/test/java/fr/insee/genesis/TestConstants.java
index 007ce24b..d5877ed0 100644
--- a/src/test/java/fr/insee/genesis/TestConstants.java
+++ b/src/test/java/fr/insee/genesis/TestConstants.java
@@ -8,8 +8,9 @@ public class TestConstants {
public static final String TEST_RESOURCES_DIRECTORY = "src/test/resources";
public static final String UNIT_TESTS_DDI_DIRECTORY = TEST_RESOURCES_DIRECTORY + "/specs";
- public static final String DEFAULT_INTERROGATION_ID = "TESTINTERROGATIONID";
- public static final String DEFAULT_QUESTIONNAIRE_ID = "TESTQUESTIONNAIREID";
+ public static final String DEFAULT_INTERROGATION_ID = "TESTINTERROGATIONID";
+ public static final String DEFAULT_COLLECTION_INSTRUMENT_ID = "SAMPLETEST-PARADATA-V1";
+ public static final String DEFAULT_SURVEY_UNIT_ID = "TESTIDUE";
//Functional tests
public static final String FUNCTIONAL_TESTS_INPUT_DIRECTORY = TEST_RESOURCES_DIRECTORY + "/IN";
diff --git a/src/test/java/fr/insee/genesis/controller/rest/UtilsControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/UtilsControllerTest.java
index da751d0f..05531008 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/UtilsControllerTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/UtilsControllerTest.java
@@ -44,6 +44,9 @@
import java.util.List;
import java.util.stream.Stream;
+import static fr.insee.genesis.TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
+import static fr.insee.genesis.TestConstants.DEFAULT_INTERROGATION_ID;
+
class UtilsControllerTest {
//Given
static UtilsController utilsControllerStatic;
@@ -57,9 +60,6 @@ class UtilsControllerTest {
static QuestionnaireMetadataService metadataService = new QuestionnaireMetadataService(new QuestionnaireMetadataPersistencePortStub());
static SurveyUnitService surveyUnitService = new SurveyUnitService(new SurveyUnitPersistencePortStub(), metadataService, fileUtils);
static SurveyUnitQualityService surveyUnitQualityService = new SurveyUnitQualityService();
- //Constants
- static final String DEFAULT_INTERROGATION_ID = "TESTINTERROGATIONID";
- static final String DEFAULT_QUESTIONNAIRE_ID = "TESTQUESTIONNAIREID";
@BeforeAll
static void init() {
@@ -132,7 +132,7 @@ void reset() throws IOException {
.campaignId("TEST-TABLEAUX")
.mode(Mode.WEB)
.interrogationId(DEFAULT_INTERROGATION_ID)
- .collectionInstrumentId(DEFAULT_QUESTIONNAIRE_ID)
+ .collectionInstrumentId(DEFAULT_COLLECTION_INSTRUMENT_ID)
.state(DataState.COLLECTED)
.fileDate(LocalDateTime.of(2023, 1, 1, 0, 0, 0))
.recordDate(LocalDateTime.of(2024, 1, 1, 0, 0, 0))
@@ -150,12 +150,12 @@ void reset() throws IOException {
.forEach(File::delete);
//Recreate data files
- //SAMPLETEST-PARADATA-v1
+ //SAMPLETEST-PARADATA-V1
//Root
if (!testResourcesPath
.resolve("IN")
.resolve("WEB")
- .resolve("SAMPLETEST-PARADATA-v1")
+ .resolve("SAMPLETEST-PARADATA-V1")
.resolve("data.complete.validated.STPDv1.20231122164209.xml")
.toFile().exists()
){
@@ -163,26 +163,26 @@ void reset() throws IOException {
testResourcesPath
.resolve("IN")
.resolve("WEB")
- .resolve("SAMPLETEST-PARADATA-v1")
+ .resolve("SAMPLETEST-PARADATA-V1")
.resolve("reponse-platine")
.resolve("data.complete.partial.STPDv1.20231122164209.xml")
, testResourcesPath
.resolve("IN")
.resolve("WEB")
- .resolve("SAMPLETEST-PARADATA-v1")
+ .resolve("SAMPLETEST-PARADATA-V1")
.resolve("data.complete.partial.STPDv1.20231122164209.xml")
);
Files.copy(
testResourcesPath
.resolve("IN")
.resolve("WEB")
- .resolve("SAMPLETEST-PARADATA-v1")
+ .resolve("SAMPLETEST-PARADATA-V1")
.resolve("reponse-platine")
.resolve("data.complete.validated.STPDv1.20231122164209.xml")
, testResourcesPath
.resolve("IN")
.resolve("WEB")
- .resolve("SAMPLETEST-PARADATA-v1")
+ .resolve("SAMPLETEST-PARADATA-V1")
.resolve("data.complete.validated.STPDv1.20231122164209.xml")
);
}
@@ -190,7 +190,7 @@ void reset() throws IOException {
if (!testResourcesPath
.resolve("IN")
.resolve("WEB")
- .resolve("SAMPLETEST-PARADATA-v1")
+ .resolve("SAMPLETEST-PARADATA-V1")
.resolve("differential")
.resolve("data")
.resolve("data.complete.validated.STPDv1.20231122164209.xml")
@@ -200,13 +200,13 @@ void reset() throws IOException {
testResourcesPath
.resolve("IN")
.resolve("WEB")
- .resolve("SAMPLETEST-PARADATA-v1")
+ .resolve("SAMPLETEST-PARADATA-V1")
.resolve("reponse-platine")
.resolve("data.complete.partial.STPDv1.20231122164209.xml")
, testResourcesPath
.resolve("IN")
.resolve("WEB")
- .resolve("SAMPLETEST-PARADATA-v1")
+ .resolve("SAMPLETEST-PARADATA-V1")
.resolve("differential")
.resolve("data")
.resolve("data.complete.partial.STPDv1.20231122164209.xml")
@@ -215,23 +215,23 @@ void reset() throws IOException {
testResourcesPath
.resolve("IN")
.resolve("WEB")
- .resolve("SAMPLETEST-PARADATA-v1")
+ .resolve("SAMPLETEST-PARADATA-V1")
.resolve("reponse-platine")
.resolve("data.complete.validated.STPDv1.20231122164209.xml")
, testResourcesPath
.resolve("IN")
.resolve("WEB")
- .resolve("SAMPLETEST-PARADATA-v1")
+ .resolve("SAMPLETEST-PARADATA-V1")
.resolve("differential")
.resolve("data")
.resolve("data.complete.validated.STPDv1.20231122164209.xml")
);
}
- //SAMPLETEST-PARADATA-v2
+ //SAMPLETEST-PARADATA-V2
if (!testResourcesPath
.resolve("IN")
.resolve("WEB")
- .resolve("SAMPLETEST-PARADATA-v2")
+ .resolve("SAMPLETEST-PARADATA-V2")
.resolve("data.complete.validated.STPDv2.20231122164209.xml")
.toFile().exists()
){
@@ -239,26 +239,26 @@ void reset() throws IOException {
testResourcesPath
.resolve("IN")
.resolve("WEB")
- .resolve("SAMPLETEST-PARADATA-v2")
+ .resolve("SAMPLETEST-PARADATA-V2")
.resolve("reponse-platine")
.resolve("data.complete.partial.STPDv2.20231122164209.xml")
, testResourcesPath
.resolve("IN")
.resolve("WEB")
- .resolve("SAMPLETEST-PARADATA-v2")
+ .resolve("SAMPLETEST-PARADATA-V2")
.resolve("data.complete.partial.STPDv2.20231122164209.xml")
);
Files.copy(
testResourcesPath
.resolve("IN")
.resolve("WEB")
- .resolve("SAMPLETEST-PARADATA-v2")
+ .resolve("SAMPLETEST-PARADATA-V2")
.resolve("reponse-platine")
.resolve("data.complete.validated.STPDv2.20231122164209.xml")
, testResourcesPath
.resolve("IN")
.resolve("WEB")
- .resolve("SAMPLETEST-PARADATA-v2")
+ .resolve("SAMPLETEST-PARADATA-V2")
.resolve("data.complete.validated.STPDv2.20231122164209.xml")
);
}
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/CampaignControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/CampaignControllerTest.java
index 45b07a62..3ac5f158 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/CampaignControllerTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/responses/CampaignControllerTest.java
@@ -18,15 +18,13 @@
import java.util.List;
import java.util.Set;
+import static fr.insee.genesis.TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
+
class CampaignControllerTest {
//Given
static CampaignController campaignControllerStatic;
static SurveyUnitPersistencePortStub surveyUnitPersistencePortStub;
- //Constants
- static final String DEFAULT_INTERROGATION_ID = "TESTINTERROGATIONID";
- static final String DEFAULT_QUESTIONNAIRE_ID = "TESTQUESTIONNAIREID";
-
@BeforeAll
static void init() {
surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
@@ -75,7 +73,7 @@ void getCampaignsWithQuestionnairesTest() {
Assertions.assertThat(response.getBody().stream().filter(
campaignWithQuestionnaire -> campaignWithQuestionnaire.getCampaignId().equals("TEST-TABLEAUX")
- ).findFirst().get().getQuestionnaires()).containsOnly(DEFAULT_QUESTIONNAIRE_ID, "TESTQUESTIONNAIRE2");
+ ).findFirst().get().getQuestionnaires()).containsOnly(DEFAULT_COLLECTION_INSTRUMENT_ID, "TESTQUESTIONNAIRE2");
Assertions.assertThat(response.getBody().stream().filter(
campaignWithQuestionnaire -> campaignWithQuestionnaire.getCampaignId().equals("TESTCAMPAIGN2")
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/InterrogationControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/InterrogationControllerTest.java
index 739dbc13..0bfb6c65 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/InterrogationControllerTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/responses/InterrogationControllerTest.java
@@ -18,7 +18,7 @@
import java.util.List;
import static fr.insee.genesis.TestConstants.DEFAULT_INTERROGATION_ID;
-import static fr.insee.genesis.TestConstants.DEFAULT_QUESTIONNAIRE_ID;
+import static fr.insee.genesis.TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
class InterrogationControllerTest {
//Given
@@ -47,7 +47,7 @@ void reset() throws IOException {
//When + Then
@Test
void getAllInterrogationIdsByQuestionnaireTest() {
- ResponseEntity> response = interrogationControllerStatic.getAllInterrogationIdsByQuestionnaire(DEFAULT_QUESTIONNAIRE_ID);
+ ResponseEntity> response = interrogationControllerStatic.getAllInterrogationIdsByQuestionnaire(DEFAULT_COLLECTION_INSTRUMENT_ID);
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty();
@@ -56,7 +56,7 @@ void getAllInterrogationIdsByQuestionnaireTest() {
@Test
void countAllInterrogationIdsByQuestionnaireTest() {
- ResponseEntity response = interrogationControllerStatic.countAllInterrogationIdsByQuestionnaire(DEFAULT_QUESTIONNAIRE_ID);
+ ResponseEntity response = interrogationControllerStatic.countAllInterrogationIdsByQuestionnaire(DEFAULT_COLLECTION_INSTRUMENT_ID);
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(response.getBody()).isNotNull();
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/ModeControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/ModeControllerTest.java
index 339a27ab..8220c066 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/ModeControllerTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/responses/ModeControllerTest.java
@@ -17,7 +17,7 @@
import java.io.IOException;
import java.util.List;
-import static fr.insee.genesis.TestConstants.DEFAULT_QUESTIONNAIRE_ID;
+import static fr.insee.genesis.TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
class ModeControllerTest {
public static final String CAMPAIGN_ID = "TEST-TABLEAUX";
@@ -47,7 +47,7 @@ void reset() throws IOException {
//When + Then
@Test
void getModesByQuestionnaireTest() {
- ResponseEntity> response = modeControllerStatic.getModesByQuestionnaire(DEFAULT_QUESTIONNAIRE_ID);
+ ResponseEntity> response = modeControllerStatic.getModesByQuestionnaire(DEFAULT_COLLECTION_INSTRUMENT_ID);
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().hasSize(1);
@@ -66,7 +66,7 @@ void getModesByCampaignTest() {
//========= OPTIMISATIONS PERFS (START) ==========
@Test
void getModesByQuestionnaireV2Test() {
- ResponseEntity> response = modeControllerStatic.getModesByQuestionnaireV2(DEFAULT_QUESTIONNAIRE_ID);
+ ResponseEntity> response = modeControllerStatic.getModesByQuestionnaireV2(DEFAULT_COLLECTION_INSTRUMENT_ID);
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().hasSize(1);
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/QuestionnaireControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/QuestionnaireControllerTest.java
index 6e5e24ea..236cdc1e 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/QuestionnaireControllerTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/responses/QuestionnaireControllerTest.java
@@ -22,7 +22,7 @@
import java.util.List;
import java.util.Set;
-import static fr.insee.genesis.TestConstants.DEFAULT_QUESTIONNAIRE_ID;
+import static fr.insee.genesis.TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
class QuestionnaireControllerTest {
//Given
@@ -64,7 +64,7 @@ void getQuestionnairesTest() {
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().containsOnly(
- DEFAULT_QUESTIONNAIRE_ID,"TESTQUESTIONNAIRE2");
+ DEFAULT_COLLECTION_INSTRUMENT_ID,"TESTQUESTIONNAIRE2");
}
@Test
@@ -78,7 +78,7 @@ void getQuestionnairesWithReviewTest() {
Assertions.assertThat(response.getBody()).isNotNull().isEmpty();
DataProcessingContextDocument doc = new DataProcessingContextDocument();
- doc.setPartitionId(DEFAULT_QUESTIONNAIRE_ID);
+ doc.setPartitionId(DEFAULT_COLLECTION_INSTRUMENT_ID);
doc.setKraftwerkExecutionScheduleList(new ArrayList<>());
doc.setWithReview(true);
dataProcessingContextPersistancePortStub.getMongoStub().add(doc);
@@ -86,7 +86,7 @@ void getQuestionnairesWithReviewTest() {
response = questionnaireControllerStatic.getQuestionnairesWithReview(true);
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().containsOnly(
- DEFAULT_QUESTIONNAIRE_ID);
+ DEFAULT_COLLECTION_INSTRUMENT_ID);
DataProcessingContextDocument doc2 = new DataProcessingContextDocument();
doc2.setPartitionId(questionnaireId);
@@ -97,7 +97,7 @@ void getQuestionnairesWithReviewTest() {
response = questionnaireControllerStatic.getQuestionnairesWithReview(true);
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().containsOnly(
- DEFAULT_QUESTIONNAIRE_ID);
+ DEFAULT_COLLECTION_INSTRUMENT_ID);
}
@Test
@@ -111,7 +111,7 @@ void getQuestionnairesWithoutReviewTest() {
Assertions.assertThat(response.getBody()).isNotNull().isEmpty();
DataProcessingContextDocument doc = new DataProcessingContextDocument();
- doc.setPartitionId(DEFAULT_QUESTIONNAIRE_ID);
+ doc.setPartitionId(DEFAULT_COLLECTION_INSTRUMENT_ID);
doc.setKraftwerkExecutionScheduleList(new ArrayList<>());
doc.setWithReview(false);
dataProcessingContextPersistancePortStub.getMongoStub().add(doc);
@@ -119,7 +119,7 @@ void getQuestionnairesWithoutReviewTest() {
response = questionnaireControllerStatic.getQuestionnairesWithReview(false);
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().containsOnly(
- DEFAULT_QUESTIONNAIRE_ID);
+ DEFAULT_COLLECTION_INSTRUMENT_ID);
DataProcessingContextDocument doc2 = new DataProcessingContextDocument();
doc2.setPartitionId(questionnaireId);
@@ -129,7 +129,7 @@ void getQuestionnairesWithoutReviewTest() {
response = questionnaireControllerStatic.getQuestionnairesWithReview(false);
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().containsOnly(
- DEFAULT_QUESTIONNAIRE_ID);
+ DEFAULT_COLLECTION_INSTRUMENT_ID);
}
@Test
@@ -140,7 +140,7 @@ void getQuestionnairesByCampaignTest() {
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty().containsOnly(
- DEFAULT_QUESTIONNAIRE_ID,"TESTQUESTIONNAIRE2");
+ DEFAULT_COLLECTION_INSTRUMENT_ID,"TESTQUESTIONNAIRE2");
}
@@ -156,12 +156,12 @@ void getQuestionnairesWithCampaignsTest() {
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty();
Assertions.assertThat(response.getBody().stream().filter(questionnaireWithCampaign ->
- questionnaireWithCampaign.getQuestionnaireId().equals(DEFAULT_QUESTIONNAIRE_ID)
+ questionnaireWithCampaign.getQuestionnaireId().equals(DEFAULT_COLLECTION_INSTRUMENT_ID)
|| questionnaireWithCampaign.getQuestionnaireId().equals("TESTQUESTIONNAIRE2")
)).isNotNull().isNotEmpty().hasSize(2);
Assertions.assertThat(response.getBody().stream().filter(
- questionnaireWithCampaign -> questionnaireWithCampaign.getQuestionnaireId().equals(DEFAULT_QUESTIONNAIRE_ID)
+ questionnaireWithCampaign -> questionnaireWithCampaign.getQuestionnaireId().equals(DEFAULT_COLLECTION_INSTRUMENT_ID)
).findFirst().get().getCampaigns()).containsExactly("TEST-TABLEAUX");
Assertions.assertThat(response.getBody().stream().filter(
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
index cca7fa34..19ba4eb9 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerTest.java
@@ -10,7 +10,7 @@
import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
import fr.insee.genesis.domain.model.surveyunit.rawdata.DataProcessResult;
import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
-import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponse;
+import fr.insee.genesis.domain.model.surveyunit.rawdata.RawResponseModel;
import fr.insee.genesis.domain.ports.api.LunaticJsonRawDataApiPort;
import fr.insee.genesis.domain.ports.api.RawResponseApiPort;
import fr.insee.genesis.domain.service.context.DataProcessingContextService;
@@ -22,6 +22,7 @@
import fr.insee.genesis.exceptions.GenesisError;
import fr.insee.genesis.exceptions.GenesisException;
import fr.insee.genesis.infrastructure.document.rawdata.LunaticJsonRawDataDocument;
+import fr.insee.genesis.infrastructure.document.rawdata.RawResponseDocument;
import fr.insee.genesis.infrastructure.mappers.DataProcessingContextMapper;
import fr.insee.genesis.infrastructure.repository.RawResponseInputRepository;
import fr.insee.genesis.infrastructure.utils.FileUtils;
@@ -29,12 +30,15 @@
import fr.insee.genesis.stubs.DataProcessingContextPersistancePortStub;
import fr.insee.genesis.stubs.LunaticJsonRawDataPersistanceStub;
import fr.insee.genesis.stubs.QuestionnaireMetadataPersistencePortStub;
+import fr.insee.genesis.stubs.RawResponseDataPersistanceStub;
import fr.insee.genesis.stubs.SurveyUnitPersistencePortStub;
import fr.insee.genesis.stubs.SurveyUnitQualityToolPerretAdapterStub;
import fr.insee.modelefiliere.RawResponseDto;
import lombok.extern.slf4j.Slf4j;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PagedModel;
import org.springframework.http.ResponseEntity;
@@ -49,6 +53,7 @@
class RawResponseControllerTest {
private final FileUtils fileUtils = new FileUtils(new ConfigStub());
private final LunaticJsonRawDataPersistanceStub lunaticJsonRawDataPersistanceStub = new LunaticJsonRawDataPersistanceStub();
+ private final RawResponseDataPersistanceStub rawResponseDataPersistanceStub = new RawResponseDataPersistanceStub();
private final SurveyUnitPersistencePortStub surveyUnitPersistencePortStub = new SurveyUnitPersistencePortStub();
private final SurveyUnitQualityToolPerretAdapterStub surveyUnitQualityToolPerretAdapterStub = new SurveyUnitQualityToolPerretAdapterStub();
private final DataProcessingContextPersistancePortStub dataProcessingContextPersistancePortStub =
@@ -79,7 +84,12 @@ public void saveAsRawJson(RawResponseDto dto) {
RawResponseApiPort rawResponseApiPortStub = new RawResponseApiPort() {
@Override
- public List getRawResponses(String questionnaireModelId, Mode mode, List interrogationIdList) {
+ public List getRawResponses(String questionnaireModelId, Mode mode, List interrogationIdList) {
+ return List.of();
+ }
+
+ @Override
+ public List getRawResponsesByInterrogationID(String interrogationId) {
return List.of();
}
@@ -94,7 +104,7 @@ public DataProcessResult processRawResponses(String collectionInstrumentId) thro
}
@Override
- public List convertRawResponse(List rawResponses, VariablesMap variablesMap) {
+ public List convertRawResponse(List rawResponsModels, VariablesMap variablesMap) {
return List.of();
}
@@ -107,6 +117,10 @@ public List getUnprocessedCollectionInstrumentIds() {
public void updateProcessDates(List surveyUnitModels) {
}
+ @Override
+ public Page findRawResponseDataByCampaignIdAndDate(String campaignId, Instant startDate, Instant endDate, Pageable pageable) {
+ return rawResponseDataPersistanceStub.findByCampaignIdAndDate(campaignId, startDate, endDate, pageable);
+ }
};
private final RawResponseController rawResponseController = new RawResponseController(lunaticJsonRawDataApiPort, rawResponseApiPortStub, rawResponseInputRepositoryStub);
@@ -116,7 +130,7 @@ public void updateProcessDates(List surveyUnitModels) {
void saveJsonRawDataFromStringTest() throws Exception {
//GIVEN
lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
- String campaignId = "SAMPLETEST-PARADATA-v1";
+ String campaignId = "SAMPLETEST-PARADATA-V1";
String questionnaireId = "testIdQuest".toUpperCase();
String interrogationId = "testinterrogationId";
String idUE = "testIdUE";
@@ -195,7 +209,7 @@ void processJsonRawDataTest(){
lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
surveyUnitPersistencePortStub.getMongoStub().clear();
surveyUnitQualityToolPerretAdapterStub.getReceivedMaps().clear();
- String campaignId = "SAMPLETEST-PARADATA-v2";
+ String campaignId = "SAMPLETEST-PARADATA-V2";
String questionnaireId = campaignId + "_quest";
String interrogationId = "testinterrogationId1";
String idUE = "testIdUE1";
@@ -255,7 +269,7 @@ void processJsonRawDataV2Test(){
lunaticJsonRawDataPersistanceStub.getMongoStub().clear();
surveyUnitPersistencePortStub.getMongoStub().clear();
surveyUnitQualityToolPerretAdapterStub.getReceivedMaps().clear();
- String questionnaireId = "SAMPLETEST-PARADATA-v2";
+ String questionnaireId = "SAMPLETEST-PARADATA-V2";
String interrogationId = "testinterrogationId1";
String idUE = "testIdUE1";
String varName = "AVIS_MAIL";
@@ -309,11 +323,10 @@ void processJsonRawDataV2Test(){
.contains(interrogationId);
}
-
@Test
- void getRawResponsesFromJsonBody() {
+ void getLunaticJsonRawDataModelFromJsonBody() {
//GIVEN
- String campaignId = "getRawResponsesFromJsonBody";
+ String campaignId = "getLunaticJsonRawDataModelFromJsonBody";
String questionnaireId = campaignId + "_quest";
String interrogationId = "getRawResponsesFromJsonBody_id1";
String varName = "VARName1";
@@ -330,7 +343,29 @@ void getRawResponsesFromJsonBody() {
int page=0, size= 10;
//WHEN
- ResponseEntity> response = rawResponseController.getRawResponsesFromJsonBody(campaignId, starDate, endDate, page, size);
+ ResponseEntity> response = rawResponseController.getLunaticJsonRawDataModelFromJsonBody(campaignId, starDate, endDate, page, size);
+
+ //THEN
+ Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
+ Assertions.assertThat(response.getBody()).isNotNull();
+ Assertions.assertThat(response.getBody().getContent()).hasSize(1);
+ }
+
+ @Test
+ void getRawResponsesFromJsonBody() {
+ //GIVEN
+ String campaignId = "getRawResponsesFromJsonBody";
+ String questionnaireId = campaignId + "_quest";
+ String interrogationId = "getRawResponsesFromJsonBody_id1";
+ Instant recordDate = Instant.parse("2025-01-01T01:00:00.000Z");
+
+ addJsonRawResponseDataDocumentToStub(campaignId, questionnaireId, interrogationId);
+
+ Instant starDate= recordDate.minusSeconds(86400),endDate = recordDate.plusSeconds(86400);
+ int page=0, size= 10;
+
+ //WHEN
+ ResponseEntity> response = rawResponseController.getRawResponsesFromJsonBody(campaignId, starDate, endDate, page, size);
//THEN
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
@@ -380,4 +415,15 @@ private void addJsonRawDataDocumentToStub(String campaignId,
lunaticJsonRawDataPersistanceStub.getMongoStub().add(lunaticJsonDataDocument);
}
+
+ private void addJsonRawResponseDataDocumentToStub(String campaignId, String questionnaireId, String interrogationId) {
+ RawResponseDocument rawResponseDocument = RawResponseDocument.builder()
+ .campaignId(campaignId)
+ .collectionInstrumentId(questionnaireId)
+ .interrogationId(interrogationId)
+ .recordDate(LocalDateTime.now())
+ .build();
+
+ rawResponseDataPersistanceStub.getMongoStub().add(rawResponseDocument);
+ }
}
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerUnitTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerUnitTest.java
new file mode 100644
index 00000000..9d23152e
--- /dev/null
+++ b/src/test/java/fr/insee/genesis/controller/rest/responses/RawResponseControllerUnitTest.java
@@ -0,0 +1,49 @@
+package fr.insee.genesis.controller.rest.responses;
+
+import fr.insee.genesis.domain.ports.api.LunaticJsonRawDataApiPort;
+import fr.insee.genesis.domain.ports.api.RawResponseApiPort;
+import fr.insee.genesis.infrastructure.repository.RawResponseInputRepository;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.http.ResponseEntity;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+
+class RawResponseControllerUnitTest {
+
+ static RawResponseController rawResponseController;
+ static LunaticJsonRawDataApiPort lunaticJsonRawDataStub;
+
+ @BeforeEach
+ void init(){
+ lunaticJsonRawDataStub = mock(LunaticJsonRawDataApiPort.class);
+ rawResponseController = new RawResponseController(
+ lunaticJsonRawDataStub,
+ mock(RawResponseApiPort.class),
+ mock(RawResponseInputRepository.class)
+ );
+ }
+
+
+ @Test
+ void getUnprocessedJsonRawDataQuestionnairesIds_test(){
+ // GIVEN
+ Set questionnaireIds = new HashSet<>();
+ questionnaireIds.add("QUEST1");
+ questionnaireIds.add("QUEST2");
+ doReturn(questionnaireIds).when(lunaticJsonRawDataStub).getUnprocessedDataQuestionnaireIds();
+
+ // WHEN
+ ResponseEntity> response = rawResponseController.getUnprocessedJsonRawDataQuestionnairesIds();
+
+ // THEN
+ Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
+ Assertions.assertThat(response.getBody()).isNotNull().containsExactlyInAnyOrder("QUEST1","QUEST2");
+ }
+
+}
diff --git a/src/test/java/fr/insee/genesis/controller/rest/responses/ResponseControllerTest.java b/src/test/java/fr/insee/genesis/controller/rest/responses/ResponseControllerTest.java
index 0a01d0a0..d8f3ac38 100644
--- a/src/test/java/fr/insee/genesis/controller/rest/responses/ResponseControllerTest.java
+++ b/src/test/java/fr/insee/genesis/controller/rest/responses/ResponseControllerTest.java
@@ -42,6 +42,10 @@
import java.util.ArrayList;
import java.util.List;
+import static fr.insee.genesis.TestConstants.DEFAULT_COLLECTION_INSTRUMENT_ID;
+import static fr.insee.genesis.TestConstants.DEFAULT_INTERROGATION_ID;
+import static fr.insee.genesis.TestConstants.DEFAULT_SURVEY_UNIT_ID;
+
class ResponseControllerTest {
//Given
static ResponseController responseControllerStatic;
@@ -51,11 +55,6 @@ class ResponseControllerTest {
static List interrogationIdList;
//Constants
- static final String DEFAULT_INTERROGATION_ID = "TESTINTERROGATIONID";
- static final String DEFAULT_QUESTIONNAIRE_ID = "TESTQUESTIONNAIREID";
- static final String DEFAULT_ID_UE = "TESTIDUE";
- static final String CAMPAIGN_ID_WITH_DDI = "SAMPLETEST-PARADATA-v1";
- static final String QUESTIONNAIRE_ID_WITH_DDI = "quest_model_famille_AD_ttp".toUpperCase();
@BeforeAll
static void init() {
@@ -100,8 +99,8 @@ void reset() throws IOException {
@Test
void saveResponseFromXMLFileTest() throws Exception {
responseControllerStatic.saveResponsesFromXmlFile(
- Path.of(TestConstants.TEST_RESOURCES_DIRECTORY, "IN/WEB/SAMPLETEST-PARADATA-v1/reponse-platine/data.complete.validated.STPDv1.20231122164209.xml").toString()
- , Path.of(TestConstants.TEST_RESOURCES_DIRECTORY, "specs/SAMPLETEST-PARADATA-v1/ddi-SAMPLETEST-PARADATA-v1.xml").toString()
+ Path.of(TestConstants.TEST_RESOURCES_DIRECTORY, "IN/WEB/SAMPLETEST-PARADATA-V1/reponse-platine/data.complete.validated.STPDv1.20231122164209.xml").toString()
+ , Path.of(TestConstants.TEST_RESOURCES_DIRECTORY, "specs/SAMPLETEST-PARADATA-V1/ddi-SAMPLETEST-PARADATA-V1.xml").toString()
, Mode.WEB
);
@@ -121,7 +120,7 @@ void saveOneFileNoCollected_NoNullPointerException(){
@Test
void saveResponsesFromXmlCampaignFolderTest() throws Exception {
responseControllerStatic.saveResponsesFromXmlCampaignFolder(
- "SAMPLETEST-PARADATA-v1"
+ "SAMPLETEST-PARADATA-V1"
, Mode.WEB
);
@@ -152,48 +151,48 @@ void saveResponsesFromAllCampaignFoldersTests(){
//Gets
@Test
void findResponsesByUEAndQuestionnaireTest() {
- ResponseEntity> response = responseControllerStatic.findResponsesByInterrogationAndCollectionInstrument(DEFAULT_INTERROGATION_ID, DEFAULT_QUESTIONNAIRE_ID);
+ ResponseEntity> response = responseControllerStatic.findResponsesByInterrogationAndCollectionInstrument(DEFAULT_INTERROGATION_ID, DEFAULT_COLLECTION_INSTRUMENT_ID);
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty();
Assertions.assertThat(response.getBody().getFirst().getInterrogationId()).isEqualTo(DEFAULT_INTERROGATION_ID);
- Assertions.assertThat(response.getBody().getFirst().getUsualSurveyUnitId()).isEqualTo(DEFAULT_ID_UE);
- Assertions.assertThat(response.getBody().getFirst().getCollectionInstrumentId()).isEqualTo(DEFAULT_QUESTIONNAIRE_ID);
+ Assertions.assertThat(response.getBody().getFirst().getUsualSurveyUnitId()).isEqualTo(DEFAULT_SURVEY_UNIT_ID);
+ Assertions.assertThat(response.getBody().getFirst().getCollectionInstrumentId()).isEqualTo(DEFAULT_COLLECTION_INSTRUMENT_ID);
}
@Test
void getLatestByUETest() {
Utils.addAdditionalSurveyUnitModelToMongoStub(surveyUnitPersistencePortStub);
- ResponseEntity> response = responseControllerStatic.getLatestByInterrogationAndCollectionInstrument(DEFAULT_INTERROGATION_ID, DEFAULT_QUESTIONNAIRE_ID);
+ ResponseEntity> response = responseControllerStatic.getLatestByInterrogationAndCollectionInstrument(DEFAULT_INTERROGATION_ID, DEFAULT_COLLECTION_INSTRUMENT_ID);
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty();
Assertions.assertThat(response.getBody().getFirst().getInterrogationId()).isEqualTo(DEFAULT_INTERROGATION_ID);
- Assertions.assertThat(response.getBody().getFirst().getUsualSurveyUnitId()).isEqualTo(DEFAULT_ID_UE);
- Assertions.assertThat(response.getBody().getFirst().getCollectionInstrumentId()).isEqualTo(DEFAULT_QUESTIONNAIRE_ID);
+ Assertions.assertThat(response.getBody().getFirst().getUsualSurveyUnitId()).isEqualTo(DEFAULT_SURVEY_UNIT_ID);
+ Assertions.assertThat(response.getBody().getFirst().getCollectionInstrumentId()).isEqualTo(DEFAULT_COLLECTION_INSTRUMENT_ID);
Assertions.assertThat(response.getBody().getFirst().getFileDate()).hasMonth(Month.FEBRUARY);
}
@Test
void getLatestByUEOneObjectTest() {
- ResponseEntity response = responseControllerStatic.getLatestByInterrogationOneObject(DEFAULT_INTERROGATION_ID, DEFAULT_QUESTIONNAIRE_ID, Mode.WEB);
+ ResponseEntity response = responseControllerStatic.getLatestByInterrogationOneObject(DEFAULT_INTERROGATION_ID, DEFAULT_COLLECTION_INSTRUMENT_ID, Mode.WEB);
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(response.getBody()).isNotNull();
Assertions.assertThat(response.getBody().getInterrogationId()).isEqualTo(DEFAULT_INTERROGATION_ID);
- Assertions.assertThat(response.getBody().getUsualSurveyUnitId()).isEqualTo(DEFAULT_ID_UE);
- Assertions.assertThat(response.getBody().getCollectionInstrumentId()).isEqualTo(DEFAULT_QUESTIONNAIRE_ID);
+ Assertions.assertThat(response.getBody().getUsualSurveyUnitId()).isEqualTo(DEFAULT_SURVEY_UNIT_ID);
+ Assertions.assertThat(response.getBody().getCollectionInstrumentId()).isEqualTo(DEFAULT_COLLECTION_INSTRUMENT_ID);
}
@Test
void getLatestForUEListTest() {
- ResponseEntity> response = responseControllerStatic.getLatestForInterrogationListAndCollectionInstrument(DEFAULT_QUESTIONNAIRE_ID, interrogationIdList);
+ ResponseEntity> response = responseControllerStatic.getLatestForInterrogationListAndCollectionInstrument(DEFAULT_COLLECTION_INSTRUMENT_ID, interrogationIdList);
Assertions.assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
Assertions.assertThat(response.getBody()).isNotNull().isNotEmpty();
Assertions.assertThat(response.getBody().getFirst().getInterrogationId()).isEqualTo(DEFAULT_INTERROGATION_ID);
- Assertions.assertThat(response.getBody().getFirst().getUsualSurveyUnitId()).isEqualTo(DEFAULT_ID_UE);
+ Assertions.assertThat(response.getBody().getFirst().getUsualSurveyUnitId()).isEqualTo(DEFAULT_SURVEY_UNIT_ID);
}
// Perret tests
@@ -236,9 +235,9 @@ void getLatestByStatesSurveyDataTest() throws GenesisException {
//WHEN
- ResponseEntity