Fix partial data throwing with useV3ExceptionHandling and normalized …

…cache (#5313)
apollographql · Oct 19, 2023 · 00cc6ad · 00cc6ad
1 parent 62f367b
commit 00cc6ad
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 6 deletions.
diff --git a/...c/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/FetchPolicyInterceptors.kt b/...c/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/FetchPolicyInterceptors.kt
@@ -7,6 +7,7 @@ import com.apollographql.apollo3.api.ApolloResponse
 import com.apollographql.apollo3.api.Operation
 import com.apollographql.apollo3.api.Query
 import com.apollographql.apollo3.exception.ApolloException
+import com.apollographql.apollo3.exception.ApolloGraphQLException
 import com.apollographql.apollo3.exception.CacheMissException
 import com.apollographql.apollo3.exception.DefaultApolloException
 import com.apollographql.apollo3.interceptor.ApolloInterceptor
@@ -143,7 +144,7 @@ internal val FetchPolicyRouterInterceptor = object : ApolloInterceptor {
 
       request.fetchPolicyInterceptor.intercept(request, chain)
           .collect {
-            if (!hasEmitted && it.exception != null) {
+            if (!hasEmitted && it.exception != null && it.exception !is ApolloGraphQLException) {
               // Remember to send the exception later
               exceptions.add(it.exception!!)
               return@collect

diff --git a/...c/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/FetchPolicyInterceptors.kt b/...c/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/FetchPolicyInterceptors.kt
@@ -7,6 +7,7 @@ import com.apollographql.apollo3.api.ApolloResponse
 import com.apollographql.apollo3.api.Operation
 import com.apollographql.apollo3.api.Query
 import com.apollographql.apollo3.exception.ApolloException
+import com.apollographql.apollo3.exception.ApolloGraphQLException
 import com.apollographql.apollo3.exception.CacheMissException
 import com.apollographql.apollo3.exception.DefaultApolloException
 import com.apollographql.apollo3.interceptor.ApolloInterceptor
@@ -143,7 +144,7 @@ internal val FetchPolicyRouterInterceptor = object : ApolloInterceptor {
 
       request.fetchPolicyInterceptor.intercept(request, chain)
           .collect {
-            if (!hasEmitted && it.exception != null) {
+            if (!hasEmitted && it.exception != null && it.exception !is ApolloGraphQLException) {
               // Remember to send the exception later
               exceptions.add(it.exception!!)
               return@collect

diff --git a/tests/integration-tests/src/commonTest/kotlin/test/ExceptionsTest.kt b/tests/integration-tests/src/commonTest/kotlin/test/ExceptionsTest.kt
@@ -1,9 +1,13 @@
 package test
 
 import com.apollographql.apollo3.ApolloClient
+import com.apollographql.apollo3.cache.normalized.api.MemoryCacheFactory
+import com.apollographql.apollo3.cache.normalized.normalizedCache
 import com.apollographql.apollo3.exception.ApolloHttpException
 import com.apollographql.apollo3.exception.ApolloNetworkException
+import com.apollographql.apollo3.integration.normalizer.HeroAndFriendsNamesQuery
 import com.apollographql.apollo3.integration.normalizer.HeroNameQuery
+import com.apollographql.apollo3.integration.normalizer.type.Episode
 import com.apollographql.apollo3.mockserver.MockServer
 import com.apollographql.apollo3.mockserver.enqueueString
 import com.apollographql.apollo3.testing.internal.runTest
@@ -63,10 +67,11 @@ class ExceptionsTest {
     }
     assertNotNull(result.exceptionOrNull())
   }
+
   @Test
   @Suppress("DEPRECATION")
   fun toFlowDoesNotThrowOnV3() = runTest(before = { setUp() }, after = { tearDown() }) {
-      mockServer.enqueueString("""
+    mockServer.enqueueString("""
         {
           "errors": [
               {
@@ -81,8 +86,59 @@ class ExceptionsTest {
             ]
           }
       """.trimIndent())
-      val errorClient = apolloClient.newBuilder().useV3ExceptionHandling(true).build()
-      val response = errorClient.query(HeroNameQuery()).toFlow().toList()
-      assertTrue(response.first().errors?.isNotEmpty() ?: false)
+    val errorClient = apolloClient.newBuilder().useV3ExceptionHandling(true).build()
+    val response = errorClient.query(HeroNameQuery()).toFlow().toList()
+    assertTrue(response.first().errors?.isNotEmpty() ?: false)
+  }
+
+  private val PARTIAL_DATA_RESPONSE = """
+      {
+        "data": {
+          "hero": {
+            "name": "R2-D2",
+            "friends": null
+          }
+        },
+        "errors": [
+            {
+              "message": "Could not get friends",
+              "locations": [
+                {
+                  "line": 1,
+                  "column": 1
+                }
+              ],
+              "path": [
+                "hero",
+                "friends"
+              ]
+            }
+          ]
+        }
+    """.trimIndent()
+
+  @Test
+  @Suppress("DEPRECATION")
+  fun v3ExceptionHandlingKeepsPartialData() = runTest(before = { setUp() }, after = { tearDown() }) {
+    mockServer.enqueueString(PARTIAL_DATA_RESPONSE)
+    val errorClient = apolloClient.newBuilder()
+        .useV3ExceptionHandling(true)
+        .build()
+    val response = errorClient.query(HeroAndFriendsNamesQuery(Episode.EMPIRE)).execute()
+    assertNotNull(response.data)
+    assertTrue(response.errors?.isNotEmpty() == true)
+  }
+
+  @Test
+  @Suppress("DEPRECATION")
+  fun v3ExceptionHandlingKeepsPartialDataWithCache() = runTest(before = { setUp() }, after = { tearDown() }) {
+    mockServer.enqueueString(PARTIAL_DATA_RESPONSE.trimIndent())
+    val errorClient = apolloClient.newBuilder()
+        .normalizedCache(MemoryCacheFactory(1024 * 1024))
+        .useV3ExceptionHandling(true)
+        .build()
+    val response = errorClient.query(HeroAndFriendsNamesQuery(Episode.EMPIRE)).execute()
+    assertNotNull(response.data)
+    assertTrue(response.errors?.isNotEmpty() == true)
   }
 }