connect to the actual API

Author: martinbonnin

shared/data/build.gradle.kts

@@ -52,6 +52,7 @@ apollo {
     generateDataBuilders.set(true)
     mapScalar("GraphQLLocalDateTime", "kotlinx.datetime.LocalDateTime", "com.apollographql.adapter.datetime.KotlinxLocalDateTimeAdapter")
     mapScalar("GraphQLInstant", "kotlinx.datetime.Instant", "fr.androidmakers.store.graphql.KotlinxInstantAdapter")
+    mapScalarToKotlinString("Markdown")
 
     @OptIn(ApolloExperimental::class)
     plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:${libs.versions.apollo.cache.get()}") {

shared/data/src/commonMain/graphql/feed.graphql

@@ -1,16 +1,12 @@
 query GetFeedMessages {
-    feedMessages {
-        ...FeedMessageDetails
+  feedItemsConnection(first: 1000) {
+    nodes {
+      ...FeedMessageDetails
     }
+  }
 }
 
-subscription OnFeedMessageAdded {
-    feedMessageAdded {
-        ...FeedMessageDetails
-    }
-}
-
-fragment FeedMessageDetails on FeedMessage {
+fragment FeedMessageDetails on FeedItem {
     id
     type
     title

shared/data/src/commonMain/graphql/schema.graphqls

@@ -162,6 +162,14 @@ enum ConferenceField {
   DAYS
 }
 
+enum FeedItemType {
+  INFO
+
+  ALERT
+
+  ANNOUNCEMENT
+}
+
 enum LinkType {
   YouTube
 
@@ -207,11 +215,13 @@ type FeatureFlags {
 type FeedItem {
   id: ID!
 
+  type: FeedItemType!
+
   createdAt: GraphQLInstant!
 
   title: String!
 
-  markdown: Markdown!
+  body: Markdown!
 }
 
 type FeedItemFailure {
@@ -463,7 +473,7 @@ input ConferenceOrderBy {
 input FeedItemInput {
   title: String
 
-  markdown: Markdown
+  body: Markdown
 }
 
 input SessionOrderBy {
@@ -502,32 +512,7 @@ directive @defer (label: String, if: Boolean! = true) on FRAGMENT_SPREAD|INLINE_
 
 directive @specifiedBy (url: String!) on SCALAR
 
-enum FeedMessageType {
-  INFO
-
-  ALERT
-
-  ANNOUNCEMENT
-}
-
-type FeedMessage {
-  id: String!
-
-  type: FeedMessageType!
-
-  title: String!
-
-  body: String!
-
-  createdAt: GraphQLInstant!
-}
-
-type RootSubscription {
-  feedMessageAdded: FeedMessage!
-}
-
 schema {
   query: RootQuery
   mutation: RootMutation
-  subscription: RootSubscription
 }

shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/FeedGraphQLRepository.kt

@@ -15,31 +15,8 @@ class FeedGraphQLRepository(
 ) : FeedRepository {
 
   override fun getFeedItems(): Flow<Result<List<FeedItem>>> {
-    val initialItems = apolloClient.query(GetFeedMessagesQuery())
+    return apolloClient.query(GetFeedMessagesQuery())
       .cacheAndNetwork()
-      .map { result -> result.map { data -> data.feedMessages.map { it.feedMessageDetails.toFeedItem() } } }
-
-    val newItems = apolloClient.subscription(OnFeedMessageAddedSubscription())
-      .toFlow()
-      .mapNotNull { response ->
-        response.data?.let { data ->
-          Result.success(listOf(data.feedMessageAdded.feedMessageDetails.toFeedItem()))
-        }
-      }
-      .catch { /* subscription error — silently stop, initial data still shown */ }
-
-    return merge(initialItems, newItems)
-      .scan<Result<List<FeedItem>>, Result<List<FeedItem>>>(Result.success(emptyList())) { acc, result ->
-        val newData = result.getOrNull()
-        if (newData == null) {
-          // Propagate error only if we have no data yet
-          if (acc.getOrNull().isNullOrEmpty()) result else acc
-        } else {
-          val existing = acc.getOrNull().orEmpty()
-          val existingIds = existing.map { it.id }.toSet()
-          val unique = newData.filter { it.id !in existingIds }
-          Result.success(existing + unique)
-        }
-      }
+      .map { result -> result.map { data -> data.feedItemsConnection.nodes.map { it.feedMessageDetails.toFeedItem() } } }
   }
 }

shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/FeedMappers.kt

@@ -3,19 +3,19 @@ package fr.androidmakers.store.graphql
 import fr.androidmakers.domain.model.FeedItem
 import fr.androidmakers.domain.model.MessageType
 import fr.androidmakers.store.graphql.fragment.FeedMessageDetails
-import fr.androidmakers.store.graphql.type.FeedMessageType
+import fr.androidmakers.store.graphql.type.FeedItemType
 
 fun FeedMessageDetails.toFeedItem(): FeedItem {
   return when (type) {
-    FeedMessageType.ALERT -> FeedItem.Alert(
+    FeedItemType.ALERT -> FeedItem.Alert(
       id = id,
       title = title,
       message = body,
     )
     else -> FeedItem.Message(
       id = id,
       type = when (type) {
-        FeedMessageType.ANNOUNCEMENT -> MessageType.ANNOUNCEMENT
+        FeedItemType.ANNOUNCEMENT -> MessageType.ANNOUNCEMENT
         else -> MessageType.INFO
       },
       title = title,