Fix one more bug caused by improper usage of field.getName

felipe-gdr-atlassian · felipe-gdr-atlassian · commit bbe573a9249e · 2024-02-15T11:25:09.000+11:00
diff --git a/src/main/java/graphql/execution/incremental/DeferredExecutionSupport.java b/src/main/java/graphql/execution/incremental/DeferredExecutionSupport.java
@@ -132,15 +132,15 @@ private Supplier<CompletableFuture<DeferredFragmentCall.FieldWithExecutionResult
                 DeferredCallContext deferredCallContext
         ) {
             Map<String, MergedField> fields = new LinkedHashMap<>();
-            fields.put(currentField.getName(), currentField);
+            fields.put(currentField.getResultKey(), currentField);
 
             ExecutionStrategyParameters callParameters = parameters.transform(builder ->
                     {
                         MergedSelectionSet mergedSelectionSet = MergedSelectionSet.newMergedSelectionSet().subFields(fields).build();
                         builder.deferredCallContext(deferredCallContext)
                                 .field(currentField)
                                 .fields(mergedSelectionSet)
-                                .path(parameters.getPath().segment(currentField.getName()))
+                                .path(parameters.getPath().segment(currentField.getResultKey()))
                                 .parent(null); // this is a break in the parent -> child chain - it's a new start effectively
                     }
             );
@@ -151,7 +151,7 @@ private Supplier<CompletableFuture<DeferredFragmentCall.FieldWithExecutionResult
             instrumentation.beginDeferredField(executionContext.getInstrumentationState());
 
             return dfCache.computeIfAbsent(
-                    currentField.getName(),
+                    currentField.getResultKey(),
                     // The same field can be associated with multiple defer executions, so
                     // we memoize the field resolution to avoid multiple calls to the same data fetcher
                     key -> FpKit.interThreadMemoize(() -> {
diff --git a/src/test/groovy/graphql/execution/incremental/DeferExecutionSupportIntegrationTest.groovy b/src/test/groovy/graphql/execution/incremental/DeferExecutionSupportIntegrationTest.groovy
@@ -29,6 +29,7 @@ class DeferExecutionSupportIntegrationTest extends Specification {
             type Query {
                 post : Post 
                 posts: [Post]
+                postById(id: ID!): Post
                 hello: String
                 item(type: String!): Item 
             }
@@ -135,6 +136,9 @@ class DeferExecutionSupportIntegrationTest extends Specification {
                                 [id: "1002"],
                                 [id: "1003"]
                         ]))
+                        .dataFetcher("postById", (env) -> {
+                            return [id: env.getArgument("id")]
+                        })
                         .dataFetcher("hello", resolve("world"))
                         .dataFetcher("item", resolveItem())
                 )
@@ -239,6 +243,71 @@ class DeferExecutionSupportIntegrationTest extends Specification {
         ]
     }
 
+    def "aliased fields with different parameters"() {
+        def query = '''
+            query {
+                postById(id: "1") {
+                    id
+                }
+                ... @defer {
+                    post2: postById(id: "2") {
+                        id2: id
+                    }
+                }
+                ... @defer {
+                    post3: postById(id: "3") {
+                        ... @defer {
+                            id3: id
+                        }
+                    }
+                }
+            }
+        '''
+
+        when:
+        IncrementalExecutionResult initialResult = executeQuery(query)
+
+        then:
+        initialResult.toSpecification() == [
+                data   : [postById: [id: "1"]],
+                hasNext: true
+        ]
+
+        when:
+        def incrementalResults = getIncrementalResults(initialResult)
+
+        then:
+        incrementalResults == [
+                [
+                        hasNext    : true,
+                        incremental: [
+                                [
+                                        path: [],
+                                        data: [post2: [id2: "2"]]
+                                ]
+                        ]
+                ],
+                [
+                        hasNext    : true,
+                        incremental: [
+                                [
+                                        path: [],
+                                        data: [post3: [:]]
+                                ]
+                        ]
+                ],
+                [
+                        hasNext    : false,
+                        incremental: [
+                                [
+                                        path: ["post3"],
+                                        data: [id3: "3"]
+                                ]
+                        ]
+                ]
+        ]
+    }
+
     def "defer on interface field"() {
         def query = """
             query {
