replace localDateTime with Instant to correct date reprocessing problems

Hajarel-moukh · Hajarel-moukh · commit 9a4e6ece2d9c · 2026-04-10T13:37:32.000+02:00
diff --git a/src/main/java/fr/insee/genesis/controller/rest/responses/InterrogationController.java b/src/main/java/fr/insee/genesis/controller/rest/responses/InterrogationController.java
@@ -15,6 +15,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -55,17 +56,17 @@ public ResponseEntity<List<InterrogationId>> getAllInterrogationIdsByCollectionI
             @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
             @Parameter(
                     description = "sinceDate",
-                    schema = @Schema(type = "string", format = "date-time", example = "2026-01-01T00:00:00")
+                    schema = @Schema(type = "string", format = "date-time", example = "2026-01-01T00:00:00Z")
             )
-            LocalDateTime start,
+            Instant start,
 
             @RequestParam("end")
             @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
             @Parameter(
                     description = "untilDate",
-                    schema = @Schema(type = "string", format = "date-time", example = "2026-01-31T23:59:59")
+                    schema = @Schema(type = "string", format = "date-time", example = "2026-01-31T23:59:59Z")
             )
-            LocalDateTime end) {
+            Instant end) {
         List<InterrogationId> responses = surveyUnitService.findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(collectionInstrumentId, start,end);
         return ResponseEntity.ok(responses);
     }
diff --git a/src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseReprocessController.java b/src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseReprocessController.java
@@ -17,7 +17,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 @Controller
 @RequiredArgsConstructor
