Merge pull request #560 from Shalima/master

Support to use SelectionSet in GraphqlQueryRequest to serialize

Author: srinivasankavitha

graphql-dgs-codegen-shared-core/src/main/kotlin/com/netflix/graphql/dgs/client/codegen/GraphQLQueryRequest.kt

@@ -23,14 +23,18 @@ import graphql.language.OperationDefinition
 import graphql.language.SelectionSet
 import graphql.schema.Coercing
 
-class GraphQLQueryRequest(
+class GraphQLQueryRequest @JvmOverloads constructor(
     val query: GraphQLQuery,
-    val projection: BaseProjectionNode?,
-    scalars: Map<Class<*>, Coercing<*, *>>?
+    val projection: BaseProjectionNode? = null,
+    scalars: Map<Class<*>, Coercing<*, *>>? = null
 ) {
 
-    constructor(query: GraphQLQuery) : this(query, null, null)
-    constructor(query: GraphQLQuery, projection: BaseProjectionNode?) : this(query, projection, null)
+    private var selectionSet: SelectionSet? = null
+
+    @JvmOverloads constructor(query: GraphQLQuery, selectionSet: SelectionSet, scalars: Map<Class<*>, Coercing<*, *>>? = null) : this(query = query, scalars = scalars) {
+        this.selectionSet = selectionSet
+    }
+
     val inputValueSerializer = InputValueSerializer(scalars ?: emptyMap())
     val projectionSerializer = ProjectionSerializer(inputValueSerializer)
 
@@ -54,16 +58,20 @@ class GraphQLQueryRequest(
         }
 
         if (projection != null) {
-            val selectionSet = if (projection is BaseSubProjectionNode<*, *> && projection.root() != null) {
+            val selectionSetFromProjection = if (projection is BaseSubProjectionNode<*, *> && projection.root() != null) {
                 projectionSerializer.toSelectionSet(projection.root() as BaseProjectionNode)
             } else {
                 projectionSerializer.toSelectionSet(projection)
             }
-            if (selectionSet.selections.isNotEmpty()) {
-                selection.selectionSet(selectionSet)
+            if (selectionSetFromProjection.selections.isNotEmpty()) {
+                selection.selectionSet(selectionSetFromProjection)
             }
         }
 
+        if (selectionSet != null) {
+            selection.selectionSet(selectionSet)
+        }
+
         operationDef.selectionSet(SelectionSet.newSelectionSet().selection(selection.build()).build())
 
         return AstPrinter.printAst(operationDef.build())

graphql-dgs-codegen-shared-core/src/test/kotlin/com/netflix/graphql/dgs/client/codegen/GraphQLQueryRequestTest.kt

@@ -155,6 +155,55 @@ class GraphQLQueryRequestTest {
         )
     }
 
+    @Test
+    fun serializeWithSelectionSet() {
+        val query = TestNamedGraphQLQuery().apply {
+            input["movie"] = Movie(123, "greatMovie")
+        }
+        val inputValueSerializer = InputValueSerializer(emptyMap())
+        val projectionSerializer = ProjectionSerializer(inputValueSerializer)
+        val selectionSet = projectionSerializer.toSelectionSet(MovieProjection().name().movieId())
+        val request = GraphQLQueryRequest(query, selectionSet)
+        val result = request.serialize()
+        assertValidQuery(result)
+        assertThat(result).isEqualTo(
+            """query TestNamedQuery {
+            |  test(movie: {movieId : 123, name : "greatMovie"}) {
+            |    name
+            |    movieId
+            |  }
+            |}
+            """.trimMargin()
+        )
+    }
+
+    @Test
+    fun serializeWithSelectionSetAndScalars() {
+        val query = TestNamedGraphQLQuery().apply {
+            input["movie"] = Movie(123, "greatMovie")
+            input["dateRange"] = DateRange(LocalDate.of(2020, 1, 1), LocalDate.of(2021, 5, 11))
+            input["zoneId"] = ZoneId.of("Europe/Berlin")
+        }
+        val scalars = mapOf(DateRange::class.java to DateRangeScalar(), ZoneId::class.java to ZoneIdScalar())
+        val inputValueSerializer = InputValueSerializer(scalars)
+        val projectionSerializer = ProjectionSerializer(inputValueSerializer)
+        val selectionSet = projectionSerializer.toSelectionSet(MovieProjection().name().movieId())
+        val request =
+            GraphQLQueryRequest(query, selectionSet, scalars)
+
+        val result = request.serialize()
+        assertValidQuery(result)
+        assertThat(result).isEqualTo(
+            """query TestNamedQuery {
+        |  test(movie: {movieId : 123, name : "greatMovie"}, dateRange: "01/01/2020-05/11/2021", zoneId: "Europe/Berlin") {
+        |    name
+        |    movieId
+        |  }
+        |}
+            """.trimMargin()
+        )
+    }
+
     @Test
     fun serializeWithScalar() {
         val query = TestNamedGraphQLQuery().apply {