Make variables available to the CacheKeyResolver in fromFieldRecordSet (

apollographql#3074) Co-authored-by: Rohan Dhruva <[email protected]>
JamesSlocumIH · Apr 29, 2021 · 72b1766 · 72b1766
1 parent 005dcd5
commit 72b1766
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/...-api/src/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/CacheKeyResolver.kt b/...-api/src/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/CacheKeyResolver.kt
@@ -12,6 +12,7 @@ import kotlin.jvm.JvmSuppressWildcards
 abstract class CacheKeyResolver {
   abstract fun fromFieldRecordSet(
       field: ResponseField,
+      variables: Operation.Variables,
       recordSet: Map<String, @JvmSuppressWildcards Any?>
   ): CacheKey
 
@@ -25,7 +26,7 @@ abstract class CacheKeyResolver {
 
     @JvmField
     val DEFAULT: CacheKeyResolver = object : CacheKeyResolver() {
-      override fun fromFieldRecordSet(field: ResponseField, recordSet: Map<String, Any?>) = CacheKey.NO_KEY
+      override fun fromFieldRecordSet(field: ResponseField, variables: Operation.Variables, recordSet: Map<String, Any?>) = CacheKey.NO_KEY
 
       override fun fromFieldArguments(field: ResponseField, variables: Operation.Variables) = CacheKey.NO_KEY
     }

diff --git a/...in/kotlin/com/apollographql/apollo3/cache/normalized/internal/OperationCacheExtensions.kt b/...in/kotlin/com/apollographql/apollo3/cache/normalized/internal/OperationCacheExtensions.kt
@@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.variables
 import com.apollographql.apollo3.cache.CacheHeaders
 import com.apollographql.apollo3.cache.normalized.CacheKey
 import com.apollographql.apollo3.cache.normalized.CacheKeyResolver
-import com.apollographql.apollo3.cache.normalized.NormalizedCache
 import com.apollographql.apollo3.cache.normalized.ReadOnlyNormalizedCache
 
 fun <D : Operation.Data> Operation<D>.normalize(
@@ -54,7 +53,7 @@ private fun <D> normalizeInternal(
   val writer = MapJsonWriter()
   adapter.toResponse(writer, responseAdapterCache, data)
   return Normalizer(variables) { responseField, fields ->
-    cacheKeyResolver.fromFieldRecordSet(responseField, fields).let { if (it == CacheKey.NO_KEY) null else it.key }
+    cacheKeyResolver.fromFieldRecordSet(responseField, variables, fields).let { if (it == CacheKey.NO_KEY) null else it.key }
   }.normalize(writer.root() as Map<String, Any?>, null, rootKey, fieldSets)
 }
 

diff --git a/...gration-tests-kotlin/src/commonTest/kotlin/com/apollographql/apollo3/integration/Utils.kt b/...gration-tests-kotlin/src/commonTest/kotlin/com/apollographql/apollo3/integration/Utils.kt
@@ -36,7 +36,7 @@ fun readTestFixture(name: String) = readFile("../integration-tests/testFixtures/
 fun readResource(name: String) = readFile("../integration-tests/testFixtures/resources/$name")
 
 object IdFieldCacheKeyResolver : CacheKeyResolver() {
-  override fun fromFieldRecordSet(field: ResponseField, recordSet: Map<String, Any?>): CacheKey {
+  override fun fromFieldRecordSet(field: ResponseField, variables: Operation.Variables, recordSet: Map<String, Any?>): CacheKey {
     val id = recordSet["id"]
     return if (id != null) {
       formatCacheKey(id.toString())
@@ -70,4 +70,4 @@ suspend fun <T> Channel<T>.receiveOrTimeout(timeoutMillis: Long = 500) = withTim
 /**
  * A helper function to reverse the order of the argument so that we can easily column edit the tests
  */
-fun assertEquals2(actual: Any?, expected: Any?) = assertEquals(expected, actual)
+fun assertEquals2(actual: Any?, expected: Any?) = assertEquals(expected, actual)
diff --git a/...egration-tests/src/testShared/kotlin/com/apollographql/apollo3/IdFieldCacheKeyResolver.kt b/...egration-tests/src/testShared/kotlin/com/apollographql/apollo3/IdFieldCacheKeyResolver.kt
@@ -6,7 +6,7 @@ import com.apollographql.apollo3.cache.normalized.CacheKey
 import com.apollographql.apollo3.cache.normalized.CacheKeyResolver
 
 class IdFieldCacheKeyResolver : CacheKeyResolver() {
-  override fun fromFieldRecordSet(field: ResponseField, recordSet: Map<String, Any?>): CacheKey {
+  override fun fromFieldRecordSet(field: ResponseField, variables: Operation.Variables, recordSet: Map<String, Any?>): CacheKey {
     val id = recordSet["id"]
     return if (id != null) {
       formatCacheKey(id.toString())
@@ -31,4 +31,4 @@ class IdFieldCacheKeyResolver : CacheKeyResolver() {
       CacheKey(id)
     }
   }
-}
+}