feat: add 'at least 4 digits' in control

InseeFr · Dec 5, 2024 · d1cb516 · d1cb516
1 parent 7d2c8a7
commit d1cb516
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -16,7 +16,7 @@ java {
 
 allprojects {
     group = "fr.insee.eno"
-    version = "3.30.0-SNAPSHOT"
+    version = "3.30.0-SNAPSHOT.1"
 }
 
 subprojects {

diff --git a/...src/main/java/fr/insee/eno/core/processing/out/steps/lunatic/LunaticAddControlFormat.java b/...src/main/java/fr/insee/eno/core/processing/out/steps/lunatic/LunaticAddControlFormat.java
@@ -154,6 +154,8 @@ private void createFormatControlsForDatepicker(Datepicker datepicker) {
         Optional<ControlType> controlBounds = getFormatControlFromDatepickerAttributes(id, minValue, maxValue, format, responseName);
         controlBounds.ifPresent(controls::addFirst);
         controlYearFormat.ifPresent(controls::addFirst);
+        // Note: it's important that the year format is added in first position, since in some cases only the message
+        // of the first control is displayed.
     }
 
     /**
@@ -198,9 +200,10 @@ private Optional<ControlType> generateDatepickerYearControl(String id, String fo
             return Optional.empty();
         }
         String controlId = id + "-format-year";
-        String expression = String.format(
-                "not(not(isnull(%s)) and cast(cast(cast(%s, date, \"%s\"), string, \"YYYY\"), integer) <= 999)",
-                responseName, responseName, format);
+        String expression = String.format("not(not(isnull(%s)) and (" +
+                        "cast(cast(cast(%s, date, \"%s\"), string, \"YYYY\"), integer) <= 999 or " +
+                        "cast(cast(cast(%s, date, \"%s\"), string, \"YYYY\"), integer) > 9999))",
+                responseName, responseName, format, responseName, format);
         String message = "\"L'année doit être saisie avec 4 chiffres.\"";
         return Optional.of(createFormatControl(controlId, expression, message));
     }

diff --git a/...test/java/fr/insee/eno/core/processing/out/steps/lunatic/LunaticAddControlFormatTest.java b/...test/java/fr/insee/eno/core/processing/out/steps/lunatic/LunaticAddControlFormatTest.java
@@ -165,8 +165,9 @@ void datepickerYearFormatControl() {
         ControlType yearControl = controls.getFirst();
 
         assertEquals("datepicker-id-format-year", yearControl.getId());
-        String expected = "not(not(isnull(DATE_VAR)) " +
-                "and cast(cast(cast(DATE_VAR, date, \"YYYY-MM-DD\"), string, \"YYYY\"), integer) <= 999)";
+        String expected = "not(not(isnull(DATE_VAR)) and (" +
+                "cast(cast(cast(DATE_VAR, date, \"YYYY-MM-DD\"), string, \"YYYY\"), integer) <= 999 or " +
+                "cast(cast(cast(DATE_VAR, date, \"YYYY-MM-DD\"), string, \"YYYY\"), integer) > 9999))";
         assertEquals(expected, yearControl.getControl().getValue());
         assertEquals(LabelTypeEnum.VTL, yearControl.getControl().getType());
         assertEquals(LabelTypeEnum.VTL_MD, yearControl.getErrorMessage().getType());