Merge pull request DroidKaigi#767 from DroidKaigi/fix-error-handring

Fix error handring feature branch
yaoandy107 · Sep 28, 2022 · 56ad640 · 56ad640
2 parents bc09557 + 5f08b72
commit 56ad640
Show file tree

Hide file tree

Showing 29 changed files with 371 additions and 79 deletions.
diff --git a/app-ios/Sources/ContributorFeature/ContributorView.swift b/app-ios/Sources/ContributorFeature/ContributorView.swift
@@ -29,6 +29,7 @@ public let contributorReducer = Reducer<ContributorState, ContributorAction, Con
     switch action {
     case .refresh:
         return .run { @MainActor subscriber in
+            try await environment.contributorsRepository.refresh()
             for try await result: [Contributor] in environment.contributorsRepository.contributors().stream() {
                 await subscriber.send(
                     .refreshResponse(

diff --git a/app-ios/Sources/SponsorFeature/SponsorView.swift b/app-ios/Sources/SponsorFeature/SponsorView.swift
@@ -47,6 +47,7 @@ public let sponsorReducer = Reducer<SponsorState, SponsorAction, SponsorEnvironm
     case .refresh:
         state.isLoading = true
         return .run { @MainActor subscriber in
+            try await environment.sponsorsRepository.refresh()
             for try await result: [Sponsor] in environment.sponsorsRepository.sponsors().stream() {
                 await subscriber.send(
                     .refreshResponse(

diff --git a/app-ios/Sources/StaffFeature/StaffView.swift b/app-ios/Sources/StaffFeature/StaffView.swift
@@ -32,6 +32,7 @@ public let staffReducer = Reducer<StaffState, StaffAction, StaffEnvironment> { s
     switch action {
     case .refresh:
         return .run { @MainActor subscriber in
+            try await environment.staffRepository.refresh()
             for try await result: [Staff] in environment.staffRepository.staff().stream() {
                 await subscriber.send(
                     .refreshResponse(

diff --git a/...kotlin/io/github/droidkaigi/confsched2022/data/contributors/DataContributorsRepository.kt b/...kotlin/io/github/droidkaigi/confsched2022/data/contributors/DataContributorsRepository.kt
@@ -3,27 +3,30 @@ package io.github.droidkaigi.confsched2022.data.contributors
 import io.github.droidkaigi.confsched2022.model.Contributor
 import io.github.droidkaigi.confsched2022.model.ContributorsRepository
 import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toPersistentList
-import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.callbackFlow
 
 // TODO: Move to core-testing, once contributors server is created
 public class DataContributorsRepository(
     private val contributorsApi: ContributorsApi,
 ) : ContributorsRepository {
+    private val contributorsStateFlow =
+        MutableStateFlow<PersistentList<Contributor>>(persistentListOf())
+
     override fun contributors(): Flow<PersistentList<Contributor>> {
         return callbackFlow {
-            send(
-                contributorsApi
-                    .contributors()
-                    .toPersistentList()
-            )
-            awaitClose { }
+            contributorsStateFlow.collect {
+                send(it)
+            }
         }
     }
 
     override suspend fun refresh() {
-        TODO("Not yet implemented")
+        contributorsStateFlow.value = contributorsApi
+            .contributors()
+            .toPersistentList()
     }
 }
diff --git a/...kotlin/io/github/droidkaigi/confsched2022/data/contributors/FakeContributorsRepository.kt b/...kotlin/io/github/droidkaigi/confsched2022/data/contributors/FakeContributorsRepository.kt
@@ -14,6 +14,5 @@ public class FakeContributorsRepository : ContributorsRepository {
     }
 
     override suspend fun refresh() {
-        TODO("Not yet implemented")
     }
 }
diff --git a/...monMain/kotlin/io/github/droidkaigi/confsched2022/data/sponsors/DataSponsorsRepository.kt b/...monMain/kotlin/io/github/droidkaigi/confsched2022/data/sponsors/DataSponsorsRepository.kt
@@ -3,18 +3,25 @@ package io.github.droidkaigi.confsched2022.data.sponsors
 import io.github.droidkaigi.confsched2022.model.Sponsor
 import io.github.droidkaigi.confsched2022.model.SponsorsRepository
 import kotlinx.collections.immutable.PersistentList
-import kotlinx.coroutines.channels.awaitClose
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.callbackFlow
 
 public class DataSponsorsRepository(
     private val sponsorsApi: SponsorsApi
 ) : SponsorsRepository {
+    private val sponsorsStateFlow =
+        MutableStateFlow<PersistentList<Sponsor>>(persistentListOf())
     override fun sponsors(): Flow<PersistentList<Sponsor>> =
         callbackFlow {
-            send(
-                sponsorsApi.sponsors()
-            )
-            awaitClose { }
+            sponsorsStateFlow.collect {
+                send(it)
+            }
         }
+
+    override suspend fun refresh() {
+        sponsorsStateFlow.value = sponsorsApi
+            .sponsors()
+    }
 }
diff --git a/...monMain/kotlin/io/github/droidkaigi/confsched2022/data/sponsors/FakeSponsorsRepository.kt b/...monMain/kotlin/io/github/droidkaigi/confsched2022/data/sponsors/FakeSponsorsRepository.kt
@@ -9,4 +9,7 @@ import kotlinx.coroutines.flow.flowOf
 
 public class FakeSponsorsRepository : SponsorsRepository {
     override fun sponsors(): Flow<PersistentList<Sponsor>> = flowOf(Sponsor.fakes())
+
+    override suspend fun refresh() {
+    }
 }
diff --git a/...rc/commonMain/kotlin/io/github/droidkaigi/confsched2022/data/staff/DataStaffRepository.kt b/...rc/commonMain/kotlin/io/github/droidkaigi/confsched2022/data/staff/DataStaffRepository.kt
@@ -3,22 +3,29 @@ package io.github.droidkaigi.confsched2022.data.staff
 import io.github.droidkaigi.confsched2022.model.Staff
 import io.github.droidkaigi.confsched2022.model.StaffRepository
 import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toPersistentList
-import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.callbackFlow
 
 public class DataStaffRepository(
     private val staffApi: StaffApi
 ) : StaffRepository {
+    private val staffStateFlow =
+        MutableStateFlow<PersistentList<Staff>>(persistentListOf())
+
     override fun staff(): Flow<PersistentList<Staff>> {
         return callbackFlow {
-            send(
-                staffApi
-                    .staff()
-                    .toPersistentList()
-            )
-            awaitClose { }
+            staffStateFlow.collect {
+                send(it)
+            }
         }
     }
+
+    override suspend fun refresh() {
+        staffStateFlow.value = staffApi
+            .staff()
+            .toPersistentList()
+    }
 }
diff --git a/...rc/commonMain/kotlin/io/github/droidkaigi/confsched2022/data/staff/FakeStaffRepository.kt b/...rc/commonMain/kotlin/io/github/droidkaigi/confsched2022/data/staff/FakeStaffRepository.kt
@@ -12,4 +12,7 @@ public class FakeStaffRepository : StaffRepository {
     override fun staff(): Flow<PersistentList<Staff>> {
         return flowOf(staff)
     }
+
+    override suspend fun refresh() {
+    }
 }
diff --git a/...odel/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/model/SponsorsRepository.kt b/...odel/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/model/SponsorsRepository.kt
@@ -5,4 +5,6 @@ import kotlinx.coroutines.flow.Flow
 
 public interface SponsorsRepository {
     public fun sponsors(): Flow<PersistentList<Sponsor>>
+
+    public suspend fun refresh()
 }
diff --git a/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/model/StaffRepository.kt b/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2022/model/StaffRepository.kt
@@ -5,4 +5,6 @@ import kotlinx.coroutines.flow.Flow
 
 public interface StaffRepository {
     public fun staff(): Flow<PersistentList<Staff>>
+
+    public suspend fun refresh()
 }
diff --git a/...re/announcement/AppErrorSnackbarEffect.kt → .../feature/common/AppErrorSnackbarEffect.kt b/...re/announcement/AppErrorSnackbarEffect.kt → .../feature/common/AppErrorSnackbarEffect.kt
@@ -1,4 +1,4 @@
-package io.github.droidkaigi.confsched2022.feature.announcement
+package io.github.droidkaigi.confsched2022.feature.common
 
 import androidx.compose.material3.SnackbarDuration.Long
 import androidx.compose.material3.SnackbarHostState

diff --git a/...nt/src/main/java/io/github/droidkaigi/confsched2022/feature/announcement/Announcements.kt b/...nt/src/main/java/io/github/droidkaigi/confsched2022/feature/announcement/Announcements.kt
@@ -40,6 +40,7 @@ import io.github.droidkaigi.confsched2022.designsystem.components.KaigiScaffold
 import io.github.droidkaigi.confsched2022.designsystem.components.KaigiTopAppBar
 import io.github.droidkaigi.confsched2022.designsystem.theme.KaigiColors
 import io.github.droidkaigi.confsched2022.designsystem.theme.KaigiTheme
+import io.github.droidkaigi.confsched2022.feature.common.AppErrorSnackbarEffect
 import io.github.droidkaigi.confsched2022.model.AnnouncementsByDate
 import io.github.droidkaigi.confsched2022.model.fakes
 import io.github.droidkaigi.confsched2022.strings.Strings

diff --git a/...ors/src/main/java/io/github/droidkaigi/confsched2022/feature/contributors/Contributors.kt b/...ors/src/main/java/io/github/droidkaigi/confsched2022/feature/contributors/Contributors.kt
@@ -7,9 +7,11 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
@@ -19,6 +21,7 @@ import io.github.droidkaigi.confsched2022.designsystem.components.KaigiScaffold
 import io.github.droidkaigi.confsched2022.designsystem.components.KaigiTopAppBar
 import io.github.droidkaigi.confsched2022.designsystem.components.UsernameRow
 import io.github.droidkaigi.confsched2022.designsystem.theme.KaigiTheme
+import io.github.droidkaigi.confsched2022.feature.common.AppErrorSnackbarEffect
 import io.github.droidkaigi.confsched2022.model.Contributor
 import io.github.droidkaigi.confsched2022.model.fakes
 import io.github.droidkaigi.confsched2022.strings.Strings
@@ -38,6 +41,8 @@ fun ContributorsScreenRoot(
         uiModel = uiModel,
         showNavigationIcon = showNavigationIcon,
         onNavigationIconClick = onNavigationIconClick,
+        onRetryButtonClick = { viewModel.onRetryButtonClick() },
+        onAppErrorNotified = { viewModel.onAppErrorNotified() },
         onLinkClick = onLinkClick
     )
 }
@@ -47,10 +52,15 @@ fun Contributors(
     uiModel: ContributorsUiModel,
     showNavigationIcon: Boolean,
     onNavigationIconClick: () -> Unit,
+    onRetryButtonClick: () -> Unit,
+    onAppErrorNotified: () -> Unit,
     onLinkClick: (url: String, packageName: String?) -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val snackbarHostState = remember { SnackbarHostState() }
+
     KaigiScaffold(
+        snackbarHostState = snackbarHostState,
         modifier = modifier,
         topBar = {
             KaigiTopAppBar(
@@ -64,9 +74,17 @@ fun Contributors(
             )
         }
     ) { innerPadding ->
+        AppErrorSnackbarEffect(
+            appError = uiModel.appError,
+            snackBarHostState = snackbarHostState,
+            onAppErrorNotified = onAppErrorNotified,
+            onRetryButtonClick = onRetryButtonClick
+        )
         Box {
             when (uiModel.state) {
-                is Error -> TODO()
+                is Error -> {
+                    // Do nothing
+                }
                 Loading -> Box(
                     modifier = Modifier.padding(innerPadding).fillMaxSize(),
                     contentAlignment = Alignment.Center,
@@ -103,10 +121,13 @@ fun ContributorsPreview() {
             uiModel = ContributorsUiModel(
                 state = Success(
                     Contributor.fakes()
-                )
+                ),
+                appError = null,
             ),
             showNavigationIcon = true,
             onNavigationIconClick = {},
+            onRetryButtonClick = {},
+            onAppErrorNotified = {},
             onLinkClick = { _, _ -> },
         )
     }

diff --git a/.../main/java/io/github/droidkaigi/confsched2022/feature/contributors/ContributorsUiModel.kt b/.../main/java/io/github/droidkaigi/confsched2022/feature/contributors/ContributorsUiModel.kt
@@ -1,7 +1,11 @@
 package io.github.droidkaigi.confsched2022.feature.contributors
 
+import io.github.droidkaigi.confsched2022.model.AppError
 import io.github.droidkaigi.confsched2022.model.Contributor
 import io.github.droidkaigi.confsched2022.ui.UiLoadState
 import kotlinx.collections.immutable.PersistentList
 
-data class ContributorsUiModel(val state: UiLoadState<PersistentList<Contributor>>)
+data class ContributorsUiModel(
+    val state: UiLoadState<PersistentList<Contributor>>,
+    val appError: AppError?
+)
diff --git a/...ain/java/io/github/droidkaigi/confsched2022/feature/contributors/ContributorsViewModel.kt b/...ain/java/io/github/droidkaigi/confsched2022/feature/contributors/ContributorsViewModel.kt
@@ -3,33 +3,64 @@ package io.github.droidkaigi.confsched2022.feature.contributors
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.cash.molecule.AndroidUiDispatcher
 import app.cash.molecule.RecompositionClock.ContextClock
 import dagger.hilt.android.lifecycle.HiltViewModel
+import io.github.droidkaigi.confsched2022.model.AppError
 import io.github.droidkaigi.confsched2022.model.ContributorsRepository
 import io.github.droidkaigi.confsched2022.ui.UiLoadState
 import io.github.droidkaigi.confsched2022.ui.asLoadState
 import io.github.droidkaigi.confsched2022.ui.moleculeComposeState
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class ContributorsViewModel @Inject constructor(
-    contributorsRepository: ContributorsRepository,
+    private val contributorsRepository: ContributorsRepository,
 ) : ViewModel() {
     private val moleculeScope =
         CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
 
-    val uiModel: State<ContributorsUiModel>
+    private val contributorsFlow = contributorsRepository
+        .contributors()
+        .asLoadState()
+
+    private var appError by mutableStateOf<AppError?>(null)
+
+    val uiModel: State<ContributorsUiModel> = moleculeScope.moleculeComposeState(
+        clock = ContextClock
+    ) {
+        val contributorLoadState by contributorsFlow.collectAsState(initial = UiLoadState.Loading)
+        ContributorsUiModel(
+            state = contributorLoadState,
+            appError = appError
+        )
+    }
 
     init {
-        val dataFlow = contributorsRepository.contributors().asLoadState()
+        refresh()
+    }
 
-        uiModel = moleculeScope.moleculeComposeState(clock = ContextClock) {
-            val data by dataFlow.collectAsState(initial = UiLoadState.Loading)
-            ContributorsUiModel(data)
+    fun onRetryButtonClick() {
+        refresh()
+    }
+
+    private fun refresh() {
+        viewModelScope.launch {
+            try {
+                contributorsRepository.refresh()
+            } catch (e: AppError) {
+                appError = e
+            }
         }
     }
+
+    fun onAppErrorNotified() {
+        appError = null
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         override suspend fun refresh() {
-            TODO("Not yet implemented")
         }
     }