Merge branch 'main' into fixGetCollectionInstrumentsWithReview

Author: alexisszmundy

CHANGELOG.md

@@ -1,9 +1,16 @@
 # Changelog
 
-## 2.2.0 [TODO]
+## 2.2.0 [2026-02-05]
 ### Added
 - add isCapturedIndirectly variable to responses
+### Changed
+- Volumetrics endpoint returns content of file after saving
+- Count responses now includes collection instrument id
+### Fixed
+- Raw data volumetrics with modele filiere
 
+### Updated
+- BPM 1.0.25
 ## 2.1.3 [2026-02-03]
 ### Fixed
 - Fixed the way we retrieve the data processing context when we process raw responses

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fr.insee.genesis</groupId>
     <artifactId>genesis-api</artifactId>
-    <version>2.1.3</version>
+    <version>2.2.0</version>
     <packaging>jar</packaging>
     <name>genesis-api</name>
 
@@ -36,7 +36,7 @@
         <pitest.version>1.22.1</pitest.version>
         <pitest.junit.version>1.2.3</pitest.junit.version>
         <jackson.version>2.19.0</jackson.version>
-        <bpm.version>1.0.24</bpm.version>
+        <bpm.version>1.0.25</bpm.version>
     </properties>
     <dependencies>
         <dependency>

src/main/java/fr/insee/genesis/Constants.java

