Fix bug where deferred payloads were not using field aliases

felipe-gdr-atlassian · felipe-gdr-atlassian · commit fc0a73ed11a7 · 2024-02-14T12:49:09.000+11:00
diff --git a/src/main/java/graphql/execution/incremental/DeferredExecutionSupport.java b/src/main/java/graphql/execution/incremental/DeferredExecutionSupport.java
@@ -165,7 +165,7 @@ private Supplier<CompletableFuture<DeferredFragmentCall.FieldWithExecutionResult
 
                                 return executionResultCF
                                         .thenApply(executionResult ->
-                                                new DeferredFragmentCall.FieldWithExecutionResult(currentField.getName(), executionResult)
+                                                new DeferredFragmentCall.FieldWithExecutionResult(currentField.getResultKey(), executionResult)
                                         );
                             }
                     )
diff --git a/src/main/java/graphql/execution/incremental/DeferredFragmentCall.java b/src/main/java/graphql/execution/incremental/DeferredFragmentCall.java
@@ -107,7 +107,7 @@ private DeferPayload transformToDeferredPayload(List<FieldWithExecutionResult> f
         ImmutableList.Builder<GraphQLError> errorsBuilder = ImmutableList.builder();
 
         fieldWithExecutionResults.forEach(entry -> {
-            dataMap.put(entry.fieldName, entry.executionResult.getData());
+            dataMap.put(entry.resultKey, entry.executionResult.getData());
             errorsBuilder.addAll(entry.executionResult.getErrors());
         });
 
@@ -120,11 +120,11 @@ private DeferPayload transformToDeferredPayload(List<FieldWithExecutionResult> f
     }
 
     public static class FieldWithExecutionResult {
-        private final String fieldName;
+        private final String resultKey;
         private final ExecutionResult executionResult;
 
-        public FieldWithExecutionResult(String fieldName, ExecutionResult executionResult) {
-            this.fieldName = fieldName;
+        public FieldWithExecutionResult(String resultKey, ExecutionResult executionResult) {
+            this.resultKey = resultKey;
             this.executionResult = executionResult;
         }
 
diff --git a/src/test/groovy/graphql/execution/incremental/DeferExecutionSupportIntegrationTest.groovy b/src/test/groovy/graphql/execution/incremental/DeferExecutionSupportIntegrationTest.groovy
@@ -201,6 +201,44 @@ class DeferExecutionSupportIntegrationTest extends Specification {
         ]
     }
 
+    def "defer with aliased fields"() {
+        def query = '''
+            query {
+                postAlias: post {
+                    idAlias: id
+                    ... @defer {
+                        summaryAlias: summary
+                    }
+                }
+            }
+        '''
+
+        when:
+        IncrementalExecutionResult initialResult = executeQuery(query)
+
+        then:
+        initialResult.toSpecification() == [
+                data   : [postAlias: [idAlias: "1001"]],
+                hasNext: true
+        ]
+
+        when:
+        def incrementalResults = getIncrementalResults(initialResult)
+
+        then:
+        incrementalResults == [
+                [
+                        hasNext    : false,
+                        incremental: [
+                                [
+                                        path: ["postAlias"],
+                                        data: [summaryAlias: "A summary"]
+                                ]
+                        ]
+                ]
+        ]
+    }
+
     def "defer on interface field"() {
         def query = """
             query {

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ private Supplier<CompletableFuture<DeferredFragmentCall.FieldWithExecutionResult`
`165`	`165`
`166`	`166`	`return executionResultCF`
`167`	`167`	`.thenApply(executionResult ->`
`168`		`- new DeferredFragmentCall.FieldWithExecutionResult(currentField.getName(), executionResult)`
	`168`	`+ new DeferredFragmentCall.FieldWithExecutionResult(currentField.getResultKey(), executionResult)`
`169`	`169`	`);`
`170`	`170`	`}`
`171`	`171`	`)`