Merge pull request #19 from Tgo1014/feature/flow-updates

Flow updates

Author: johsoe

app/src/main/java/com/monstarlab/arch/extensions/UseCaseExtensions.kt

@@ -3,25 +3,28 @@ package com.monstarlab.arch.extensions
 import com.monstarlab.core.domain.error.ErrorModel
 import com.monstarlab.core.domain.error.toError
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.transform
-
+import timber.log.Timber
 
 sealed class UseCaseResult<out T> {
     data class Success<T>(val value: T) : UseCaseResult<T>()
     data class Error(val error: ErrorModel) : UseCaseResult<Nothing>()
 }
 
 suspend inline fun <T> safeUseCase(
-        crossinline block: suspend () -> T
+    crossinline block: suspend () -> T,
 ): UseCaseResult<T> = try {
     UseCaseResult.Success(block())
 } catch (e: ErrorModel) {
     UseCaseResult.Error(e.toError())
 }
 
-inline fun <T> safeFlow(
-        crossinline block: suspend () -> T
+inline fun <T> useCaseFlow(
+    crossinline block: suspend () -> T,
 ): Flow<UseCaseResult<T>> = flow {
     try {
         val repoResult = block()
@@ -33,6 +36,15 @@ inline fun <T> safeFlow(
     }
 }
 
+fun <T> observableFlow(block: suspend FlowCollector<T>.() -> Unit): Flow<UseCaseResult<T>> = flow(block)
+    .catch { exception ->
+        Timber.e(exception)
+        UseCaseResult.Error(exception.toError())
+    }
+    .map {
+        UseCaseResult.Success(it)
+    }
+
 fun <T> Flow<UseCaseResult<T>>.onSuccess(action: suspend (T) -> Unit): Flow<UseCaseResult<T>> = transform { result ->
     if(result is UseCaseResult.Success<T>) {
         action(result.value)

app/src/main/java/com/monstarlab/core/usecases/blog/GetPostsUseCase.kt

@@ -1,7 +1,7 @@
 package com.monstarlab.core.usecases.blog
 
 import com.monstarlab.arch.extensions.UseCaseResult
-import com.monstarlab.arch.extensions.safeFlow
+import com.monstarlab.arch.extensions.useCaseFlow
 import com.monstarlab.core.data.repositories.PostRepository
 import com.monstarlab.core.domain.model.Post
 import kotlinx.coroutines.flow.Flow
@@ -10,7 +10,7 @@ import javax.inject.Inject
 class GetPostsUseCase @Inject constructor(
     private val postRepository: PostRepository
 ){
-    fun getPosts(): Flow<UseCaseResult<List<Post>>> = safeFlow {
+    fun getPosts(): Flow<UseCaseResult<List<Post>>> = useCaseFlow {
         postRepository.getPosts()
     }
 }

app/src/main/java/com/monstarlab/core/usecases/resources/GetResourcesUseCase.kt

@@ -1,6 +1,6 @@
 package com.monstarlab.core.usecases.resources
 
-import com.monstarlab.arch.extensions.safeFlow
+import com.monstarlab.arch.extensions.useCaseFlow
 import com.monstarlab.core.data.repositories.ResourceRepository
 import kotlinx.coroutines.delay
 import javax.inject.Inject
@@ -9,7 +9,7 @@ class GetResourcesUseCase @Inject constructor(
     private val resourceRepository: ResourceRepository
 ) {
 
-    fun getResources() = safeFlow {
+    fun getResources() = useCaseFlow {
         delay(2000)
         resourceRepository.getResources()
     }

app/src/main/java/com/monstarlab/core/usecases/user/LoginUseCase.kt

@@ -10,7 +10,7 @@ class LoginUseCase @Inject constructor(
         private val userRepository: UserRepository
 ) {
 
-    fun login(email: String, password: String): Flow<UseCaseResult<User>> = safeFlow {
+    fun login(email: String, password: String): Flow<UseCaseResult<User>> = useCaseFlow {
         userRepository.login(email, password)
         userRepository.getUser()
     }