Fix csv param bugs

Author: cosmin-marginean

gradle.properties

@@ -1,4 +1,4 @@
-invirtVersion = 1.2.0
+invirtVersion = 1.2.1
 
 kafkaVersion = 3.8.0
 kotlinVersion = 2.0.0

invirt-core/src/main/kotlin/invirt/core/uri.kt

@@ -63,7 +63,7 @@ fun Uri.csvAppend(name: String, value: Any): Uri = replaceQuery(
 )
 
 fun Uri.csvRemove(name: String, value: Any): Uri {
-    val values = csvQuery(name).minus(value).toSet()
+    val values = csvQuery(name).toMutableSet().filter { it != value.toString() }
     return if (values.isEmpty()) {
         removeQuery(name)
     } else {
@@ -73,7 +73,7 @@ fun Uri.csvRemove(name: String, value: Any): Uri {
 
 fun Uri.csvToggle(name: String, value: Any): Uri {
     val values = csvQuery(name)
-    return if (values.contains(value)) {
+    return if (values.contains(value.toString())) {
         csvRemove(name, value)
     } else {
         csvAppend(name, value)

invirt-core/src/test/kotlin/invirt/core/UriTest.kt

@@ -88,13 +88,15 @@ class UriTest : StringSpec({
         Uri.of("/test?q=John").csvRemove("q", "John").toString() shouldBe "/test"
         Uri.of("/test?q=John%2CJane").csvRemove("q", "Jane").toString() shouldBe "/test?q=John"
         Uri.of("/test?q=John,Jane").csvRemove("q", "John").toString() shouldBe "/test?q=Jane"
+        Uri.of("/test?q=3,5").csvRemove("q", 3).toString() shouldBe "/test?q=5"
     }
 
     "csvToggle" {
         Uri.of("/test").csvToggle("q", "John").toString() shouldBe "/test?q=John"
         Uri.of("/test?q=John").csvToggle("q", "John").toString() shouldBe "/test"
         Uri.of("/test?q=John").csvToggle("q", "Jane").toString() shouldBe "/test?q=John%2CJane"
         Uri.of("/test?q=John%2CJane").csvToggle("q", "Jane").toString() shouldBe "/test?q=John"
-        Uri.of("/test?q=John%2CJane").csvToggle("q", "John").toString() shouldBe "/test?q=Jane"
+        Uri.of("/test?q=John,Jane").csvToggle("q", "John").toString() shouldBe "/test?q=Jane"
+        Uri.of("/test?q=1,2").csvToggle("q", 2).toString() shouldBe "/test?q=1"
     }
 })