Arrow.kt (#43)

* implements

* fix deps

* wip

* wip

* mapper tests

* mapper tests

* fix unit tests

* fix unit tests

* fix unit tests

* add  tests

* add  tests

* rename

* update tests

* up

* wip

* wip

* rename

* add UserRepositoryImplTest

* better

* update

* remove avatar field

* more tests for UserErrorMapper

* add test_getUsers_withApiCallSuccess_emitsInitial

* done data tests

Author: hoc081098

.idea/codeStyles/Project.xml

@@ -10,6 +10,7 @@
 ## Coroutine + Flow = MVI :heart:
 *   Play MVI with Kotlin Coroutines Flow.
 *   Multiple modules, Clean Architecture.
+*   Unit tests for MVI ViewModel, domain and data layer.
 *   Master branch using Koin for DI.
 *   **Checkout [dagger_hilt branch](https://github.com/Kotlin-Android-Open-Source/MVI-Coroutines-Flow/tree/dagger_hilt), using Dagger Hilt for DI** (_obsolete_).
 *   **[Download latest debug APK here](https://nightly.link/Kotlin-Android-Open-Source/MVI-Coroutines-Flow/workflows/build/master/app-debug.zip)**.

.idea/codeStyles/codeStyleConfig.xml

@@ -16,6 +16,7 @@ import org.koin.core.logger.Level
 import kotlin.time.ExperimentalTime
 
 @Suppress("unused")
+@ExperimentalStdlibApi
 @FlowPreview
 @ExperimentalCoroutinesApi
 @ExperimentalTime

README.md

@@ -5,7 +5,7 @@ import com.hoc.flowmvi.core.navigator.Navigator
 import org.koin.dsl.module
 
 val coreModule = module {
-  single<CoroutineDispatchers> { CoroutineDispatchersImpl() }
+  single<CoroutineDispatchers> { DefaultCoroutineDispatchers() }
 
   single<Navigator> { NavigatorImpl(add = get(), search = get()) }
 }

app/src/main/java/com/hoc/flowmvi/App.kt

@@ -4,7 +4,7 @@ import com.hoc.flowmvi.core.dispatchers.CoroutineDispatchers
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 
-internal class CoroutineDispatchersImpl(
-  override val main: CoroutineDispatcher = Dispatchers.Main,
+internal class DefaultCoroutineDispatchers : CoroutineDispatchers {
+  override val main: CoroutineDispatcher = Dispatchers.Main
   override val io: CoroutineDispatcher = Dispatchers.IO
-) : CoroutineDispatchers
+}

app/src/main/java/com/hoc/flowmvi/core/CoreModule.kt

@@ -46,7 +46,7 @@ object deps {
     const val retrofit = "com.squareup.retrofit2:retrofit:2.9.0"
     const val converterMoshi = "com.squareup.retrofit2:converter-moshi:2.9.0"
     const val loggingInterceptor = "com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2"
-    const val moshiKotlin = "com.squareup.moshi:moshi-kotlin:1.11.0"
+    const val moshiKotlin = "com.squareup.moshi:moshi-kotlin:1.12.0"
     const val leakCanary = "com.squareup.leakcanary:leakcanary-android:2.7"
   }
 
@@ -69,6 +69,11 @@ object deps {
   const val viewBindingDelegate = "com.github.hoc081098:ViewBindingDelegate:1.2.0"
   const val flowExt = "io.github.hoc081098:FlowExt:0.0.7-SNAPSHOT"
 
+  object arrow {
+    private const val version = "1.0.0"
+    const val core = "io.arrow-kt:arrow-core:$version"
+  }
+
   object test {
     const val junit = "junit:junit:4.13.2"
     const val androidxJunit = "androidx.test.ext:junit:1.1.2"
@@ -86,6 +91,7 @@ inline val PDsS.androidApplication: PDS get() = id("com.android.application")
 inline val PDsS.androidLib: PDS get() = id("com.android.library")
 inline val PDsS.kotlinAndroid: PDS get() = id("kotlin-android")
 inline val PDsS.kotlin: PDS get() = id("kotlin")
+inline val PDsS.kotlinKapt: PDS get() = id("kotlin-kapt")
 
 inline val DependencyHandler.domain get() = project(":domain")
 inline val DependencyHandler.core get() = project(":core")

app/src/main/java/com/hoc/flowmvi/core/CoroutineDispatchersImpl.kt renamed to app/src/main/java/com/hoc/flowmvi/core/DefaultCoroutineDispatchers.kt

@@ -1,6 +1,7 @@
 plugins {
   androidLib
   kotlinAndroid
+  kotlinKapt
 }
 
 android {
@@ -49,6 +50,7 @@ dependencies {
   implementation(deps.squareup.loggingInterceptor)
 
   implementation(deps.koin.core)
+  implementation(deps.arrow.core)
 
   addUnitTest()
 }

buildSrc/src/main/kotlin/deps.kt

@@ -1,11 +1,13 @@
 package com.hoc.flowmvi.data
 
 import com.hoc.flowmvi.data.mapper.UserDomainToUserBodyMapper
-import com.hoc.flowmvi.data.mapper.UserDomainToUserResponseMapper
+import com.hoc.flowmvi.data.mapper.UserErrorMapper
 import com.hoc.flowmvi.data.mapper.UserResponseToUserDomainMapper
+import com.hoc.flowmvi.data.remote.ErrorResponse
 import com.hoc.flowmvi.data.remote.UserApiService
 import com.hoc.flowmvi.domain.repository.UserRepository
 import com.squareup.moshi.Moshi
+import com.squareup.moshi.adapter
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import okhttp3.OkHttpClient
@@ -18,16 +20,17 @@ import retrofit2.converter.moshi.MoshiConverterFactory
 import java.util.concurrent.TimeUnit
 import kotlin.time.ExperimentalTime
 
-private const val BASE_URL = "BASE_URL"
+val BASE_URL_QUALIFIER = named("BASE_URL")
 
+@ExperimentalStdlibApi
 @ExperimentalTime
 @ExperimentalCoroutinesApi
 val dataModule = module {
   single { UserApiService(retrofit = get()) }
 
   single {
     provideRetrofit(
-      baseUrl = get(named(BASE_URL)),
+      baseUrl = get(BASE_URL_QUALIFIER),
       moshi = get(),
       client = get()
     )
@@ -37,21 +40,23 @@ val dataModule = module {
 
   single { provideOkHttpClient() }
 
-  factory(named(BASE_URL)) { "https://mvi-coroutines-flow-server.herokuapp.com/" }
+  factory(BASE_URL_QUALIFIER) { "https://mvi-coroutines-flow-server.herokuapp.com/" }
 
   factory { UserResponseToUserDomainMapper() }
 
-  factory { UserDomainToUserResponseMapper() }
-
   factory { UserDomainToUserBodyMapper() }
 
+  factory { get<Moshi>().adapter<ErrorResponse>() }
+
+  factory { UserErrorMapper(errorResponseJsonAdapter = get()) }
+
   single<UserRepository> {
     UserRepositoryImpl(
       userApiService = get(),
       dispatchers = get(),
       responseToDomain = get<UserResponseToUserDomainMapper>(),
-      domainToResponse = get<UserDomainToUserResponseMapper>(),
-      domainToBody = get<UserDomainToUserBodyMapper>()
+      domainToBody = get<UserDomainToUserBodyMapper>(),
+      errorMapper = get<UserErrorMapper>(),
     )
   }
 }

core/src/main/java/com/hoc/flowmvi/core/Either.kt

@@ -1,39 +1,46 @@
 package com.hoc.flowmvi.data
 
 import android.util.Log
+import arrow.core.Either
+import arrow.core.left
+import arrow.core.leftWiden
+import arrow.core.right
 import com.hoc.flowmvi.core.Mapper
 import com.hoc.flowmvi.core.dispatchers.CoroutineDispatchers
 import com.hoc.flowmvi.core.retrySuspend
 import com.hoc.flowmvi.data.remote.UserApiService
 import com.hoc.flowmvi.data.remote.UserBody
 import com.hoc.flowmvi.data.remote.UserResponse
 import com.hoc.flowmvi.domain.entity.User
+import com.hoc.flowmvi.domain.repository.UserError
 import com.hoc.flowmvi.domain.repository.UserRepository
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.scan
 import kotlinx.coroutines.withContext
+import java.io.IOException
 import kotlin.time.Duration
 import kotlin.time.ExperimentalTime
 
 @ExperimentalTime
 @ExperimentalCoroutinesApi
-internal class UserRepositoryImpl constructor(
+internal class UserRepositoryImpl(
   private val userApiService: UserApiService,
   private val dispatchers: CoroutineDispatchers,
   private val responseToDomain: Mapper<UserResponse, User>,
-  private val domainToResponse: Mapper<User, UserResponse>,
-  private val domainToBody: Mapper<User, UserBody>
+  private val domainToBody: Mapper<User, UserBody>,
+  private val errorMapper: Mapper<Throwable, UserError>,
 ) : UserRepository {
 
   private sealed class Change {
-    data class Removed(val removed: User) : Change()
-    data class Refreshed(val user: List<User>) : Change()
+    class Removed(val removed: User) : Change()
+    class Refreshed(val user: List<User>) : Change()
     class Added(val user: User) : Change()
   }
 
@@ -45,59 +52,58 @@ internal class UserRepositoryImpl constructor(
         times = 3,
         initialDelay = Duration.milliseconds(500),
         factor = 2.0,
+        shouldRetry = { it is IOException }
       ) {
         Log.d("###", "[USER_REPO] Retry times=$it")
         userApiService.getUsers().map(responseToDomain)
       }
     }
   }
 
-  override fun getUsers(): Flow<List<User>> {
-    return flow {
-      val initial = getUsersFromRemote()
+  override fun getUsers() = flow {
+    val initial = getUsersFromRemote()
 
-      changesFlow
-        .onEach { Log.d("###", "[USER_REPO] Change=$it") }
-        .scan(initial) { acc, change ->
-          when (change) {
-            is Change.Removed -> acc.filter { it.id != change.removed.id }
-            is Change.Refreshed -> change.user
-            is Change.Added -> acc + change.user
-          }
+    changesFlow
+      .onEach { Log.d("###", "[USER_REPO] Change=$it") }
+      .scan(initial) { acc, change ->
+        when (change) {
+          is Change.Removed -> acc.filter { it.id != change.removed.id }
+          is Change.Refreshed -> change.user
+          is Change.Added -> acc + change.user
         }
-        .onEach { Log.d("###", "[USER_REPO] Emit users.size=${it.size} ") }
-        .let { emitAll(it) }
-    }
+      }
+      .onEach { Log.d("###", "[USER_REPO] Emit users.size=${it.size} ") }
+      .let { emitAll(it) }
   }
+    .map { it.right().leftWiden<UserError, Nothing, List<User>>() }
+    .catch { emit(errorMapper(it).left()) }
 
-  override suspend fun refresh() =
+  override suspend fun refresh() = Either.catch(errorMapper) {
     getUsersFromRemote().let { changesFlow.emit(Change.Refreshed(it)) }
+  }
 
-  override suspend fun remove(user: User) {
+  override suspend fun remove(user: User) = Either.catch(errorMapper) {
     withContext(dispatchers.io) {
-      val response = userApiService.remove(domainToResponse(user).id)
+      val response = userApiService.remove(user.id)
       changesFlow.emit(Change.Removed(responseToDomain(response)))
     }
   }
 
-  override suspend fun add(user: User) {
+  override suspend fun add(user: User) = Either.catch(errorMapper) {
     withContext(dispatchers.io) {
-      val body = domainToBody(user).copy(avatar = avatarUrls.random())
+      val body = domainToBody(user)
       val response = userApiService.add(body)
       changesFlow.emit(Change.Added(responseToDomain(response)))
-      delay(400)
+      extraDelay()
     }
   }
 
-  override suspend fun search(query: String) = withContext(dispatchers.io) {
-    delay(400)
-    userApiService.search(query).map(responseToDomain)
+  override suspend fun search(query: String) = Either.catch(errorMapper) {
+    withContext(dispatchers.io) {
+      extraDelay()
+      userApiService.search(query).map(responseToDomain)
+    }
   }
 
-  companion object {
-    private val avatarUrls =
-      (0 until 100).map { "https://randomuser.me/api/portraits/men/$it.jpg" } +
-        (0 until 100).map { "https://randomuser.me/api/portraits/women/$it.jpg" } +
-        (0 until 10).map { "https://randomuser.me/api/portraits/lego/$it.jpg" }
-  }
+  private suspend inline fun extraDelay() = delay(400)
 }

data/build.gradle.kts

@@ -8,7 +8,6 @@ internal class UserDomainToUserBodyMapper : Mapper<User, UserBody> {
   override fun invoke(domain: User): UserBody {
     return UserBody(
       email = domain.email,
-      avatar = domain.avatar,
       firstName = domain.firstName,
       lastName = domain.lastName
     )

data/src/main/java/com/hoc/flowmvi/data/DataModule.kt

@@ -0,0 +1,54 @@
+package com.hoc.flowmvi.data.mapper
+
+import arrow.core.nonFatalOrThrow
+import com.hoc.flowmvi.core.Mapper
+import com.hoc.flowmvi.data.remote.ErrorResponse
+import com.hoc.flowmvi.domain.repository.UserError
+import com.squareup.moshi.JsonAdapter
+import okhttp3.ResponseBody
+import retrofit2.HttpException
+import java.io.IOException
+import java.net.SocketException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+
+internal class UserErrorMapper(private val errorResponseJsonAdapter: JsonAdapter<ErrorResponse>) :
+  Mapper<Throwable, UserError> {
+  override fun invoke(throwable: Throwable): UserError {
+    throwable.nonFatalOrThrow()
+
+    return runCatching {
+      when (throwable) {
+        is IOException -> when (throwable) {
+          is UnknownHostException -> UserError.NetworkError
+          is SocketTimeoutException -> UserError.NetworkError
+          is SocketException -> UserError.NetworkError
+          else -> UserError.NetworkError
+        }
+        is HttpException ->
+          throwable.response()!!
+            .takeUnless { it.isSuccessful }!!
+            .errorBody()!!
+            .use(ResponseBody::string)
+            .let { mapResponseError(it) }
+        else -> UserError.Unexpected
+      }
+    }.getOrElse {
+      it.nonFatalOrThrow()
+      UserError.Unexpected
+    }
+  }
+
+  @Throws(Throwable::class)
+  private fun mapResponseError(json: String): UserError {
+    val errorResponse = errorResponseJsonAdapter.fromJson(json)!!
+
+    return when (errorResponse.error) {
+      "internal-error" -> UserError.ServerError
+      "invalid-id" -> UserError.InvalidId(id = errorResponse.data as String)
+      "user-not-found" -> UserError.UserNotFound(id = errorResponse.data as String)
+      "validation-failed" -> UserError.ValidationFailed
+      else -> UserError.Unexpected
+    }
+  }
+}