Add ticketFilter to getAllTicketingProducts endpoint (#171)

kip-ioki · web-flow · commit 953ecaf9daea · 2025-07-14T11:04:57.000+02:00
diff --git a/library/src/commonMain/kotlin/com/ioki/passenger/api/IokiService.kt b/library/src/commonMain/kotlin/com/ioki/passenger/api/IokiService.kt
@@ -90,8 +90,8 @@ import com.ioki.result.Result
 import io.ktor.client.call.body
 import io.ktor.client.statement.HttpResponse
 import io.ktor.http.isSuccess
-import kotlin.coroutines.cancellation.CancellationException
 import kotlinx.datetime.Instant
+import kotlin.coroutines.cancellation.CancellationException
 
 public fun IokiService(
     baseUrl: String,
@@ -348,6 +348,7 @@ public interface TicketingService {
     public suspend fun getAllTicketingProducts(
         type: ApiTicketingProductFilterType,
         rideId: String?,
+        ticketFilter: Map<String, String>,
         page: Int,
     ): ApiResult<List<ApiTicketingProductResponse>>
 
@@ -783,10 +784,11 @@ private class DefaultIokiService(
     override suspend fun getAllTicketingProducts(
         type: ApiTicketingProductFilterType,
         rideId: String?,
+        ticketFilter: Map<String, String>,
         page: Int,
     ): ApiResult<List<ApiTicketingProductResponse>> =
         apiCall<ApiBody<List<ApiTicketingProductResponse>>, List<ApiTicketingProductResponse>> {
-            getAllTicketingProducts(filter = type.queryValue, rideId = rideId, page = page)
+            getAllTicketingProducts(filter = type.queryValue, ticketFilter = ticketFilter, rideId = rideId, page = page)
         }
 
     override suspend fun purchaseTicketingProduct(
diff --git a/library/src/commonMain/kotlin/com/ioki/passenger/api/internal/api/IokiApi.kt b/library/src/commonMain/kotlin/com/ioki/passenger/api/internal/api/IokiApi.kt
@@ -406,14 +406,18 @@ internal class IokiApi(
     suspend fun getAllTicketingProducts(
         filter: String,
         rideId: String?,
+        ticketFilter: Map<String, String>,
         page: Int = 1,
         perPage: Int = 10,
     ): HttpResponse = client.get("/api/passenger/ticketing/products") {
         header("Authorization", accessToken)
         url.parameters.appendAll(
             parameters {
                 append("filter", filter)
-                rideId?.let { append("ride_id", it.toString()) }
+                rideId?.let { append("ride_id", it) }
+                ticketFilter.forEach { (key, value) ->
+                    append(key, value)
+                }
                 append("page", page.toString())
                 append("per_page", perPage.toString())
             },
diff --git a/library/src/commonMain/kotlin/com/ioki/passenger/api/models/AnyValue.kt b/library/src/commonMain/kotlin/com/ioki/passenger/api/models/AnyValue.kt
@@ -1,5 +1,6 @@
 package com.ioki.passenger.api.models
 
+import kotlinx.datetime.Instant
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerializationException
@@ -8,6 +9,7 @@ import kotlinx.serialization.descriptors.buildClassSerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.boolean
 import kotlinx.serialization.json.booleanOrNull
@@ -29,6 +31,12 @@ public sealed class AnyValue {
 
     @Serializable
     public data class DoubleValue(val value: Double) : AnyValue()
+
+    @Serializable
+    public data class InstantValue(val value: Instant) : AnyValue()
+
+    @Serializable
+    public data class ApiPointValue(val value: ApiPoint) : AnyValue()
 }
 
 internal object AnyValueSerializer : KSerializer<AnyValue> {
@@ -40,6 +48,8 @@ internal object AnyValueSerializer : KSerializer<AnyValue> {
             is AnyValue.IntValue -> encoder.encodeInt(value.value)
             is AnyValue.BooleanValue -> encoder.encodeBoolean(value.value)
             is AnyValue.DoubleValue -> encoder.encodeDouble(value.value)
+            is AnyValue.InstantValue -> encoder.encodeSerializableValue(Instant.serializer(), value.value)
+            is AnyValue.ApiPointValue -> encoder.encodeSerializableValue(ApiPoint.serializer(), value.value)
             // Handle other types as needed
         }
     }
@@ -50,13 +60,23 @@ internal object AnyValueSerializer : KSerializer<AnyValue> {
 
         // Here we can add logic to determine the type
         return when {
-            jsonElement is JsonPrimitive && jsonElement.isString -> AnyValue.StringValue(jsonElement.content)
+            jsonElement is JsonPrimitive && jsonElement.isString -> runCatching {
+                AnyValue.InstantValue(input.json.decodeFromJsonElement(Instant.serializer(), jsonElement))
+            }.getOrElse {
+                AnyValue.StringValue(jsonElement.content)
+            }
+
             jsonElement is JsonPrimitive && jsonElement.intOrNull != null -> AnyValue.IntValue(jsonElement.int)
             jsonElement is JsonPrimitive && jsonElement.booleanOrNull != null ->
-                AnyValue.BooleanValue(
-                    jsonElement.boolean,
-                )
-            jsonElement is JsonPrimitive && jsonElement.doubleOrNull != null -> AnyValue.DoubleValue(jsonElement.double)
+                AnyValue.BooleanValue(jsonElement.boolean)
+
+            jsonElement is JsonPrimitive && jsonElement.doubleOrNull != null ->
+                AnyValue.DoubleValue(jsonElement.double)
+
+            jsonElement is JsonObject -> AnyValue.ApiPointValue(
+                input.json.decodeFromJsonElement(ApiPoint.serializer(), jsonElement),
+            )
+
             else -> throw SerializationException("Unknown type")
         }
     }
diff --git a/library/src/commonTest/kotlin/com/ioki/passenger/api/internal/api/IokiApiParametersTest.kt b/library/src/commonTest/kotlin/com/ioki/passenger/api/internal/api/IokiApiParametersTest.kt
@@ -108,6 +108,10 @@ class IokiApiParametersTest {
             it.getAllTicketingProducts(
                 filter = "filter",
                 rideId = "rideId",
+                ticketFilter = mapOf(
+                    "filter1" to "1",
+                    "filter2" to "2",
+                ),
                 page = 2,
                 perPage = 100,
             )
@@ -116,6 +120,8 @@ class IokiApiParametersTest {
         parameters.toMap() shouldContainExactly mapOf(
             "filter" to listOf("filter"),
             "ride_id" to listOf("rideId"),
+            "filter1" to listOf("1"),
+            "filter2" to listOf("2"),
             "page" to listOf("2"),
             "per_page" to listOf("100"),
         )
diff --git a/library/src/commonTest/kotlin/com/ioki/passenger/api/models/AnyValueTest.kt b/library/src/commonTest/kotlin/com/ioki/passenger/api/models/AnyValueTest.kt
@@ -0,0 +1,104 @@
+package com.ioki.passenger.api.models
+
+import kotlinx.datetime.Instant
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.json.Json
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+
+internal class AnyValueTest {
+    private val json = Json { encodeDefaults = true }
+
+    @Test
+    fun stringValue_serialization() {
+        val value = AnyValue.StringValue("test")
+        val serialized = json.encodeToString(AnyValueSerializer, value)
+        assertEquals("\"test\"", serialized)
+    }
+
+    @Test
+    fun stringValue_deserialization() {
+        val deserialized = json.decodeFromString(AnyValueSerializer, "\"test\"")
+        assertEquals(AnyValue.StringValue("test"), deserialized)
+    }
+
+    @Test
+    fun intValue_serialization() {
+        val value = AnyValue.IntValue(42)
+        val serialized = json.encodeToString(AnyValueSerializer, value)
+        assertEquals("42", serialized)
+    }
+
+    @Test
+    fun intValue_deserialization() {
+        val deserialized = json.decodeFromString(AnyValueSerializer, "42")
+        assertEquals(AnyValue.IntValue(42), deserialized)
+    }
+
+    @Test
+    fun booleanValue_serialization() {
+        val value = AnyValue.BooleanValue(true)
+        val serialized = json.encodeToString(AnyValueSerializer, value)
+        assertEquals("true", serialized)
+    }
+
+    @Test
+    fun booleanValue_deserialization() {
+        val deserialized = json.decodeFromString(AnyValueSerializer, "true")
+        assertEquals(AnyValue.BooleanValue(true), deserialized)
+    }
+
+    @Test
+    fun doubleValue_serialization() {
+        val value = AnyValue.DoubleValue(3.14)
+        val serialized = json.encodeToString(AnyValueSerializer, value)
+        assertEquals("3.14", serialized)
+    }
+
+    @Test
+    fun doubleValue_deserialization() {
+        val deserialized = json.decodeFromString(AnyValueSerializer, "3.14")
+        assertEquals(AnyValue.DoubleValue(3.14), deserialized)
+    }
+
+    @Test
+    fun instantValue_serialization() {
+        val instant = Instant.fromEpochMilliseconds(1633072800000L)
+        val value = AnyValue.InstantValue(instant)
+        val serialized = json.encodeToString(AnyValueSerializer, value)
+        assertEquals("\"2021-10-01T07:20:00Z\"", serialized)
+    }
+
+    @Test
+    fun instantValue_deserialization() {
+        val instant = Instant.fromEpochMilliseconds(1633072800000L)
+        val deserialized = json.decodeFromString(AnyValueSerializer, "\"2021-10-01T07:20:00Z\"")
+        assertEquals(AnyValue.InstantValue(instant), deserialized)
+    }
+
+    @Test
+    fun apiPointValue_serialization() {
+        val apiPoint = ApiPoint(52.5200, 13.4050)
+        val value = AnyValue.ApiPointValue(apiPoint)
+        val serialized = json.encodeToString(AnyValueSerializer, value)
+        assertEquals("""{"lat":52.52,"lng":13.405}""", serialized)
+    }
+
+    @Test
+    fun apiPointValue_deserialization() {
+        val apiPoint = ApiPoint(52.5200, 13.4050)
+        val deserialized = json.decodeFromString(AnyValueSerializer, """{"lat":52.52,"lng":13.405}""")
+        assertEquals(AnyValue.ApiPointValue(apiPoint), deserialized)
+    }
+
+    @Test
+    fun unsupportedType_throwsException() {
+        val unsupportedJson = """{"unsupported": "value"}"""
+        try {
+            json.decodeFromString(AnyValueSerializer, unsupportedJson)
+        } catch (e: Exception) {
+            assertIs<SerializationException>(e)
+        }
+    }
+}
diff --git a/test/src/commonMain/kotlin/com/ioki/passenger/api/test/FakeTicketingService.kt b/test/src/commonMain/kotlin/com/ioki/passenger/api/test/FakeTicketingService.kt
@@ -25,6 +25,7 @@ public open class FakeTicketingService : TicketingService {
     override suspend fun getAllTicketingProducts(
         type: ApiTicketingProductFilterType,
         rideId: String?,
+        ticketFilter: Map<String, String>,
         page: Int,
     ): ApiResult<List<ApiTicketingProductResponse>> = error("Not overridden")
 
