support apollo cache in state machine

DatL4g · May 25, 2024 · 27e87fe · 27e87fe
1 parent 0887041
commit 27e87fe
Show file tree

Hide file tree

Showing 37 changed files with 911 additions and 1,062 deletions.
diff --git a/anilist/src/commonMain/graphql/PageMediaQuery.graphql b/anilist/src/commonMain/graphql/PageMediaQuery.graphql
@@ -2,14 +2,17 @@ query PageMediaQuery(
     $page: Int,
     $perPage: Int,
     $query: String,
-    $sort: [MediaSort],
+    $sort: [MediaSort!],
     $year: Int,
     $season: MediaSeason,
-    $preventGenres: [String],
+    $preventGenres: [String!],
     $type: MediaType,
     $adultContent: Boolean,
     $statusVersion: Int!,
     $html: Boolean!,
+    $wantedGenres: [String!],
+    $preventIds: [Int!],
+    $onList: Boolean
 ) {
     Page(page: $page, perPage: $perPage) {
         media(
@@ -19,7 +22,10 @@ query PageMediaQuery(
             season: $season,
             genre_not_in: $preventGenres,
             type: $type,
-            isAdult: $adultContent
+            isAdult: $adultContent,
+            genre_in: $wantedGenres,
+            id_not_in: $preventIds,
+            onList: $onList
         ) {
             id,
             idMal,

diff --git a/anilist/src/commonMain/graphql/RecommendationQuery.graphql b/anilist/src/commonMain/graphql/RecommendationQuery.graphql
diff --git a/anilist/src/commonMain/graphql/extra.graphqls b/anilist/src/commonMain/graphql/extra.graphqls
@@ -0,0 +1,12 @@
+extend type User @typePolicy(keyFields: "id")
+extend type Media @typePolicy(keyFields: "id")
+extend type Character @typePolicy(keyFields: "id")
+extend type Staff @typePolicy(keyFields: "id")
+extend type Studio @typePolicy(keyFields: "id")
+extend type MediaList @typePolicy(keyFields: "id mediaId")
+
+extend type Query @fieldPolicy(forField: "User", keyArgs: "id")
+extend type Query @fieldPolicy(forField: "Media", keyArgs: "id")
+extend type Query @fieldPolicy(forField: "Character", keyArgs: "id")
+extend type Query @fieldPolicy(forField: "Staff", keyArgs: "id")
+extend type Query @fieldPolicy(forField: "Studio", keyArgs: "id")
diff --git a/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/AiringTodayStateMachine.kt b/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/AiringTodayStateMachine.kt
@@ -4,22 +4,23 @@ import com.apollographql.apollo3.ApolloClient
 import com.freeletics.flowredux.dsl.FlowReduxStateMachine
 import dev.datlag.aniflow.anilist.model.PageAiringQuery
 import dev.datlag.aniflow.anilist.state.HomeAiringState
-import dev.datlag.aniflow.anilist.state.HomeDefaultAction
 import dev.datlag.aniflow.firebase.FirebaseFactory
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.transformLatest
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class AiringTodayStateMachine(
     private val client: ApolloClient,
     private val fallbackClient: ApolloClient,
     private val nsfw: Flow<Boolean> = flowOf(false),
     private val crashlytics: FirebaseFactory.Crashlytics?
-) : FlowReduxStateMachine<HomeAiringState, HomeDefaultAction>(
-    initialState = currentState
 ) {
 
     var currentState: HomeAiringState
@@ -28,49 +29,25 @@ class AiringTodayStateMachine(
             Companion.currentState = value
         }
 
-    private val query = nsfw.distinctUntilChanged().mapLatest {
-        PageAiringQuery.Today(
-            nsfw = it
-        )
-    }.distinctUntilChanged()
+    private val fallbackResponse = fallbackClient.query(PageAiringQuery.Today.toGraphQL()).toFlow()
 
-    init {
-        spec {
-            inState<HomeAiringState> {
-                onEnterEffect {
-                    currentState = it
-                }
-                collectWhileInState(query) { q, state ->
-                    state.override {
-                        HomeAiringState.Loading(
-                            query = q,
-                            fallback = false
-                        )
-                    }
-                }
-            }
-            inState<HomeAiringState.Loading> {
-                collectWhileInState(
-                    flowBuilder = {
-                        val usedClient = if (it.fallback) {
-                            fallbackClient
-                        } else {
-                            client
-                        }
+    private val response = client.query(PageAiringQuery.Today.toGraphQL()).toFlow().transformLatest {
+        return@transformLatest if (it.hasErrors()) {
+            emitAll(fallbackResponse)
+        } else {
+            emit(it)
+        }
+    }
 
-                        usedClient.query(it.query.toGraphQL()).toFlow()
-                    }
-                ) { response, state ->
-                    state.override {
-                        fromGraphQL(response)
-                    }
-                }
-            }
-            inState<HomeAiringState.Error> {
-                onEnterEffect {
-                    crashlytics?.log(it.throwable)
-                }
+    val airing = combine(
+        response,
+        nsfw.distinctUntilChanged()
+    ) { r, n ->
+        HomeAiringState.fromResponse(n, r).also { state ->
+            (state as? HomeAiringState.Failure)?.throwable?.let {
+                crashlytics?.log(it)
             }
+            currentState = state
         }
     }