feat: improve non-nullables in responses

alvr · Apr 22, 2024 · 1f5ba84 · 1f5ba84
1 parent 674da5e
commit 1f5ba84
Show file tree

Hide file tree

Showing 20 changed files with 115 additions and 120 deletions.
diff --git a/...n/kotlin/dev/alvr/katana/buildlogic/mp/mobile/data/KatanaMultiplatformDataRemotePlugin.kt b/...n/kotlin/dev/alvr/katana/buildlogic/mp/mobile/data/KatanaMultiplatformDataRemotePlugin.kt
@@ -60,9 +60,12 @@ internal class KatanaMultiplatformDataRemotePlugin : Plugin<Project> {
     context(Project)
     private fun ApolloExtension.configureApollo() {
         service("anilist") {
+            decapitalizeFields = true
             generateAsInternal = true
-            packageName = fullPackageName
             generateMethods = listOf("equalsHashCode")
+            generateOptionalOperationVariables = false
+            packageName = fullPackageName
+            warnOnDeprecatedUsages = true
 
             if (path == CORE_PROJECT) {
                 generateApolloMetadata = true

diff --git a/common/user/data/src/commonMain/graphql/QueryUserId.graphql b/common/user/data/src/commonMain/graphql/QueryUserId.graphql
@@ -1,5 +1,5 @@
 query UserIdQuery {
-    viewer: Viewer {
-        id
+    Viewer @nonnull {
+        id @nonnull
     }
 }
diff --git a/common/user/data/src/commonMain/graphql/QueryUserInfo.graphql b/common/user/data/src/commonMain/graphql/QueryUserInfo.graphql
@@ -1,8 +1,8 @@
 query UserInfoQuery {
-    user: Viewer {
-        name
-        avatar {
-            medium
+    Viewer @nonnull {
+        name @nonnull
+        avatar @nonnull {
+            large @nonnull
         }
         bannerImage
     }

diff --git a/...r/data/src/commonMain/kotlin/dev/alvr/katana/common/user/data/mappers/responses/userId.kt b/...r/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 = viewer.id,
 )
diff --git a/...data/src/commonMain/kotlin/dev/alvr/katana/common/user/data/mappers/responses/userInfo.kt b/...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 = viewer.name,
+    avatar = viewer.avatar.large,
+    banner = viewer.bannerImage,
 )
diff --git a/...c/commonMain/kotlin/dev/alvr/katana/common/user/data/sources/id/UserIdRemoteSourceImpl.kt b/...c/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()
 }
diff --git a/...mmonMain/kotlin/dev/alvr/katana/common/user/data/sources/info/UserInfoRemoteSourceImpl.kt b/...mmonMain/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" }
 

diff --git a/...n/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/models/UserInfo.kt b/...n/user/domain/src/commonMain/kotlin/dev/alvr/katana/common/user/domain/models/UserInfo.kt
@@ -3,5 +3,5 @@ package dev.alvr.katana.common.user.domain.models
 data class UserInfo(
     val username: String,
     val avatar: String,
-    val banner: String,
+    val banner: String?,
 )
diff --git a/core/remote/src/commonMain/kotlin/dev/alvr/katana/core/remote/extensions.kt b/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
 }
diff --git a/...count/ui/src/commonMain/kotlin/dev/alvr/katana/features/account/ui/entities/UserInfoUi.kt b/...count/ui/src/commonMain/kotlin/dev/alvr/katana/features/account/ui/entities/UserInfoUi.kt
@@ -5,5 +5,5 @@ import dev.alvr.katana.core.common.empty
 internal data class UserInfoUi(
     val username: String = String.empty,
     val avatar: String = String.empty,
-    val banner: String = String.empty,
+    val banner: String? = null,
 )
diff --git a/features/lists/data/src/commonMain/graphql/FragmentMediaEntry.graphql b/features/lists/data/src/commonMain/graphql/FragmentMediaEntry.graphql
@@ -1,14 +1,14 @@
-fragment MediaEntry on Media {
-    id
-    title {
-        userPreferred
+fragment mediaEntry on Media {
+    id @nonnull
+    title @nonnull {
+        userPreferred @nonnull
     }
     episodes
     chapters
     volumes
     format
-    coverImage {
-        large
+    coverImage @nonnull {
+        large @nonnull
     }
     nextAiringEpisode {
         airingAt

diff --git a/features/lists/data/src/commonMain/graphql/FragmentMediaListEntry.graphql b/features/lists/data/src/commonMain/graphql/FragmentMediaListEntry.graphql
@@ -1,12 +1,13 @@
-fragment MediaListEntry on MediaList {
-    id
-    score
+fragment mediaListEntry on MediaList {
+    id @nonnull
+    score @nonnull
     progress
     progressVolumes
     repeat
     private
     notes
     hiddenFromStatusLists
+    updatedAt
     startedAt {
         year
         month
@@ -17,5 +18,7 @@ fragment MediaListEntry on MediaList {
         month
         day
     }
-    updatedAt
+    media @nonnull {
+        ...mediaEntry
+    }
 }
diff --git a/features/lists/data/src/commonMain/graphql/MutationMediaListEntries.graphql b/features/lists/data/src/commonMain/graphql/MutationMediaListEntries.graphql
@@ -21,7 +21,7 @@ mutation MediaListEntries(
         hiddenFromStatusLists: $hiddenFromStatusLists,
         startedAt: $startedAt,
         completedAt: $completedAt,
-    ) {
-        ...MediaListEntry
+    ) @nonnull {
+        ...mediaListEntry
     }
 }
diff --git a/features/lists/data/src/commonMain/graphql/QueryMediaListCollection.graphql b/features/lists/data/src/commonMain/graphql/QueryMediaListCollection.graphql
@@ -1,21 +1,18 @@
 query MediaListCollection($user: Int, $type: MediaType!) {
-    collection: MediaListCollection(userId: $user, type: $type) @nonnull {
+    MediaListCollection(userId: $user, type: $type) @nonnull {
         lists @nonnull {
+            name @nonnull
             entries @nonnull {
-                ...MediaListEntry
-                media @nonnull {
-                    ...MediaEntry
-                }
+                ...mediaListEntry
             }
-            name
         }
-        user {
-            mediaListOptions {
-                animeList {
-                    sectionOrder
+        user @nonnull {
+            mediaListOptions @nonnull {
+                animeList @nonnull {
+                    sectionOrder @nonnull
                 }
-                mangaList {
-                    sectionOrder
+                mangaList @nonnull {
+                    sectionOrder @nonnull
                 }
             }
         }

diff --git a/...a/src/commonMain/kotlin/dev/alvr/katana/features/lists/data/mappers/requests/mediaList.kt b/...a/src/commonMain/kotlin/dev/alvr/katana/features/lists/data/mappers/requests/mediaList.kt
@@ -1,18 +1,17 @@
 package dev.alvr.katana.features.lists.data.mappers.requests
 
-import com.apollographql.apollo3.api.Optional
 import dev.alvr.katana.features.lists.data.MediaListEntriesMutation
 import dev.alvr.katana.features.lists.domain.models.lists.MediaList
 
 internal fun MediaList.toMutation() = MediaListEntriesMutation(
     id = id,
-    score = Optional.presentIfNotNull(score),
-    progress = Optional.presentIfNotNull(progress),
-    progressVolumes = Optional.presentIfNotNull(progressVolumes),
-    repeat = Optional.presentIfNotNull(repeat),
-    private = Optional.presentIfNotNull(private),
-    notes = Optional.presentIfNotNull(notes),
-    hiddenFromStatusLists = Optional.presentIfNotNull(hiddenFromStatusLists),
-    startedAt = Optional.presentIfNotNull(startedAt.toFuzzyDate().takeIfValid()),
-    completedAt = Optional.presentIfNotNull(completedAt.toFuzzyDate().takeIfValid()),
+    score = score,
+    progress = progress,
+    progressVolumes = progressVolumes,
+    repeat = repeat,
+    private = private,
+    notes = notes,
+    hiddenFromStatusLists = hiddenFromStatusLists,
+    startedAt = startedAt.toFuzzyDate().takeIfValid(),
+    completedAt = completedAt.toFuzzyDate().takeIfValid(),
 )
diff --git a/...src/commonMain/kotlin/dev/alvr/katana/features/lists/data/mappers/responses/animeEntry.kt b/...src/commonMain/kotlin/dev/alvr/katana/features/lists/data/mappers/responses/animeEntry.kt
@@ -3,15 +3,13 @@ package dev.alvr.katana.features.lists.data.mappers.responses
 import dev.alvr.katana.features.lists.domain.models.entries.MediaEntry
 import dev.alvr.katana.features.lists.data.fragment.MediaEntry as MediaEntryFragment
 
-internal fun MediaEntryFragment?.animeEntry() = let { entry ->
-    MediaEntry.Anime(
-        entry = mediaEntry(),
-        episodes = entry?.episodes,
-        nextEpisode = entry?.nextAiringEpisode?.let { next ->
-            MediaEntry.Anime.NextEpisode(
-                number = next.episode,
-                at = next.airingAt.toLocalDateTime(),
-            )
-        },
-    )
-}
+internal fun MediaEntryFragment.animeEntry() = MediaEntry.Anime(
+    entry = mediaEntry(),
+    episodes = episodes,
+    nextEpisode = nextAiringEpisode?.let { next ->
+        MediaEntry.Anime.NextEpisode(
+            number = next.episode,
+            at = next.airingAt.toLocalDateTime(),
+        )
+    },
+)
diff --git a/...src/commonMain/kotlin/dev/alvr/katana/features/lists/data/mappers/responses/mangaEntry.kt b/...src/commonMain/kotlin/dev/alvr/katana/features/lists/data/mappers/responses/mangaEntry.kt
@@ -3,10 +3,8 @@ package dev.alvr.katana.features.lists.data.mappers.responses
 import dev.alvr.katana.features.lists.domain.models.entries.MediaEntry
 import dev.alvr.katana.features.lists.data.fragment.MediaEntry as MediaEntryFragment
 
-internal fun MediaEntryFragment?.mangaEntry() = let { entry ->
-    MediaEntry.Manga(
-        entry = mediaEntry(),
-        chapters = entry?.chapters,
-        volumes = entry?.volumes,
-    )
-}
+internal fun MediaEntryFragment.mangaEntry() = MediaEntry.Manga(
+    entry = mediaEntry(),
+    chapters = chapters,
+    volumes = volumes,
+)
diff --git a/...src/commonMain/kotlin/dev/alvr/katana/features/lists/data/mappers/responses/mediaEntry.kt b/...src/commonMain/kotlin/dev/alvr/katana/features/lists/data/mappers/responses/mediaEntry.kt
@@ -1,16 +1,15 @@
 package dev.alvr.katana.features.lists.data.mappers.responses
 
-import dev.alvr.katana.core.common.orZero
 import dev.alvr.katana.core.remote.type.MediaFormat
 import dev.alvr.katana.features.lists.domain.models.entries.CommonMediaEntry
 import dev.alvr.katana.features.lists.data.fragment.MediaEntry as MediaEntryFragment
 
-internal fun MediaEntryFragment?.mediaEntry() = let { entry ->
+internal fun MediaEntryFragment.mediaEntry() = let { entry ->
     CommonMediaEntry(
-        id = entry?.id.orZero(),
-        title = entry?.title?.userPreferred.orEmpty(),
-        coverImage = entry?.coverImage?.large.orEmpty(),
-        format = entry?.format.toFormat(),
+        id = entry.id,
+        title = entry.title.userPreferred,
+        coverImage = entry.coverImage.large,
+        format = entry.format.toFormat(),
     )
 }
 

diff --git a/.../src/commonMain/kotlin/dev/alvr/katana/features/lists/data/mappers/responses/mediaList.kt b/.../src/commonMain/kotlin/dev/alvr/katana/features/lists/data/mappers/responses/mediaList.kt
@@ -1,6 +1,7 @@
 package dev.alvr.katana.features.lists.data.mappers.responses
 
 import dev.alvr.katana.core.common.orZero
+import dev.alvr.katana.core.common.zero
 import dev.alvr.katana.core.remote.type.MediaType
 import dev.alvr.katana.features.lists.data.MediaListCollectionQuery
 import dev.alvr.katana.features.lists.domain.models.entries.MediaEntry
@@ -9,40 +10,35 @@ import dev.alvr.katana.features.lists.domain.models.lists.MediaListEntry
 import dev.alvr.katana.features.lists.domain.models.lists.MediaListGroup
 import dev.alvr.katana.features.lists.data.fragment.MediaEntry as MediaEntryFragment
 
-internal fun <T : MediaEntry> MediaListCollectionQuery.Data.mediaList(type: MediaType): List<MediaListGroup<T>> =
-    collection.lists.asSequence().map { list ->
-        val entries = list?.entries.orEmpty().asSequence().mapNotNull { entry ->
-            entry?.toModel<T>(type)
-        }.toList()
-
+internal operator fun <T : MediaEntry> MediaListCollectionQuery.Data.invoke(type: MediaType): List<MediaListGroup<T>> =
+    mediaListCollection.listsFilterNotNull().map { list ->
         MediaListGroup(
-            name = list?.name.orEmpty(),
-            entries = entries,
+            name = list.name,
+            entries = list.entriesFilterNotNull().map { entry -> entry.toModel<T>(type) }.toList(),
         )
-    }.sortedBy { sortLists(type, it.name) }.toList()
+    }.sortedBy { sortLists(type, it.name) }
 
 @Suppress("UNCHECKED_CAST")
 private fun <T : MediaEntry> MediaListCollectionQuery.Entry.toModel(type: MediaType) =
-    mediaListEntry.let { entry ->
-        val list = MediaList(
-            id = entry.id,
-            score = entry.score.orZero(),
-            progress = entry.progress.orZero(),
-            progressVolumes = entry.progressVolumes,
-            repeat = entry.repeat.orZero(),
-            private = entry.private ?: false,
-            notes = entry.notes.orEmpty(),
-            hiddenFromStatusLists = entry.hiddenFromStatusLists ?: false,
-            startedAt = entry.startedAt?.let { date ->
-                dateMapper(date.day, date.month, date.year)
-            },
-            completedAt = entry.completedAt?.let { date ->
-                dateMapper(date.day, date.month, date.year)
-            },
-            updatedAt = entry.updatedAt?.toLocalDateTime(),
-        )
+    with(mediaListEntry) {
         MediaListEntry(
-            list = list,
+            list = MediaList(
+                id = id,
+                score = score,
+                progress = progress.orZero(),
+                progressVolumes = progressVolumes,
+                repeat = repeat.orZero(),
+                private = private ?: false,
+                notes = notes.orEmpty(),
+                hiddenFromStatusLists = hiddenFromStatusLists ?: false,
+                startedAt = startedAt?.let { date ->
+                    dateMapper(date.day, date.month, date.year)
+                },
+                completedAt = completedAt?.let { date ->
+                    dateMapper(date.day, date.month, date.year)
+                },
+                updatedAt = updatedAt?.toLocalDateTime(),
+            ),
             entry = media.mediaEntry.toMedia(type) as T,
         )
     }
@@ -53,15 +49,12 @@ private fun MediaEntryFragment.toMedia(type: MediaType) = type.onMediaEntry(
 )
 
 private fun MediaListCollectionQuery.Data.sortLists(type: MediaType, listName: String) =
-    with(collection.user?.mediaListOptions) {
+    with(mediaListCollection.user.mediaListOptions) {
         type.onMediaEntry(
-            anime = { this?.animeList?.sectionOrder.orEmpty().listPosition(listName) },
-            manga = { this?.mangaList?.sectionOrder.orEmpty().listPosition(listName) },
+            anime = { animeList.sectionOrder.listPosition(listName) },
+            manga = { mangaList.sectionOrder.listPosition(listName) },
         )
     }
 
-private fun List<String?>.listPosition(listName: String) = if (listName.isEmpty()) {
-    size
-} else {
-    indexOf(listName)
-}
+private fun List<String?>.listPosition(listName: String) =
+    indexOf(listName).takeIf { it >= Int.zero } ?: size