From 27d7be0ca16f492739b88fbd6aa719fc5bda4a07 Mon Sep 17 00:00:00 2001
From: Samuel Vazquez <sam_2f@hotmail.com>
Date: Mon, 15 Apr 2024 21:23:02 -0700
Subject: [PATCH] Support built-in `ID` type serialization in
 `GraphQLServerRequest` (#1958)

Backport of https://github.com/ExpediaGroup/graphql-kotlin/pull/1952 to
v7

Co-authored-by: Tasuku Nakagawa <38446259+T45K@users.noreply.github.com>
---
 .../types/serializers/AnyNullableKSerializer.kt   |  2 ++
 .../server/types/GraphQLServerRequestTest.kt      | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/servers/graphql-kotlin-server/src/main/kotlin/com/expediagroup/graphql/server/types/serializers/AnyNullableKSerializer.kt b/servers/graphql-kotlin-server/src/main/kotlin/com/expediagroup/graphql/server/types/serializers/AnyNullableKSerializer.kt
index d799f268bd..db9c493228 100644
--- a/servers/graphql-kotlin-server/src/main/kotlin/com/expediagroup/graphql/server/types/serializers/AnyNullableKSerializer.kt
+++ b/servers/graphql-kotlin-server/src/main/kotlin/com/expediagroup/graphql/server/types/serializers/AnyNullableKSerializer.kt
@@ -1,5 +1,6 @@
 package com.expediagroup.graphql.server.types.serializers
 
+import com.expediagroup.graphql.generator.scalars.ID
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
@@ -41,6 +42,7 @@ object AnyNullableKSerializer : KSerializer<Any?> {
             is Number -> JsonPrimitive(value)
             is Boolean -> JsonPrimitive(value)
             is String -> JsonPrimitive(value)
+            is ID -> JsonPrimitive(value.value)
             else -> JsonNull
         }
 
diff --git a/servers/graphql-kotlin-server/src/test/kotlin/com/expediagroup/graphql/server/types/GraphQLServerRequestTest.kt b/servers/graphql-kotlin-server/src/test/kotlin/com/expediagroup/graphql/server/types/GraphQLServerRequestTest.kt
index 5b8579cd30..7ef686fcdc 100644
--- a/servers/graphql-kotlin-server/src/test/kotlin/com/expediagroup/graphql/server/types/GraphQLServerRequestTest.kt
+++ b/servers/graphql-kotlin-server/src/test/kotlin/com/expediagroup/graphql/server/types/GraphQLServerRequestTest.kt
@@ -16,6 +16,7 @@
 
 package com.expediagroup.graphql.server.types
 
+import com.expediagroup.graphql.generator.scalars.ID
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.junit.jupiter.api.Test
@@ -51,6 +52,20 @@ class GraphQLServerRequestTest {
         assertEquals(expectedJson, Json.encodeToString(request))
     }
 
+    @Test
+    fun `verify complete serialization including ID`() {
+        val request = GraphQLRequest(
+            query = "query FooQuery(\$input: ID) { foo(\$input) }",
+            operationName = "FooQuery",
+            variables = mapOf("input" to ID("1"))
+        )
+
+        val expectedJson =
+            """{"query":"query FooQuery(${'$'}input: ID) { foo(${'$'}input) }","operationName":"FooQuery","variables":{"input":"1"}}"""
+
+        assertEquals(expectedJson, Json.encodeToString(request))
+    }
+
     @Test
     fun `verify batch request serialization`() {
         val request = GraphQLBatchRequest(