Merge pull request #228 from InseeFr/fix/null-state-data

fix: check state data dates only when non null dates are used
InseeFr · Apr 8, 2024 · 52223fb · 52223fb
2 parents a157b73 + 8449bcf
commit 52223fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     <description>Modules for queen back-office</description>
 
     <properties>
-        <revision>4.2.1</revision>
+        <revision>4.2.2</revision>
         <changelist></changelist>
         <java.version>21</java.version>
         <maven.compiler.source>21</maven.compiler.source>

diff --git a/queen-domain/src/main/java/fr/insee/queen/domain/surveyunit/service/StateDataApiService.java b/queen-domain/src/main/java/fr/insee/queen/domain/surveyunit/service/StateDataApiService.java
@@ -37,7 +37,8 @@ public void saveStateData(String surveyUnitId, StateData stateData) throws State
         // update only if incoming state-data is newer
         Long previousDate = previousStateData.get().date();
         Long newDate = stateData.date();
-        if (newDate.compareTo(previousDate) < 0) {
+
+        if (newDate != null && newDate.compareTo(previousDate) < 0) {
             throw new StateDataInvalidDateException(INVALID_DATE_MESSAGE);
         }
         stateDataRepository.save(surveyUnitId, stateData);