feat: migrate to Apollo4

build-logic/katana-convention/src/main/kotlin/dev/alvr/katana/buildlogic/mp/mobile/data/KatanaMultiplatformDataRemotePlugin.kt

@@ -61,23 +61,24 @@ internal class KatanaMultiplatformDataRemotePlugin : Plugin<Project> {
     private fun ApolloExtension.configureApollo() {
         service("anilist") {
             generateAsInternal = true
-            generateDataBuilders = true
             packageName = fullPackageName
 
-            if (fullPackageName.contains(BASE_PACKAGE)) {
-                alwaysGenerateTypesMatching = listOf("Query", "User")
+            if (path == CORE_PROJECT) {
                 generateApolloMetadata = true
                 generateAsInternal = false
+                generateDataBuilders = true
 
                 introspection {
                     endpointUrl = "https://graphql.anilist.co"
                     schemaFile = project.file("src/commonMain/graphql/schema.graphqls")
                 }
+            } else {
+                dependsOn(project(CORE_PROJECT))
             }
         }
     }
 
     private companion object {
-        const val BASE_PACKAGE = ".remote"
+        const val CORE_PROJECT = ":core:remote"
     }
 }

common/user/data/build.gradle.kts

@@ -2,10 +2,6 @@ plugins {
     id("katana.multiplatform.data.remote")
 }
 
-dependencies {
-    apolloMetadata(projects.core.remote)
-}
-
 katanaMultiplatform {
     commonMainDependencies {
         implementation(projects.core.common)

common/user/data/src/commonMain/kotlin/dev/alvr/katana/common/user/data/mappers/responses/userId.kt

@@ -3,6 +3,6 @@ package dev.alvr.katana.common.user.data.mappers.responses
 import dev.alvr.katana.common.user.data.UserIdQuery
 import dev.alvr.katana.common.user.domain.models.UserId
 
-internal operator fun UserIdQuery.Data?.invoke(): UserId = UserId(
-    id = checkNotNull(this?.viewer?.id) { "ViewerId is required." },
+internal operator fun UserIdQuery.Data.invoke(): UserId = UserId(
+    id = checkNotNull(viewer?.id) { "ViewerId is required." },
 )

common/user/data/src/commonMain/kotlin/dev/alvr/katana/common/user/data/mappers/responses/userInfo.kt

@@ -3,8 +3,8 @@ package dev.alvr.katana.common.user.data.mappers.responses
 import dev.alvr.katana.common.user.data.UserInfoQuery
 import dev.alvr.katana.common.user.domain.models.UserInfo
 
-internal operator fun UserInfoQuery.Data?.invoke() = UserInfo(
-    username = this?.user?.name.orEmpty(),
-    avatar = this?.user?.avatar?.medium.orEmpty(),
-    banner = this?.user?.bannerImage.orEmpty(),
+internal operator fun UserInfoQuery.Data.invoke() = UserInfo(
+    username = user?.name.orEmpty(),
+    avatar = user?.avatar?.medium.orEmpty(),
+    banner = user?.bannerImage.orEmpty(),
 )

common/user/data/src/commonMain/kotlin/dev/alvr/katana/common/user/data/sources/id/UserIdRemoteSourceImpl.kt

@@ -37,5 +37,5 @@ internal class UserIdRemoteSourceImpl(
         .query(UserIdQuery())
         .fetchPolicy(policy)
         .execute()
-        .data()
+        .dataAssertNoErrors()
 }

common/user/data/src/commonMain/kotlin/dev/alvr/katana/common/user/data/sources/info/UserInfoRemoteSourceImpl.kt

@@ -26,7 +26,7 @@ internal class UserInfoRemoteSourceImpl(
         client.query(UserInfoQuery())
             .fetchPolicy(FetchPolicy.CacheAndNetwork)
             .watch()
-            .map { res -> res.data().right() as Either<Failure, UserInfo> }
+            .map { res -> res.dataAssertNoErrors().right() as Either<Failure, UserInfo> }
             .catch { error ->
                 Logger.e(error) { "Was not possible to get the user info" }
 

common/user/data/src/commonTest/kotlin/dev/alvr/katana/common/user/data/mappers/responses/UserIdMapperTest.kt

@@ -8,13 +8,6 @@ import io.kotest.matchers.ints.shouldBeExactly
 import io.kotest.matchers.throwable.shouldHaveMessage
 
 internal class UserIdMapperTest : FreeSpec({
-    "null UserIdQuery Data" {
-        shouldThrowExactlyUnit<IllegalStateException> {
-            val userId: UserIdQuery.Data? = null
-            userId()
-        } shouldHaveMessage "ViewerId is required."
-    }
-
     "UserIdQuery with null viewer" {
         shouldThrowExactlyUnit<IllegalStateException> {
             val userId = UserIdQuery.Data(viewer = null)

common/user/data/src/commonTest/kotlin/dev/alvr/katana/common/user/data/sources/info/UserInfoRemoteSourceTest.kt

@@ -19,15 +19,20 @@ import kotlin.time.Duration.Companion.milliseconds
 
 @OptIn(ApolloExperimental::class)
 internal class UserInfoRemoteSourceTest : FreeSpec() {
-    private val client = ApolloClient.Builder().networkTransport(MapTestNetworkTransport()).build()
-    private val source: UserInfoRemoteSource = UserInfoRemoteSourceImpl(client)
+    private lateinit var client: ApolloClient
+    private lateinit var source: UserInfoRemoteSource
 
     init {
+        beforeTest {
+            client = ApolloClient.Builder().networkTransport(MapTestNetworkTransport()).build()
+            source = UserInfoRemoteSourceImpl(client)
+        }
+
         "observing the user info" - {
             "the server returns no data" {
                 client.registerTestResponse(UserInfoQuery())
                 source.userInfo.test(100.milliseconds) {
-                    awaitItem().shouldBeRight(userInfoNoData)
+                    awaitItem().shouldBeLeft(UserFailure.GettingUserInfo)
                     cancelAndIgnoreRemainingEvents()
                 }
             }

core/remote/src/commonMain/kotlin/dev/alvr/katana/core/remote/extensions.kt

@@ -6,9 +6,11 @@ import com.apollographql.apollo3.exception.ApolloHttpException
 import com.apollographql.apollo3.exception.ApolloNetworkException
 import com.apollographql.apollo3.exception.ApolloParseException
 import com.apollographql.apollo3.exception.CacheMissException
+import com.apollographql.apollo3.exception.DefaultApolloException
 import com.apollographql.apollo3.exception.HttpCacheMissException
 import com.apollographql.apollo3.exception.JsonDataException
 import com.apollographql.apollo3.exception.JsonEncodingException
+import com.apollographql.apollo3.exception.NoDataException
 import dev.alvr.katana.core.domain.failures.Failure
 
 fun <A, B> Either<A, B>.optional() = Optional.presentIfNotNull(getOrNull())
@@ -20,11 +22,13 @@ fun Throwable.toFailure(
     unknown: Failure = Failure.Unknown,
 ): Failure = when (this) {
     is ApolloHttpException,
-    is ApolloNetworkException -> network
+    is ApolloNetworkException,
+    is DefaultApolloException -> network
     is CacheMissException,
     is HttpCacheMissException -> cache
     is ApolloParseException,
     is JsonDataException,
-    is JsonEncodingException -> response
+    is JsonEncodingException,
+    is NoDataException -> response
     else -> unknown
 }

core/tests/src/commonMain/kotlin/dev/alvr/katana/core/tests/KotestProjectConfig.kt

@@ -7,7 +7,7 @@ import io.kotest.core.spec.IsolationMode
 import io.kotest.core.test.AssertionMode
 
 object KotestProjectConfig : AbstractProjectConfig() {
-    private const val NUM_THREADS = 1
+    private const val NUM_THREADS = 2
 
     override val assertionMode = AssertionMode.Warn
     override val coroutineDebugProbes = true

features/account/data/build.gradle.kts

@@ -2,10 +2,6 @@ plugins {
     id("katana.multiplatform.data.remote")
 }
 
-dependencies {
-    apolloMetadata(projects.core.remote)
-}
-
 katanaMultiplatform {
     commonMainDependencies {
         implementation(projects.core.remote)

features/explore/data/build.gradle.kts

@@ -2,10 +2,6 @@ plugins {
     id("katana.multiplatform.data.remote")
 }
 
-dependencies {
-    apolloMetadata(projects.core.remote)
-}
-
 katanaMultiplatform {
     commonMainDependencies {
         implementation(projects.core.remote)

features/lists/data/build.gradle.kts

@@ -2,10 +2,6 @@ plugins {
     id("katana.multiplatform.data.remote")
 }
 
-dependencies {
-    apolloMetadata(projects.core.remote)
-}
-
 katanaMultiplatform {
     commonMainDependencies {
         implementation(projects.common.user.domain)

features/lists/data/src/commonMain/kotlin/dev/alvr/katana/features/lists/data/sources/CommonListsRemoteSourceImpl.kt

@@ -25,6 +25,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
 
 internal class CommonListsRemoteSourceImpl(
     private val client: ApolloClient,
@@ -47,8 +48,9 @@ internal class CommonListsRemoteSourceImpl(
             .query(MediaListCollectionQuery(userId.getId().optional(), type))
             .fetchPolicyInterceptor(reloadInterceptor)
             .watch()
+            .onEach { println(it) }
             .distinctUntilChanged()
-            .map { res -> MediaCollection(res.data?.mediaList<T>(type).orEmpty()).right() }
+            .map { res -> MediaCollection(res.dataAssertNoErrors.mediaList<T>(type)).right() }
             .distinctUntilChanged()
             .catch { error ->
                 Logger.e(error) { "There was an error collecting the lists" }

features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/mappers/responses/MediaEntryMapperTest.kt

@@ -9,7 +9,7 @@ import io.kotest.matchers.shouldNotBe
 import dev.alvr.katana.features.lists.data.fragment.MediaEntry as MediaEntryFragment
 
 internal class MediaEntryMapperTest : FreeSpec({
-    MediaFormat.knownValues()
+    MediaFormat.knownEntries
         .forEach { format ->
             "MediaFormat $format should not be ${CommonMediaEntry.Format.UNKNOWN}" {
                 MediaEntryFragment(

features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/mocks.kt

@@ -49,13 +49,7 @@ internal val mediaListMock = MediaList(
     updatedAt = Arb.dateTimeTz().orNull().next(),
 )
 
-internal val apolloErrorMock = Error(
-    message = Arb.string().next(),
-    locations = emptyList(),
-    path = emptyList(),
-    extensions = emptyMap(),
-    nonStandardFields = emptyMap(),
-)
+internal val apolloErrorMock = Error.Builder(Arb.string().next()).build()
 
 private fun Arb.Companion.date() = arbitrary {
     Date(

features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/sources/ApolloListsRemoteSourceTest.kt

@@ -318,7 +318,7 @@ internal class ApolloListsRemoteSourceTest : FreeSpec() {
                 )
 
                 animeSource.animeCollection.test(100.milliseconds) {
-                    awaitItem().shouldBeRight().lists.shouldBeEmpty()
+                    awaitItem().shouldBeLeft(ListsFailure.GetMediaCollection)
                     awaitComplete()
                 }
 
@@ -580,7 +580,7 @@ internal class ApolloListsRemoteSourceTest : FreeSpec() {
                 )
 
                 mangaSource.mangaCollection.test(100.milliseconds) {
-                    awaitItem().shouldBeRight().lists.shouldBeEmpty()
+                    awaitItem().shouldBeLeft(ListsFailure.GetMediaCollection)
                     awaitComplete()
                 }
 

features/lists/data/src/commonTest/kotlin/dev/alvr/katana/features/lists/data/sources/CommonListsRemoteSourceTest.kt

@@ -6,19 +6,20 @@ import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo3.annotations.ApolloExperimental
 import com.apollographql.apollo3.api.ApolloResponse
 import com.apollographql.apollo3.interceptor.ApolloInterceptor
-import com.apollographql.apollo3.mockserver.MockResponse
 import com.apollographql.apollo3.mockserver.MockServer
+import com.apollographql.apollo3.mockserver.enqueueError
+import com.apollographql.apollo3.mockserver.enqueueString
 import com.apollographql.apollo3.testing.QueueTestNetworkTransport
 import com.apollographql.apollo3.testing.enqueueTestResponse
 import com.benasher44.uuid.uuid4
 import dev.alvr.katana.common.user.domain.managers.UserIdManager
+import dev.alvr.katana.core.domain.failures.Failure
 import dev.alvr.katana.core.remote.type.MediaType
 import dev.alvr.katana.core.remote.type.buildMediaListCollection
 import dev.alvr.katana.core.tests.shouldBeLeft
 import dev.alvr.katana.core.tests.shouldBeRight
 import dev.alvr.katana.features.lists.data.MediaListCollectionQuery
 import dev.alvr.katana.features.lists.data.apolloErrorMock
-import dev.alvr.katana.features.lists.data.enqueueResponse
 import dev.alvr.katana.features.lists.data.mediaListCollectionQueryMock
 import dev.alvr.katana.features.lists.data.mediaListEntriesMutationMock
 import dev.alvr.katana.features.lists.data.mediaListMock
@@ -31,7 +32,6 @@ import dev.mokkery.mock
 import dev.mokkery.verifySuspend
 import io.kotest.core.spec.style.FreeSpec
 import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.Duration.Companion.seconds
 
 @OptIn(ApolloExperimental::class)
 internal class CommonListsRemoteSourceTest : FreeSpec() {
@@ -50,12 +50,16 @@ internal class CommonListsRemoteSourceTest : FreeSpec() {
                     val response = ApolloResponse.Builder(
                         operation = mediaListCollectionQueryMock,
                         requestUuid = uuid4(),
-                        data = data,
-                    ).build()
+                    ).data(data).build()
                     client.enqueueTestResponse(response)
 
                     source.getMediaCollection<MediaEntry>(type).test(100.milliseconds) {
-                        awaitItem().shouldBeRight(MediaCollection(emptyList()))
+                        if (data == null) {
+                            awaitItem().shouldBeLeft(ListsFailure.GetMediaCollection)
+                        } else {
+                            awaitItem().shouldBeRight(MediaCollection(emptyList()))
+                        }
+
                         cancelAndIgnoreRemainingEvents()
                     }
                     verifySuspend { userIdManager.getId() }
@@ -66,12 +70,11 @@ internal class CommonListsRemoteSourceTest : FreeSpec() {
                     val response = ApolloResponse.Builder(
                         operation = mediaListCollectionQueryMock,
                         requestUuid = uuid4(),
-                        data = data,
-                    ).errors(listOf(apolloErrorMock)).build()
+                    ).data(data).errors(listOf(apolloErrorMock)).build()
                     client.enqueueTestResponse(response)
 
                     source.getMediaCollection<MediaEntry>(type).test(100.milliseconds) {
-                        awaitItem().shouldBeRight(MediaCollection(emptyList()))
+                        awaitItem().shouldBeLeft(Failure.Unknown)
                         cancelAndIgnoreRemainingEvents()
                     }
                     verifySuspend { userIdManager.getId() }
@@ -95,14 +98,14 @@ internal class CommonListsRemoteSourceTest : FreeSpec() {
                 reloadInterceptor,
             )
 
-            afterSpec { mockServer.stop() }
+            afterSpec { mockServer.close() }
 
-            badClient().forEach { (type, action) ->
+            mockServer.badClient().forEach { (type, enqueueAction) ->
                 "a HTTP error occurs" {
                     everySuspend { userIdManager.getId() } returns 37_384.right()
-                    mockServer.enqueueResponse(action)
+                    enqueueAction()
 
-                    source.getMediaCollection<MediaEntry>(type).test(5.seconds) {
+                    source.getMediaCollection<MediaEntry>(type).test(250.milliseconds) {
                         awaitItem().shouldBeLeft(ListsFailure.GetMediaCollection)
                         cancelAndIgnoreRemainingEvents()
                     }
@@ -124,24 +127,20 @@ internal class CommonListsRemoteSourceTest : FreeSpec() {
             add(null)
             add(empty)
         }
-        val types = MediaType.knownValues()
+        val types = MediaType.knownEntries
 
         return buildList {
             values.forEach { v -> types.forEach { t -> add(v to t) } }
         }
     }
 
-    private fun badClient(): List<Pair<MediaType, (MockResponse.Builder.() -> Unit)>> {
-        fun apolloCommand(
-            block: MockResponse.Builder.() -> Unit,
-        ): MockResponse.Builder.() -> Unit = { MockResponse.Builder().apply(block) }
-
+    private fun MockServer.badClient(): List<Pair<MediaType, (() -> Unit)>> {
         val commands = buildList {
-            add(apolloCommand { statusCode(500) })
-            add(apolloCommand { body("Malformed body") })
-            add(apolloCommand { body("""{"data": {"random": 42}}""") })
+            add { enqueueError(500) }
+            add { enqueueString("Malformed body") }
+            add { enqueueString("""{"data": {"random": 42}}""") }
         }
-        val types = MediaType.knownValues()
+        val types = MediaType.knownEntries
 
         return buildList {
             commands.forEach { c -> types.forEach { t -> add(t to c) } }

features/social/data/build.gradle.kts

@@ -2,10 +2,6 @@ plugins {
     id("katana.multiplatform.data.remote")
 }
 
-dependencies {
-    apolloMetadata(projects.core.remote)
-}
-
 katanaMultiplatform {
     commonMainDependencies {
         implementation(projects.core.remote)

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ android = "8.3.2"
 androidx-activity = "1.8.2"
 androidx-lifecycle = "2.7.0"
 androidx-splashscreen = "1.0.1"
-apollo = "3.8.3"
+apollo = "4.0.0-beta.5"
 arrow = "1.2.4"
 buildconfig = "5.3.5"
 complete-kotlin = "1.1.0"