Restructure data layer. Custom models in :data-common, GraphQL schema and queries in :data-runtime-cloud with mappers.

Author: ychescale9

kmm/apollo-models/build.gradle.kts

@@ -1,14 +1,3 @@
 plugins {
     id("kstreamlined.kmm.jvm-and-ios")
 }
-
-kotlin {
-    sourceSets {
-        commonMain {
-            dependencies {
-                api(project(":kmm:apollo-models"))
-                implementation(libs.kotlinx.coroutines.core)
-            }
-        }
-    }
-}

kmm/data-common/build.gradle.kts

@@ -1,17 +1,16 @@
 package io.github.reactivecircus.kstreamlined.kmm.data.feed
 
-import io.github.reactivecircus.kstreamlined.kmm.apollo.FeedEntriesQuery
-import io.github.reactivecircus.kstreamlined.kmm.apollo.FeedSourcesQuery
-import io.github.reactivecircus.kstreamlined.kmm.apollo.type.FeedSourceKey
+import io.github.reactivecircus.kstreamlined.kmm.data.feed.model.FeedEntry
+import io.github.reactivecircus.kstreamlined.kmm.data.feed.model.FeedSource
 
 interface FeedRepo {
 
     suspend fun loadFeedSources(
         refresh: Boolean = false
-    ): List<FeedSourcesQuery.FeedSource>
+    ): List<FeedSource>
 
     suspend fun loadFeedEntries(
-        filters: List<FeedSourceKey>? = null,
+        filters: List<FeedSource.Key>? = null,
         refresh: Boolean = false,
-    ): List<FeedEntriesQuery.FeedEntry>
+    ): List<FeedEntry>
 }

kmm/data-common/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmm/data/feed/FeedRepo.kt

@@ -0,0 +1,43 @@
+package io.github.reactivecircus.kstreamlined.kmm.data.feed.model
+
+sealed interface FeedEntry {
+    val id: String
+    val title: String
+    val publishTimestamp: String
+    val contentUrl: String
+
+    data class KotlinBlog(
+        override val id: String,
+        override val title: String,
+        override val publishTimestamp: String,
+        override val contentUrl: String,
+        val featuredImageUrl: String,
+        val description: String,
+    ) : FeedEntry
+
+    data class KotlinYouTube(
+        override val id: String,
+        override val title: String,
+        override val publishTimestamp: String,
+        override val contentUrl: String,
+        val thumbnailUrl: String,
+        val description: String,
+    ) : FeedEntry
+
+    data class TalkingKotlin(
+        override val id: String,
+        override val title: String,
+        override val publishTimestamp: String,
+        override val contentUrl: String,
+        val podcastLogoUrl: String,
+        val tags: List<String>,
+    ) : FeedEntry
+
+    data class KotlinWeekly(
+        override val id: String,
+        override val title: String,
+        override val publishTimestamp: String,
+        override val contentUrl: String,
+        val newsletterLogoUrl: String,
+    ) : FeedEntry
+}

kmm/data-common/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmm/data/feed/model/FeedEntry.kt

@@ -0,0 +1,14 @@
+package io.github.reactivecircus.kstreamlined.kmm.data.feed.model
+
+data class FeedSource(
+    val key: Key,
+    val title: String,
+    val description: String,
+) {
+    enum class Key {
+        KotlinBlog,
+        KotlinYouTubeChannel,
+        TalkingKotlinPodcast,
+        KotlinWeekly,
+    }
+}

kmm/data-common/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmm/data/feed/model/FeedSource.kt

@@ -1,6 +1,16 @@
 plugins {
     id("kstreamlined.kmm.jvm-and-ios")
     id("kstreamlined.kmm.test")
+    id("com.apollographql.apollo3")
+}
+
+apollo {
+    service("kstreamlined") {
+        packageName.set("io.github.reactivecircus.kstreamlined.graphql")
+        codegenModels.set("responseBased")
+        flattenModels.set(true)
+        generateDataBuilders.set(true)
+    }
 }
 
 kotlin {

kmm/data-runtime-cloud/build.gradle.kts

@@ -3,35 +3,42 @@ package io.github.reactivecircus.kstreamlined.kmm.data.feed
 import co.touchlab.kermit.Logger
 import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo3.api.Optional
-import io.github.reactivecircus.kstreamlined.kmm.apollo.FeedEntriesQuery
-import io.github.reactivecircus.kstreamlined.kmm.apollo.FeedSourcesQuery
-import io.github.reactivecircus.kstreamlined.kmm.apollo.type.FeedSourceKey
+import io.github.reactivecircus.kstreamlined.graphql.FeedEntriesQuery
+import io.github.reactivecircus.kstreamlined.graphql.FeedSourcesQuery
+import io.github.reactivecircus.kstreamlined.kmm.data.feed.mapper.toApollo
+import io.github.reactivecircus.kstreamlined.kmm.data.feed.mapper.toModel
+import io.github.reactivecircus.kstreamlined.kmm.data.feed.model.FeedEntry
+import io.github.reactivecircus.kstreamlined.kmm.data.feed.model.FeedSource
 import io.github.reactivecircus.kstreamlined.kmm.data.networking.defaultFetchPolicy
 
 class CloudFeedRepo(private val apolloClient: ApolloClient) : FeedRepo {
 
-    override suspend fun loadFeedSources(refresh: Boolean): List<FeedSourcesQuery.FeedSource> {
+    override suspend fun loadFeedSources(refresh: Boolean): List<FeedSource> {
         return runCatching {
             apolloClient.query(FeedSourcesQuery())
                 .defaultFetchPolicy(refresh)
                 .execute()
                 .dataAssertNoErrors.feedSources
         }.onFailure {
             Logger.w("Query failed", it)
-        }.getOrThrow()
+        }.getOrThrow().map { it.toModel() }
     }
 
     override suspend fun loadFeedEntries(
-        filters: List<FeedSourceKey>?,
+        filters: List<FeedSource.Key>?,
         refresh: Boolean,
-    ): List<FeedEntriesQuery.FeedEntry> {
+    ): List<FeedEntry> {
         return runCatching {
-            apolloClient.query(FeedEntriesQuery(filters = Optional.presentIfNotNull(filters)))
+            apolloClient.query(
+                FeedEntriesQuery(
+                    filters = Optional.presentIfNotNull(filters?.map { it.toApollo() })
+                )
+            )
                 .defaultFetchPolicy(refresh)
                 .execute()
                 .dataAssertNoErrors.feedEntries
         }.onFailure {
             Logger.w("Query failed", it)
-        }.getOrThrow()
+        }.getOrThrow().map { it.toModel() }
     }
 }