removed repo result

Author: johsoe

app/src/main/java/com/monstarlab/arch/data/Repository.kt

@@ -1,25 +1,11 @@
 package com.monstarlab.arch.data
 
-import java.util.concurrent.TimeUnit
 
+/**
+ * Empty for now, but could allow us to add cache helpers etc
+ */
 abstract class Repository constructor(
-    private val expirationInSeconds: Long = 30
-) {
-
-    private var lastFetch = 0L
 
-    protected suspend inline fun onShouldFetch(block: suspend () -> Unit) {
-        if(shouldFetch) block.invoke()
-    }
-
-    protected val shouldFetch: Boolean
-        get() {
-            val shouldFetch = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - lastFetch) >= expirationInSeconds
-            // Automatically update this value, since we're running API code in an if() and most likely updating local store
-            if(shouldFetch) {
-                lastFetch = System.currentTimeMillis()
-            }
-            return shouldFetch
-        }
+) {
 
 }

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

@@ -7,56 +7,25 @@ import java.io.IOException
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 
-
-inline fun <T> safeCall(
-        block: () -> Response<T>
-): RepositoryResult<T>  {
+inline fun <T> repoCall(
+    block: () -> Response<T>
+): T {
     val response = block()
     val body = response.body()
     return when (response.isSuccessful && body != null) {
-        true -> RepositoryResult.Success(body)
-        false -> RepositoryResult.Error(response.toError())
-    }
-}
-
-fun <T> Response<out T>.toResult(): RepositoryResult<T>  {
-    val body = this.body()
-    return when (this.isSuccessful && body != null) {
-        true -> RepositoryResult.Success(body)
-        false -> RepositoryResult.Error(this.toError())
+        true -> body
+        false -> throw response.toError()
     }
 }
 
-fun <T, R> Response<out T>.toResultAndMap(transform: (T) -> R): RepositoryResult<R>  {
-    val body = this.body()
-    return when (this.isSuccessful && body != null) {
-        true -> RepositoryResult.Success(transform(body))
-        false -> RepositoryResult.Error(this.toError())
+inline fun <T, R> Response<T>.mapSuccess(
+    crossinline block: (T) -> R
+): R {
+    val safeBody = body()
+    if(this.isSuccessful && safeBody != null) {
+        return block(safeBody)
+    } else {
+        throw toError()
     }
 }
 
-
-
-sealed class RepositoryResult<out T> {
-    data class Success<T>(val value: T): RepositoryResult<T>()
-    data class Error(val error: ErrorModel): RepositoryResult<Nothing>()
-}
-
-inline fun <T> RepositoryResult<T>.onSuccess(block: (T) -> Unit): RepositoryResult<T> {
-    if(this is RepositoryResult.Success) block.invoke(value)
-    return this
-}
-
-inline fun <T> RepositoryResult<T>.onError(block: (ErrorModel) -> Unit): RepositoryResult<T> {
-    if(this is RepositoryResult.Error) block.invoke(error)
-    return this
-}
-
-fun <T> RepositoryResult<T>.isError(): Boolean {
-    return this is RepositoryResult.Error
-}
-
-val <T> RepositoryResult<T>.errorOrNull: ErrorModel?
-    get() {
-        return if(this is RepositoryResult.Error) error else null
-    }

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

@@ -13,25 +13,21 @@ sealed class UseCaseResult<out T> {
 }
 
 suspend inline fun <T> safeUseCase(
-        crossinline block: suspend () -> RepositoryResult<T>
+        crossinline block: suspend () -> T
 ): UseCaseResult<T> = try {
-    when (val repoResult = block()) {
-        is RepositoryResult.Success -> UseCaseResult.Success(repoResult.value)
-        is RepositoryResult.Error -> UseCaseResult.Error(repoResult.error)
-    }
-} catch (e: Exception) {
+    UseCaseResult.Success(block())
+} catch (e: ErrorModel) {
     UseCaseResult.Error(e.toError())
 }
 
 inline fun <T> safeFlow(
-        crossinline block: suspend () -> RepositoryResult<T>
+        crossinline block: suspend () -> T
 ): Flow<UseCaseResult<T>> = flow {
     try {
-        val res = when (val repoResult = block()) {
-            is RepositoryResult.Success -> UseCaseResult.Success(repoResult.value)
-            is RepositoryResult.Error -> UseCaseResult.Error(repoResult.error)
-        }
-        emit(res)
+        val repoResult = block()
+        emit(UseCaseResult.Success(repoResult))
+    } catch (e: ErrorModel) {
+        emit(UseCaseResult.Error(e))
     } catch (e: Exception) {
         emit(UseCaseResult.Error(e.toError()))
     }

app/src/main/java/com/monstarlab/core/data/repositories/PostRepository.kt

@@ -1,10 +1,7 @@
 package com.monstarlab.core.data.repositories
 
 import com.monstarlab.arch.data.*
-import com.monstarlab.arch.extensions.RepositoryResult
-import com.monstarlab.arch.extensions.isError
-import com.monstarlab.arch.extensions.onSuccess
-import com.monstarlab.arch.extensions.toResultAndMap
+import com.monstarlab.arch.extensions.*
 import com.monstarlab.core.data.network.dtos.toEntity
 import com.monstarlab.core.data.network.Api
 import com.monstarlab.core.data.storage.PostPreferenceStore
@@ -16,17 +13,10 @@ class PostRepository @Inject constructor(
     private val postPreferenceStore: PostPreferenceStore
 ): Repository() {
 
-    suspend fun getPosts(): RepositoryResult<List<Post>> {
-        onShouldFetch {
-            val result = api.getPosts().toResultAndMap { list -> list.map { it.toEntity() } }
-
-            result.onSuccess { list ->
-                postPreferenceStore.addAll(list)
-            }
-
-            if(result.isError()) return result
-        }
-        return RepositoryResult.Success(postPreferenceStore.getAll())
+    suspend fun getPosts(): List<Post> {
+        return api.getPosts()
+            .mapSuccess { list -> list.map { it.toEntity() } }
+            .also { postPreferenceStore.addAll(it) }
     }
 
 }

app/src/main/java/com/monstarlab/core/data/repositories/ResourceRepository.kt

@@ -1,10 +1,7 @@
 package com.monstarlab.core.data.repositories
 
 import com.monstarlab.arch.data.Repository
-import com.monstarlab.arch.extensions.RepositoryResult
-import com.monstarlab.arch.extensions.onError
-import com.monstarlab.arch.extensions.onSuccess
-import com.monstarlab.arch.extensions.toResultAndMap
+import com.monstarlab.arch.extensions.*
 import com.monstarlab.core.data.network.Api
 import com.monstarlab.core.data.network.dtos.toEntity
 import com.monstarlab.core.data.storage.ResourcePreferenceStore
@@ -16,18 +13,10 @@ class ResourceRepository @Inject constructor(
     private val resourcePreferenceStore: ResourcePreferenceStore
 ): Repository() {
 
-    suspend fun getResources(): RepositoryResult<List<Resource>> {
-        onShouldFetch {
-            val result = api.getResources().toResultAndMap { response -> response.data.map { it.toEntity() } }
-
-            result.onSuccess {
-                resourcePreferenceStore.addAll(it)
-            }
-
-            result.onError { return RepositoryResult.Error(it) }
-        }
-
-        return RepositoryResult.Success(resourcePreferenceStore.getAll())
+    suspend fun getResources(): List<Resource> {
+        return api.getResources()
+            .mapSuccess { response -> response.data.map { it.toEntity() } }
+            .also { resourcePreferenceStore.addAll(it) }
     }
 
 }

app/src/main/java/com/monstarlab/core/data/repositories/UserRepository.kt

@@ -5,6 +5,7 @@ import com.monstarlab.arch.extensions.*
 import com.monstarlab.core.data.mappers.toUser
 import com.monstarlab.core.data.network.Api
 import com.monstarlab.core.data.network.responses.TokenResponse
+import com.monstarlab.core.data.network.responses.UserResponse
 import com.monstarlab.core.data.storage.UserPreferenceStore
 import com.monstarlab.core.domain.error.ErrorModel
 import com.monstarlab.core.domain.model.User
@@ -17,25 +18,17 @@ class UserRepository @Inject constructor(
         private val userPreferenceStore: UserPreferenceStore
 ): Repository() {
 
-    suspend fun login(email: String, password: String): RepositoryResult<TokenResponse> {
-        return api.postLogin(email, password).toResult()
+    suspend fun login(email: String, password: String): TokenResponse = repoCall {
+        api.postLogin(email, password)
     }
 
-    suspend fun getUser(): RepositoryResult<User> {
-        onShouldFetch {
-            val result = api.getUser().toResultAndMap { it.data.toUser() }
-            result.onSuccess { user ->
-                userPreferenceStore.add(user)
+    suspend fun getUser(): User  {
+        return api.getUser()
+            .mapSuccess {
+                 it.data.toUser()
+            }.also {
+                userPreferenceStore.add(it)
             }
-            if(result.isError()) return result
-        }
-
-        val user = userPreferenceStore.get()
-
-        return when {
-            user != null -> RepositoryResult.Success(user)
-            else -> RepositoryResult.Error(ErrorModel.DataError.NoData)
-        }
     }
 
 }

app/src/main/java/com/monstarlab/core/domain/error/ErrorModel.kt

@@ -1,6 +1,6 @@
 package com.monstarlab.core.domain.error
 
-sealed class ErrorModel {
+sealed class ErrorModel: Throwable() {
 
     sealed class Http: ErrorModel() {
         object BadRequest: Http()
@@ -13,7 +13,7 @@ sealed class ErrorModel {
 
         data class Custom(
                 val code: Int?,
-                val message: String?,
+                override val message: String?,
                 val errorBody: String?
         ): Http()
     }

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

@@ -1,9 +1,7 @@
 package com.monstarlab.core.usecases.blog
 
 import com.monstarlab.arch.extensions.UseCaseResult
-import com.monstarlab.arch.extensions.safeCall
 import com.monstarlab.arch.extensions.safeFlow
-import com.monstarlab.arch.extensions.safeUseCase
 import com.monstarlab.core.data.repositories.PostRepository
 import com.monstarlab.core.domain.model.Post
 import kotlinx.coroutines.flow.Flow

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

@@ -1,10 +1,8 @@
 package com.monstarlab.core.usecases.user
 
 import com.monstarlab.arch.extensions.*
-import com.monstarlab.core.data.network.responses.TokenResponse
 import com.monstarlab.core.data.repositories.UserRepository
 import com.monstarlab.core.domain.model.User
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
@@ -13,13 +11,7 @@ class LoginUseCase @Inject constructor(
 ) {
 
     fun login(email: String, password: String): Flow<UseCaseResult<User>> = safeFlow {
-        delay(2000)
-        userRepository.login(email, password).onSuccess {
-            // Insert into local token store
-        }.onError {
-            return@safeFlow RepositoryResult.Error(it)
-        }
-
+        userRepository.login(email, password)
         userRepository.getUser()
     }
 

app/src/main/java/com/monstarlab/features/login/LoginFragment.kt

@@ -11,6 +11,7 @@ import com.monstarlab.R
 import com.monstarlab.arch.base.BaseFragment
 import com.monstarlab.arch.extensions.clicks
 import com.monstarlab.arch.extensions.collectFlow
+import com.monstarlab.arch.extensions.combineFlows
 import com.monstarlab.arch.extensions.viewBinding
 import com.monstarlab.databinding.FragmentLoginBinding
 import kotlinx.coroutines.flow.launchIn
@@ -41,7 +42,7 @@ class LoginFragment : BaseFragment(R.layout.fragment_login) {
         }
 
         collectFlow(viewModel.loadingFlow) { loading ->
-            TransitionManager.beginDelayedTransition(binding.loginRootView)
+            TransitionManager.beginDelayedTransition(binding.root)
             binding.loginEmailEditText.isEnabled = !loading
             binding.loginPasswordEditText.isEnabled = !loading
             binding.loginButton.visibility = if(loading) View.GONE else View.VISIBLE