@@ -27,7 +27,8 @@ public class Constants {
     public static final String VOLUMETRY_FOLDER_NAME = "genesis_volumetries";
     public static final String VOLUMETRY_FILE_SUFFIX = "_VOLUMETRY";
     public static final String VOLUMETRY_RAW_FILE_SUFFIX = "_RAW_VOLUMETRY";
-    public static final String VOLUMETRY_FILE_DATE_FORMAT = "yyyy_MM_dd";
+    public static final String VOLUMETRY_RAW_TOTAL = "rawResponsesTotal";
+    public static final String VOLUMETRY_FILE_DATE_FORMAT = "yyyy_MM_dd_HH_mm_ss";
     public static final int VOLUMETRY_FILE_EXPIRATION_DAYS = 30;
     public static final int MAX_LINKS_ALLOWED = 21;
     public static final String PAIRWISE_PREFIX = "LIEN_";

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

@@ -1,12 +1,14 @@
 package fr.insee.genesis.controller.rest;
 
 import fr.insee.genesis.domain.ports.api.LunaticJsonRawDataApiPort;
+import fr.insee.genesis.domain.ports.api.RawResponseApiPort;
 import fr.insee.genesis.domain.ports.api.SurveyUnitApiPort;
 import fr.insee.genesis.domain.service.volumetry.VolumetryLogService;
 import fr.insee.genesis.domain.utils.XMLSplitter;
 import fr.insee.genesis.exceptions.GenesisException;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,24 +19,20 @@
 
 import javax.xml.stream.XMLStreamException;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 @RequestMapping(path = "/")
 @Controller
+@AllArgsConstructor
 @Slf4j
 @Tag(name = "Technical services")
 public class UtilsController implements CommonApiResponse{
 
 	private final VolumetryLogService volumetryLogService;
 	private final SurveyUnitApiPort surveyUnitService;
 	private final LunaticJsonRawDataApiPort lunaticJsonRawDataService;
-
-
-
-	public UtilsController(SurveyUnitApiPort surveyUnitService, VolumetryLogService volumetryLogService, LunaticJsonRawDataApiPort lunaticJsonRawDataService) {
-		this.surveyUnitService = surveyUnitService;
-		this.volumetryLogService = volumetryLogService;
-        this.lunaticJsonRawDataService = lunaticJsonRawDataService;
-    }
+	private final RawResponseApiPort rawResponseApiPort;
 
 
 
@@ -54,9 +52,17 @@ public ResponseEntity<Object> saveResponsesFromXmlFile(@RequestParam("inputFolde
 	@PutMapping(path = "/volumetrics/save-all-campaigns")
 	@PreAuthorize("hasRole('SCHEDULER')")
 	public ResponseEntity<Object> saveVolumetry() throws IOException {
-		volumetryLogService.writeVolumetries(surveyUnitService);
-		volumetryLogService.writeRawDataVolumetries(lunaticJsonRawDataService);
+		String responsesKeyInReturnedMap = "responsesVolumetrics";
+		String rawResponsesKeyInReturnedMap = "rawResponsesVolumetrics";
+		Map<String, Object> volumetricsMap = new HashMap<>();
+		volumetricsMap.put(
+				responsesKeyInReturnedMap,
+				volumetryLogService.writeVolumetries(surveyUnitService));
+		volumetricsMap.put(
+				rawResponsesKeyInReturnedMap,
+				volumetryLogService.writeRawDataVolumetries(lunaticJsonRawDataService, rawResponseApiPort)
+		);
 		volumetryLogService.cleanOldFiles();
-		return ResponseEntity.ok("Volumetric saved");
+		return ResponseEntity.ok(volumetricsMap);
 	}
 }

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

@@ -50,13 +50,15 @@ public ResponseEntity<List<InterrogationId>> getAllInterrogationIdsByQuestionnai
     //========= OPTIMISATIONS PERFS (START) ==========
     /**
      * @author Adrien Marchal
+     * @author Alexis Szmundy
      */
-    @Operation(summary = "Retrieve number of interrogations for a given questionnaire")
+    @Operation(summary = "Retrieve number of interrogations for a given questionnaire/collection instrument")
     @GetMapping(path = "/by-questionnaire/{questionnaireId}/count")
-    public ResponseEntity<Long> countAllInterrogationIdsByQuestionnaire(
-            @Parameter(description = "questionnaireId", required = true) @PathVariable("questionnaireId") String questionnaireId
+    public ResponseEntity<Long> countAllInterrogationIdsByQuestionnaireOrCollectionInstrument(
+            @Parameter(description = "questionnaireId/collectionInstrumentId", required = true) @PathVariable("questionnaireId") String questionnaireId
     ) {
-        Long response = surveyUnitService.countInterrogationIdsByQuestionnaireId(questionnaireId);
+        long response = surveyUnitService.countResponsesByQuestionnaireId(questionnaireId);
+        response += surveyUnitService.countResponsesByCollectionInstrumentId(questionnaireId);
         return ResponseEntity.ok(response);
     }
 

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

@@ -37,10 +37,10 @@ public QuestionnaireController(
 
 
 
-    @Operation(summary = "List questionnaires from responses database")
+    @Operation(summary = "List questionnaires/collection instruments from responses database")
     @GetMapping(path = "/")
     public ResponseEntity<Set<String>> getQuestionnaires() {
-        Set<String> questionnaires = surveyUnitService.findDistinctQuestionnaireIds();
+        Set<String> questionnaires = surveyUnitService.findDistinctQuestionnairesAndCollectionInstrumentIds();
         return ResponseEntity.ok(questionnaires);
     }
 

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

@@ -27,7 +27,7 @@ public interface LunaticJsonRawDataApiPort {
     Set<String> getUnprocessedDataQuestionnaireIds();
     void updateProcessDates(List<SurveyUnitModel> surveyUnitModels);
     Set<String> findDistinctQuestionnaireIds();
-    long countResponsesByQuestionnaireId(String campaignId);
+    long countRawResponsesByQuestionnaireId(String campaignId);
     Page<LunaticJsonRawDataModel> findRawDataByCampaignIdAndDate(String campaignId, Instant  startDt, Instant endDt, Pageable pageable);
 
     List<LunaticJsonRawDataModel> getRawDataByInterrogationId(String interrogationId);

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

@@ -12,6 +12,7 @@
 
 import java.time.Instant;
 import java.util.List;
+import java.util.Set;
 
 public interface RawResponseApiPort {
 
@@ -23,6 +24,10 @@ public interface RawResponseApiPort {
     List<String> getUnprocessedCollectionInstrumentIds();
     void updateProcessDates(List<SurveyUnitModel> surveyUnitModels);
     Page<RawResponseModel> findRawResponseDataByCampaignIdAndDate(String campaignId, Instant startDate, Instant endDate, Pageable pageable);
+
+    long countByCollectionInstrumentId(String collectionInstrumentId);
+
+    Set<String> getDistinctCollectionInstrumentIds();
     Page<RawResponseModel> findRawResponseDataByCollectionInstrumentId(String collectionInstrumentId, Pageable pageable);
 
 }

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

@@ -38,7 +38,7 @@ public interface SurveyUnitApiPort {
     List<InterrogationId> findDistinctInterrogationIdsByQuestionnaireIdAndDateAfter(String questionnaireId, LocalDateTime since);
 
     //========= OPTIMISATIONS PERFS (START) ==========
-    long countInterrogationIdsByQuestionnaireId(String questionnaireId);
+    long countResponsesByCollectionInstrumentId(String questionnaireId);
 
     List<InterrogationId> findDistinctPageableInterrogationIdsByQuestionnaireId(String questionnaireId,
                                                                                 long totalSize, long blockSize, long page);
@@ -67,11 +67,13 @@ List<InterrogationId> findDistinctPageableInterrogationIdsByQuestionnaireId(Stri
     Set<String> findQuestionnaireIdsByCampaignIdV2(String campaignId);
     //========= OPTIMISATIONS PERFS (END) ==========
 
+    @Deprecated
     Set<String> findDistinctCampaignIds();
 
+    @Deprecated
     long countResponsesByCampaignId(String campaignId);
 
-    Set<String> findDistinctQuestionnaireIds();
+    Set<String> findDistinctQuestionnairesAndCollectionInstrumentIds();
 
     List<CampaignWithQuestionnaire> findCampaignsWithQuestionnaires();
 
@@ -84,4 +86,6 @@ List<SurveyUnitModel> parseEditedVariables(SurveyUnitInputDto surveyUnitInputDto
     String findQuestionnaireIdByInterrogationId(String interrogationId) throws GenesisException;
 
     Set<String> findCampaignIdsFrom(SurveyUnitInputDto dto);
+
+    long countResponsesByQuestionnaireId(String questionnaireId);
 }

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

@@ -24,7 +24,7 @@ public interface LunaticJsonRawDataPersistencePort {
     Set<String> findDistinctQuestionnaireIdsByNullProcessDate();
     Set<Mode> findModesByQuestionnaire(String questionnaireId);
     Page<LunaticJsonRawDataModel> findByCampaignIdAndDate(String campaignId, Instant startDt, Instant endDt, Pageable pageable);
-    long countResponsesByQuestionnaireId(String questionnaireId);
+    long countRawResponsesByQuestionnaireId(String questionnaireId);
     List<GroupedInterrogation> findProcessedIdsGroupedByQuestionnaireSince(LocalDateTime since);
     List<GroupedInterrogation> findUnprocessedIds();
     Set<String> findUnprocessedInterrogationIdsByCollectionInstrumentId(String collectionInstrumentId);