@@ -36,17 +36,21 @@ public ResponseEntity<String> reProcessRawResponsesByCollectionInstrumentId(
             @PathVariable("collectionInstrumentId")
             String collectionInstrumentId,
 
-            @Parameter(description = "Extract since",
-                    schema = @Schema(type = "string", format = "date-time", example = "2026-01-01T00:00:00"))
+            @Parameter(
+                    description = "Extract since",
+                    schema = @Schema(type = "string", format = "date-time", example = "2026-01-01T00:00:00Z")
+            )
             @RequestParam(value = "sinceDate", required = false)
             @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-            LocalDateTime sinceDate,
+            Instant sinceDate,
 
-            @Parameter(description = "Extract until",
-                    schema = @Schema(type = "string", format = "date-time", example = "2026-02-02T00:00:00"))
+            @Parameter(
+                    description = "Extract until",
+                    schema = @Schema(type = "string", format = "date-time", example = "2026-02-02T00:00:00Z")
+            )
             @RequestParam(value = "endDate", required = false)
             @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-            LocalDateTime endDate
+            Instant endDate
     ) throws GenesisException {
 
         DataProcessResult result = reprocessRawResponseApiPort.reprocessRawResponses(
@@ -69,17 +73,21 @@ public ResponseEntity<String> reProcessJsonRawDataByQuestionnaireId(
             @PathVariable("questionnaireId")
             String collectionInstrumentId, // 'questionnaireId' is the legacy name for 'collectionInstrumentId'
 
-            @Parameter(description = "Extract since",
-                    schema = @Schema(type = "string", format = "date-time", example = "2026-01-01T00:00:00"))
+            @Parameter(
+                    description = "Extract since",
+                    schema = @Schema(type = "string", format = "date-time", example = "2026-01-01T00:00:00Z")
+            )
             @RequestParam(value = "sinceDate", required = false)
             @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-            LocalDateTime sinceDate,
+            Instant sinceDate,
 
-            @Parameter(description = "Extract until",
-                    schema = @Schema(type = "string", format = "date-time", example = "2026-02-02T00:00:00"))
+            @Parameter(
+                    description = "Extract until",
+                    schema = @Schema(type = "string", format = "date-time", example = "2026-02-02T00:00:00Z")
+            )
             @RequestParam(value = "endDate", required = false)
             @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-            LocalDateTime endDate
+            Instant endDate
     ) throws GenesisException {
 
         DataProcessResult result = reprocessRawResponseApiPort.reprocessRawResponses(
diff --git a/src/main/java/fr/insee/genesis/domain/ports/api/ReprocessRawResponseApiPort.java b/src/main/java/fr/insee/genesis/domain/ports/api/ReprocessRawResponseApiPort.java
@@ -4,7 +4,7 @@
 import fr.insee.genesis.domain.model.surveyunit.rawdata.RawDataModelType;
 import fr.insee.genesis.exceptions.GenesisException;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 public interface ReprocessRawResponseApiPort {
 
@@ -20,7 +20,7 @@ public interface ReprocessRawResponseApiPort {
      */
     DataProcessResult reprocessRawResponses(
             RawDataModelType rawDataModelType,
-            String collectionInstrumentId, LocalDateTime sinceDate, LocalDateTime endDate)
+            String collectionInstrumentId, Instant sinceDate, Instant endDate)
             throws GenesisException;
 
 }
diff --git a/src/main/java/fr/insee/genesis/domain/ports/api/SurveyUnitApiPort.java b/src/main/java/fr/insee/genesis/domain/ports/api/SurveyUnitApiPort.java
@@ -7,6 +7,7 @@
 import fr.insee.genesis.domain.model.surveyunit.SurveyUnitModel;
 import fr.insee.genesis.exceptions.GenesisException;
 
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
@@ -48,7 +49,7 @@ List<SurveyUnitSimplifiedDto> findSimplifiedByCollectionInstrumentIdAndInterroga
 
     List<InterrogationId> findDistinctInterrogationIdsByQuestionnaireIdAndDateAfter(String questionnaireId, LocalDateTime since);
 
-    List<InterrogationId> findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(String collectionInstrumentId, LocalDateTime start, LocalDateTime end);
+    List<InterrogationId> findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(String collectionInstrumentId, Instant start, Instant end);
 
     //========= OPTIMISATIONS PERFS (START) ==========
     long countResponsesByCollectionInstrumentId(String questionnaireId);
diff --git a/src/main/java/fr/insee/genesis/domain/ports/spi/RawResponseReprocessPersistencePort.java b/src/main/java/fr/insee/genesis/domain/ports/spi/RawResponseReprocessPersistencePort.java
@@ -1,6 +1,6 @@
 package fr.insee.genesis.domain.ports.spi;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.Set;
 
 public interface RawResponseReprocessPersistencePort {
@@ -9,7 +9,7 @@ Set<String> findProcessedInterrogationIdsByCollectionInstrumentId(
             String collectionInstrumentId);
 
     Set<String> findProcessedInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
-            String collectionInstrumentId, LocalDateTime sinceDate, LocalDateTime endDate);
+            String collectionInstrumentId, Instant sinceDate, Instant endDate);
 
     void resetProcessDates(String collectionInstrumentId, Set<String> interrogationIds);
 
diff --git a/src/main/java/fr/insee/genesis/domain/service/rawdata/ReprocessRawResponseService.java b/src/main/java/fr/insee/genesis/domain/service/rawdata/ReprocessRawResponseService.java
@@ -15,7 +15,7 @@
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Set;
 
@@ -42,8 +42,8 @@ private enum InputFilterType {
     public DataProcessResult reprocessRawResponses(
             @NonNull RawDataModelType rawDataModelType,
             @NonNull String collectionInstrumentId,
-            LocalDateTime sinceDate,
-            LocalDateTime endDate) throws GenesisException {
+            Instant sinceDate,
+            Instant endDate) throws GenesisException {
 
         log.info("Start reprocess {} data for collectionInstrumentId={}, sinceDate={}, endDate={}",
                 rawDataModelType, collectionInstrumentId, sinceDate, endDate);
@@ -68,7 +68,7 @@ public DataProcessResult reprocessRawResponses(
         return reprocessInterrogations(rawDataModelType, collectionInstrumentId, interrogationIds);
     }
 
-    private static InputFilterType validateInputs(LocalDateTime sinceDate, LocalDateTime endDate) {
+    private static InputFilterType validateInputs(Instant sinceDate, Instant endDate) {
         if (bothDatesAreNull(sinceDate, endDate)) {
             return InputFilterType.COLLECTION_ID;
         }
@@ -81,18 +81,18 @@ private static InputFilterType validateInputs(LocalDateTime sinceDate, LocalDate
         return InputFilterType.COLLECTION_ID_AND_DATE;
     }
 
-    private static boolean endIsBeforeSince(LocalDateTime sinceDate, LocalDateTime endDate) {
+    private static boolean endIsBeforeSince(Instant sinceDate, Instant endDate) {
         return endDate != null && endDate.isBefore(sinceDate);
     }
 
-    private static boolean bothDatesAreNull(LocalDateTime sinceDate, LocalDateTime endDate) {
+    private static boolean bothDatesAreNull(Instant sinceDate, Instant endDate) {
         return sinceDate == null && endDate == null;
     }
 
-    private static LocalDateTime effectiveEndDate(LocalDateTime endDate) {
+    private static Instant effectiveEndDate(Instant endDate) {
         if (endDate != null)
             return endDate;
-        var now = LocalDateTime.now();
+        var now = Instant.now();
         log.info("Effective end date: {}", now);
         return now;
     }
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
@@ -19,7 +19,6 @@
 
 import java.time.Instant;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -383,19 +382,15 @@ public List<InterrogationId> findDistinctInterrogationIdsByQuestionnaireIdAndDat
     @Override
     public List<InterrogationId> findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
             String collectionInstrumentId,
-            LocalDateTime start,
-            LocalDateTime end
+            Instant start,
+            Instant end
     ) {
-        ZoneId zone = ZoneId.of("Europe/Paris");
-
-        Instant startInstant = start.atZone(zone).toInstant();
-        Instant endInstant = end.atZone(zone).toInstant();
 
         return surveyUnitPersistencePort
                 .findInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
                         collectionInstrumentId,
-                        startInstant,
-                        endInstant
+                        start,
+                        end
                 )
                 .stream()
                 .map(su -> new InterrogationId(su.getInterrogationId()))
diff --git a/src/main/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonReprocessMongoAdapter.java b/src/main/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonReprocessMongoAdapter.java
@@ -11,7 +11,7 @@
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -36,7 +36,7 @@ public Set<String> findProcessedInterrogationIdsByCollectionInstrumentId(String
      */
     @Override
     public Set<String> findProcessedInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
-            String questionnaireId, LocalDateTime sinceDate, LocalDateTime endDate) {
+            String questionnaireId, Instant sinceDate, Instant endDate) {
         return new HashSet<>(
                 repository.findProcessedInterrogationIdsByQuestionnaireIdAndRecordDateBetween(
                         questionnaireId, sinceDate, endDate));
diff --git a/src/main/java/fr/insee/genesis/infrastructure/adapter/RawResponseReprocessMongoAdapter.java b/src/main/java/fr/insee/genesis/infrastructure/adapter/RawResponseReprocessMongoAdapter.java
@@ -11,7 +11,7 @@
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -30,7 +30,7 @@ public Set<String> findProcessedInterrogationIdsByCollectionInstrumentId(String
 
     @Override
     public Set<String> findProcessedInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
-            String collectionInstrumentId, LocalDateTime sinceDate, LocalDateTime endDate) {
+            String collectionInstrumentId, Instant sinceDate, Instant endDate) {
         return new HashSet<>(
                 repository.findProcessedInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
                         collectionInstrumentId, sinceDate, endDate));
diff --git a/src/main/java/fr/insee/genesis/infrastructure/repository/LunaticJsonMongoDBRepository.java b/src/main/java/fr/insee/genesis/infrastructure/repository/LunaticJsonMongoDBRepository.java
@@ -120,8 +120,8 @@ public interface LunaticJsonMongoDBRepository extends MongoRepository<LunaticJso
     })
     List<String> findProcessedInterrogationIdsByQuestionnaireIdAndRecordDateBetween(
             String questionnaireId,
-            LocalDateTime sinceDate,
-            LocalDateTime endDate
+            Instant sinceDate,
+            Instant endDate
     );
 
     @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
@@ -10,7 +10,6 @@
 import org.springframework.stereotype.Repository;
 
 import java.time.Instant;
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Repository
@@ -32,8 +31,8 @@ public interface RawResponseRepository extends MongoRepository<RawResponseDocume
     })
     List<String> findProcessedInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
             String collectionInstrumentId,
-            LocalDateTime sinceDate,
-            LocalDateTime endDate
+            Instant sinceDate,
+            Instant endDate
     );
 
     @Aggregation(pipeline = {
diff --git a/src/test/java/fr/insee/genesis/domain/service/rawdata/LunaticRawDataReprocessTest.java b/src/test/java/fr/insee/genesis/domain/service/rawdata/LunaticRawDataReprocessTest.java
@@ -10,7 +10,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 
 class LunaticRawDataReprocessTest {
 
@@ -44,7 +46,7 @@ void reprocessRawData_should_return_empty_result_when_no_processed_interrogation
     @Test
     void reprocessRawData_should_throw_when_endDate_is_provided_without_sinceDate() {
         String questionnaireId = "TESTIDQUEST";
-        LocalDateTime endDate = LocalDateTime.now();
+        Instant endDate = Instant.now();
 
         Assertions.assertThatThrownBy(() ->
                         reprocessRawResponseService.reprocessRawResponses(
@@ -56,8 +58,8 @@ void reprocessRawData_should_throw_when_endDate_is_provided_without_sinceDate()
     @Test
     void reprocessRawData_should_throw_when_endDate_is_before_sinceDate() {
         String questionnaireId = "TESTIDQUEST";
-        LocalDateTime sinceDate = LocalDateTime.of(2024, 1, 10, 10, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 9, 10, 0);
+        Instant sinceDate = LocalDateTime.of(2024, 1, 10, 10, 0).toInstant(ZoneOffset.UTC);
+        Instant endDate = LocalDateTime.of(2024, 1, 9, 10, 0).toInstant(ZoneOffset.UTC);
 
         Assertions.assertThatThrownBy(() ->
                 reprocessRawResponseService.reprocessRawResponses(
diff --git a/src/test/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitServiceTest.java b/src/test/java/fr/insee/genesis/domain/service/surveyunit/SurveyUnitServiceTest.java
@@ -18,6 +18,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.Month;
 import java.util.ArrayList;
@@ -270,8 +271,8 @@ void findDistinctInterrogationIdsByQuestionnaireIdAndDateAfterTest_doc_in_period
     void findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetweenTest_no_doc_in_period() {
         addAdditionnalSurveyUnitModelToMongoStub();
 
-        LocalDateTime start = LocalDateTime.of(2025, 9, 1, 0, 0, 0);
-        LocalDateTime end   = LocalDateTime.of(2025, 9, 2, 0, 0, 0);
+        Instant start = Instant.parse("2025-09-01T00:00:00Z");
+        Instant end   = Instant.parse("2025-09-02T00:00:00Z");
 
         Assertions.assertThat(
                         surveyUnitServiceStatic.findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
@@ -285,8 +286,8 @@ void findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetweenTes
     void findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetweenTest_doc_in_period() {
         addAdditionnalSurveyUnitModelToMongoStub();
 
-        LocalDateTime start = LocalDateTime.of(2022, 1, 1, 0, 0, 0);
-        LocalDateTime end   = LocalDateTime.of(2026, 1, 1, 0, 0, 0);
+        Instant start = Instant.parse("2022-01-01T00:00:00Z");
+        Instant end   = Instant.parse("2026-01-01T00:00:00Z");
 
         Assertions.assertThat(
                         surveyUnitServiceStatic.findDistinctInterrogationIdsByCollectionInstrumentIdAndRecordDateBetween(
diff --git a/src/test/java/fr/insee/genesis/stubs/LunaticJsonMongoDBRepositoryStub.java b/src/test/java/fr/insee/genesis/stubs/LunaticJsonMongoDBRepositoryStub.java
@@ -13,6 +13,7 @@
 
 import java.time.LocalDateTime;
 import java.time.Instant;
+import java.time.chrono.ChronoLocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -209,15 +210,15 @@ public List<String> findProcessedInterrogationIdsByQuestionnaireId(String questi
     @Override
     public List<String> findProcessedInterrogationIdsByQuestionnaireIdAndRecordDateBetween(
             String questionnaireId,
-            LocalDateTime sinceDate,
-            LocalDateTime endDate
+            Instant sinceDate,
+            Instant endDate
     ) {
         return documents.stream()
                 .filter(doc -> Objects.equals(doc.questionnaireId(), questionnaireId))
                 .filter(doc -> doc.processDate() != null)
                 .filter(doc -> doc.recordDate() != null)
-                .filter(doc -> !doc.recordDate().isBefore(sinceDate))
-                .filter(doc -> !doc.recordDate().isAfter(endDate))
+                .filter(doc -> !doc.recordDate().isBefore(ChronoLocalDateTime.from(sinceDate)))
+                .filter(doc -> !doc.recordDate().isAfter(ChronoLocalDateTime.from(endDate)))
                 .map(LunaticJsonRawDataDocument::interrogationId)
                 .distinct()
                 .toList();
diff --git a/src/test/java/fr/insee/genesis/stubs/RawResponseDataPersistanceStub.java b/src/test/java/fr/insee/genesis/stubs/RawResponseDataPersistanceStub.java
@@ -12,7 +12,6 @@
 import org.springframework.data.domain.Pageable;
 
 import java.time.Instant;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
diff --git a/src/test/java/fr/insee/genesis/stubs/RawResponseReprocessPersistenceStub.java b/src/test/java/fr/insee/genesis/stubs/RawResponseReprocessPersistenceStub.java
