feat: amino acid and nucleotide insertion filters are case-insensitive

GenSpectrum · Jan 23, 2024 · 667f487 · 667f487
1 parent aed296f
commit 667f487
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/lapis2/src/main/kotlin/org/genspectrum/lapis/request/AminoAcidInsertion.kt b/lapis2/src/main/kotlin/org/genspectrum/lapis/request/AminoAcidInsertion.kt
@@ -51,6 +51,9 @@ data class AminoAcidInsertion(val position: Int, val gene: String, val insertion
 private val AMINO_ACID_INSERTION_REGEX =
     Regex(
         """^ins_(?<gene>[a-zA-Z0-9_-]+):(?<position>\d+):(?<insertions>(([a-zA-Z?]|(\.\*))+))$""",
+        setOf(
+            RegexOption.IGNORE_CASE,
+        ),
     )
 
 @JsonComponent

diff --git a/lapis2/src/main/kotlin/org/genspectrum/lapis/request/NucleotideInsertion.kt b/lapis2/src/main/kotlin/org/genspectrum/lapis/request/NucleotideInsertion.kt
@@ -51,6 +51,9 @@ data class NucleotideInsertion(val position: Int, val insertions: String, val se
 private val NUCLEOTIDE_INSERTION_REGEX =
     Regex(
         """^ins_((?<segment>[a-zA-Z0-9_-]+)(?=:):)?(?<position>\d+):(?<insertions>(([a-zA-Z?]|(\.\*))+))$""",
+        setOf(
+            RegexOption.IGNORE_CASE,
+        ),
     )
 
 @JsonComponent

diff --git a/lapis2/src/test/kotlin/org/genspectrum/lapis/request/AminoAcidInsertionTest.kt b/lapis2/src/test/kotlin/org/genspectrum/lapis/request/AminoAcidInsertionTest.kt
@@ -88,6 +88,10 @@ class AminoAcidInsertionTest {
                     "\"ins_gEne1:123:ABCD\"",
                     AminoAcidInsertion(123, "gene1", "ABCD"),
                 ),
+                Arguments.of(
+                    "\"INs_gEne1:123:ABCD\"",
+                    AminoAcidInsertion(123, "gene1", "ABCD"),
+                ),
             )
 
         @JvmStatic

diff --git a/lapis2/src/test/kotlin/org/genspectrum/lapis/request/NucleotideInsertionTest.kt b/lapis2/src/test/kotlin/org/genspectrum/lapis/request/NucleotideInsertionTest.kt
@@ -96,6 +96,10 @@ class NucleotideInsertionTest {
                     "\"ins_oTher_segmenT:123:ABCD\"",
                     NucleotideInsertion(123, "ABCD", "other_segment"),
                 ),
+                Arguments.of(
+                    "\"INs_123:AcCD\"",
+                    NucleotideInsertion(123, "ACCD", null),
+                ),
             )
 
         @JvmStatic