fixup! feat(lapis2): allow filtering for null

GenSpectrum · May 7, 2024 · 6f64c53 · 6f64c53
1 parent 3786063
commit 6f64c53
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/lapis2/src/main/kotlin/org/genspectrum/lapis/model/SiloFilterExpressionMapper.kt b/lapis2/src/main/kotlin/org/genspectrum/lapis/model/SiloFilterExpressionMapper.kt
@@ -239,6 +239,10 @@ class SiloFilterExpressionMapper(
         val (_, values, originalKey) = sequenceFilterValue ?: return null
         val value = extractSingleFilterValue(values, originalKey)
 
+        if (value.isNullOrBlank()) {
+            return null
+        }
+
         try {
             return LocalDate.parse(value)
         } catch (exception: DateTimeParseException) {

diff --git a/lapis2/src/test/kotlin/org/genspectrum/lapis/model/SiloFilterExpressionMapperTest.kt b/lapis2/src/test/kotlin/org/genspectrum/lapis/model/SiloFilterExpressionMapperTest.kt
@@ -586,12 +586,24 @@ class SiloFilterExpressionMapperTest {
                     ),
                     And(DateBetween("date", from = null, to = LocalDate.of(2021, 6, 3))),
                 ),
+                Arguments.of(
+                    mapOf(
+                        "dateTo" to listOf(null),
+                    ),
+                    And(DateBetween("date", from = null, to = null)),
+                ),
                 Arguments.of(
                     mapOf(
                         "dateFrom" to listOf("2021-03-28"),
                     ),
                     And(DateBetween("date", from = LocalDate.of(2021, 3, 28), to = null)),
                 ),
+                Arguments.of(
+                    mapOf(
+                        "dateFrom" to listOf(null),
+                    ),
+                    And(DateBetween("date", from = null, to = null)),
+                ),
                 Arguments.of(
                     mapOf(
                         "dateFrom" to listOf("2021-03-28"),

diff --git a/lapis2/src/test/kotlin/org/genspectrum/lapis/silo/SiloQueryTest.kt b/lapis2/src/test/kotlin/org/genspectrum/lapis/silo/SiloQueryTest.kt
@@ -466,7 +466,7 @@ class SiloQueryTest {
                 ),
                 Arguments.of(
                     AminoAcidSymbolEquals("gene name", 1234, "A"),
-                        """
+                    """
                         {
                             "type": "AminoAcidEquals",
                             "sequenceName": "gene name",