Fix defer payload

atlassian-labs · May 14, 2024 · bfebddc · bfebddc
1 parent ad72474
commit bfebddc
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 27 deletions.
diff --git a/lib/src/main/java/graphql/nadel/engine/transform/hydration/NadelHydrationTransform.kt b/lib/src/main/java/graphql/nadel/engine/transform/hydration/NadelHydrationTransform.kt
@@ -231,9 +231,18 @@ internal class NadelHydrationTransform(
             DelayedIncrementalPartialResultImpl.Builder()
                 .incrementalItems(
                     listOf(
-                        DeferPayload.newDeferredItem()
-                            .data(results?.newValue?.value)
-                            .path(overallField.listOfResultKeys as List<Any>?)
+                        DeferPayload.Builder()
+                            .data(
+                                mapOf(
+                                    overallField.resultKey to results?.newValue?.value,
+                                ),
+                            )
+                            .path(
+                                overallField.parent?.listOfResultKeys?.let {
+                                    @Suppress("USELESS_CAST") // It's not useless because Java (yay)
+                                    it as List<Any>
+                                } ?: emptyList()
+                            )
                             .errors(
                                 instructionSequence
                                     .filterIsInstance<NadelResultInstruction.AddError>()

diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/IncrementalResultJoiner.kt b/test/src/test/kotlin/graphql/nadel/tests/next/IncrementalResultJoiner.kt
@@ -42,18 +42,9 @@ fun combineExecutionResults(result: JsonMap, incrementalResults: List<JsonMap>):
 }
 
 private fun setDeferred(result: JsonMap, path: List<Any>, data: Any) {
-    when (val lastPathSegment = path.last()) {
-        is Int -> {
-            val parent = result.getValueAt(path)
-            @Suppress("UNCHECKED_CAST")
-            (parent as MutableJsonMap?)?.putAll(data as JsonMap)
-        }
-        is String -> {
-            val parent = result.getValueAt(path.dropLast(n = 1))
-            @Suppress("UNCHECKED_CAST")
-            (parent as MutableJsonMap?)?.put(lastPathSegment, data)
-        }
-    }
+    val parent = result.getValueAt(path)
+    @Suppress("UNCHECKED_CAST")
+    (parent as MutableJsonMap?)?.putAll(data as JsonMap)
 }
 
 private fun JsonMap.getValueAt(path: List<Any>): Any? {

diff --git a/...hql/nadel/tests/next/fixtures/hydration/defer/HydrationDeferInRenamedFieldTestSnapshot.kt b/...hql/nadel/tests/next/fixtures/hydration/defer/HydrationDeferInRenamedFieldTestSnapshot.kt
@@ -99,11 +99,12 @@ public class HydrationDeferInRenamedFieldTestSnapshot : TestSnapshot() {
                 |   "incremental": [
                 |     {
                 |       "path": [
-                |         "issueByKey",
-                |         "assignee"
+                |         "issueByKey"
                 |       ],
                 |       "data": {
-                |         "name": "Franklin"
+                |         "assignee": {
+                |           "name": "Franklin"
+                |         }
                 |       }
                 |     }
                 |   ]

diff --git a/...ext/fixtures/hydration/defer/HydrationDeferInRenamedFieldUsingRenamedFieldTestSnapshot.kt b/...ext/fixtures/hydration/defer/HydrationDeferInRenamedFieldUsingRenamedFieldTestSnapshot.kt
@@ -99,11 +99,12 @@ public class HydrationDeferInRenamedFieldUsingRenamedFieldTestSnapshot : TestSna
                 |   "incremental": [
                 |     {
                 |       "path": [
-                |         "issueByKey",
-                |         "assigneeV2"
+                |         "issueByKey"
                 |       ],
                 |       "data": {
-                |         "name": "SPEED"
+                |         "assigneeV2": {
+                |           "name": "SPEED"
+                |         }
                 |       }
                 |     }
                 |   ]

diff --git a/...sts/next/fixtures/hydration/defer/HydrationDeferIsDisabledForRelatedIssuesTestSnapshot.kt b/...sts/next/fixtures/hydration/defer/HydrationDeferIsDisabledForRelatedIssuesTestSnapshot.kt
@@ -145,11 +145,12 @@ public class HydrationDeferIsDisabledForRelatedIssuesTestSnapshot : TestSnapshot
                 |   "incremental": [
                 |     {
                 |       "path": [
-                |         "issueByKey",
-                |         "assignee"
+                |         "issueByKey"
                 |       ],
                 |       "data": {
-                |         "name": "Tom"
+                |         "assignee": {
+                |           "name": "Tom"
+                |         }
                 |       }
                 |     }
                 |   ]

diff --git a/...st/kotlin/graphql/nadel/tests/next/fixtures/hydration/defer/HydrationDeferTestSnapshot.kt b/...st/kotlin/graphql/nadel/tests/next/fixtures/hydration/defer/HydrationDeferTestSnapshot.kt
@@ -99,11 +99,12 @@ public class HydrationDeferTestSnapshot : TestSnapshot() {
                 |   "incremental": [
                 |     {
                 |       "path": [
-                |         "issue",
-                |         "assignee"
+                |         "issue"
                 |       ],
                 |       "data": {
-                |         "name": "Franklin"
+                |         "assignee": {
+                |           "name": "Franklin"
+                |         }
                 |       }
                 |     }
                 |   ]