make ItemRepository, ProfileItemRepo, DogItemRepo, CatItemRepo

Author: patjackson52

app/src/test/java/com/willowtreeapps/namegame/ReducersTest.kt

@@ -1,8 +1,9 @@
 package com.willowtreeapps.namegame
 
 import com.willowtreeapps.common.*
-import com.willowtreeapps.common.boundary.displayName
 import com.willowtreeapps.common.repo.MockRepositoryFactory
+import com.willowtreeapps.common.repo.ProfileItemRepository
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.*
 import org.junit.Test
 import java.lang.Exception
@@ -32,8 +33,9 @@ class ReducersTest {
 
     @Test
     fun `generate N distinct random rounds`() {
-        val profiles = MockRepositoryFactory.getValidResponse()
-        val rounds = generateRounds(profiles, 10)
+
+        val profiles = runBlocking {  ProfileItemRepository(MockRepositoryFactory().success()).fetchItems()}.response
+        val rounds = generateRounds(profiles!!, 10)
 
         assertEquals(10, rounds.size)
         assertEquals(10, rounds.distinctBy { it.profileId }.size)
@@ -49,7 +51,7 @@ class ReducersTest {
     @Test
     fun `isLoadingProfiles set false on success`() {
         val initial = generateInitialTestState().copy(isLoadingProfiles = true)
-        val final = reducer(initial, Actions.FetchingProfilesSuccessAction(MockRepositoryFactory.getValidResponse()))
+        val final = reducer(initial, Actions.FetchingProfilesSuccessAction(runBlocking {  ProfileItemRepository(MockRepositoryFactory().success()).fetchItems()}.response!!))
 
         assertFalse(final.isLoadingProfiles)
     }
@@ -81,7 +83,7 @@ class ReducersTest {
     @Test
     fun `mark current round as CORRECT when name matches`() {
         val initial = generateInitialTestState()
-        val answer = initial.currentQuestionProfile().displayName()
+        val answer = initial.currentQuestionItem().displayName()
 
         val final = reducer(initial, Actions.NamePickedAction(answer))
 
@@ -136,7 +138,7 @@ class ReducersTest {
     }
 
     private fun generateInitialTestState(): AppState {
-        val initialState = reducer(AppState(), Actions.FetchingProfilesSuccessAction(MockRepositoryFactory.getValidResponse()))
+        val initialState = reducer(AppState(), Actions.FetchingProfilesSuccessAction(runBlocking {  ProfileItemRepository(MockRepositoryFactory().success()).fetchItems()}.response!!))
         return initialState
     }
 }

app/src/test/java/com/willowtreeapps/namegame/ExampleUnitTest.kt renamed to app/src/test/java/com/willowtreeapps/namegame/RepositoriesTest.kt

@@ -15,29 +15,35 @@ import org.junit.Test
  *
  * See [testing documentation](http://d.android.com/tools/testing).
  */
-class ExampleUnitTest {
+class RepositoriesTest {
     private val repo = KtorProfilesRepository()
 
     @Test
     fun fetchProfiles() {
-        GlobalScope.launch {
-            async {
-                val result = repo.profiles()
-                if (result.isSuccessful) {
-                    assertNotNull(result.response)
-                    assertTrue(result.response?.isNotEmpty() ?: false)
-                } else {
-                    fail("Failure response from profiles repo: ${result.message}")
-                }
-            }.await()
+        val result = runBlocking { repo.profiles() }
+        if (result.isSuccessful) {
+            assertNotNull(result.response)
+            assertTrue(result.response?.isNotEmpty() ?: false)
+        } else {
+            fail("Failure response from cats repo: ${result.message}")
         }
-        Thread.sleep(5000)
     }
 
     @Test
     fun deserializeProfilesResponse() {
         val response = Json.nonstrict.parse(ProfileListHolderSerializer(), MockRepositoryFactory.VALID_RESPONSE_JSON)
         assertNotNull(response.profiles)
     }
+
+    @Test
+    fun fetchDogs() {
+        val result = runBlocking { repo.profiles() }
+        if (result.isSuccessful) {
+            assertNotNull(result.response)
+            assertTrue(result.response?.isNotEmpty() ?: false)
+        } else {
+            fail("Failure response from cats repo: ${result.message}")
+        }
+    }
 }
 

common/src/androidMain/kotlin/com/willowtreeapps/common/PlatformDispatcher.kt

@@ -7,6 +7,6 @@ import kotlin.coroutines.CoroutineContext
 
 actual object PlatformDispatcher : CoroutineDispatcher() {
     override fun dispatch(context: CoroutineContext, block: Runnable) {
-        Dispatchers.Main.dispatch(context, block)
+        Dispatchers.IO.dispatch(context, block)
     }
 }

common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt

@@ -6,7 +6,7 @@ import com.willowtreeapps.common.repo.Profile
 sealed class Actions : Action {
 
     class FetchingProfilesStartedAction
-    class FetchingProfilesSuccessAction(val profiles: List<Profile>)
+    class FetchingProfilesSuccessAction(val profiles: List<Item>)
     class FetchingProfilesFailedAction(val message: String)
 
     class NamePickedAction(val name: String)

common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt

@@ -1,9 +1,10 @@
 package com.willowtreeapps.common
 
+import com.willowtreeapps.common.boundary.displayName
 import com.willowtreeapps.common.repo.Profile
 
 data class AppState(val isLoadingProfiles: Boolean = false,
-                    val profiles: List<Profile> = listOf(),
+                    val items: List<Item> = listOf(),
                     val errorLoadingProfiles: Boolean = false,
                     val errorMsg: String = "",
                     val currentQuestionIndex: Int = 0,
@@ -16,8 +17,6 @@ data class AppState(val isLoadingProfiles: Boolean = false,
         val INITIAL_STATE = AppState()
     }
 
-    fun Question.profile(): Profile = profiles.find { ProfileId(it.id) == this.profileId }!!
-
     val timerText: String
         get() = if (questionClock < 0) "" else if (questionClock >= 0) questionClock.toString() else "TIME'S UP!!"
 
@@ -27,9 +26,9 @@ data class AppState(val isLoadingProfiles: Boolean = false,
         else
             null
 
-    fun getProfile(id: ProfileId?) = profiles.find { it.id == id?.id }
+    fun getItem(id: ProfileId?) = items.find { it.id == id }
 
-    fun currentQuestionProfile() = getProfile(currentQuestion?.profileId)!!
+    fun currentQuestionItem() = getItem(currentQuestion?.profileId)!!
 
     fun isGameComplete(): Boolean = currentQuestionIndex >= questions.size || (currentQuestionIndex == questions.size - 1 && questions[currentQuestionIndex].status != Question.Status.UNANSWERED)
 
@@ -51,6 +50,19 @@ data class Question(val profileId: ProfileId,
     }
 }
 
+data class Item(val id: ProfileId,
+                val imageUrl: String,
+                val firstName: String,
+                val lastName: String) {
+
+    fun displayName() = "$firstName $lastName"
+
+    fun matches(name: String): Boolean {
+        return displayName() == name
+    }
+
+}
+
 data class UserSettings(val numQuestions: Int) {
     companion object {
         fun defaults() = UserSettings(3)

common/src/commonMain/kotlin/com/willowtreeapps/common/NetworkThunks.kt

@@ -1,7 +1,7 @@
 package com.willowtreeapps.common
 
 import com.beyondeye.reduks.*
-import com.willowtreeapps.common.repo.KtorProfilesRepository
+import com.willowtreeapps.common.repo.*
 import kotlinx.coroutines.*
 import kotlin.coroutines.CoroutineContext
 
@@ -10,19 +10,18 @@ import kotlin.coroutines.CoroutineContext
  * actions.  This allows dispatching a loading, success, and failure state.
  */
 class NetworkThunks(private val networkContext: CoroutineContext,
-                    val store: Store<AppState>,
-                    private val timerThunks: TimerThunks) : CoroutineScope {
+                    val store: Store<AppState>) : CoroutineScope {
     private val job = Job()
     override val coroutineContext: CoroutineContext
         get() = networkContext + job
 
-    private val repo = KtorProfilesRepository()
+    private val repo = CatItemRepository()
 
     fun fetchProfiles(): ThunkImpl<AppState> = ThunkFn { dispatcher, state ->
         Logger.d("Fetching StoreInfo and Feed")
         launch {
             store.dispatch(Actions.FetchingProfilesStartedAction())
-            val result = repo.profiles()
+            val result = repo.fetchItems()
             if (result.isSuccessful) {
                 Logger.d("Success")
                 store.dispatch(Actions.FetchingProfilesSuccessAction(result.response!!))

common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt

@@ -1,7 +1,6 @@
 package com.willowtreeapps.common
 
 import com.willowtreeapps.common.Actions.*
-import com.willowtreeapps.common.repo.Profile
 import com.willowtreeapps.common.util.TimeUtil
 import kotlin.math.abs
 import kotlin.random.Random
@@ -15,11 +14,11 @@ fun reducer(state: AppState, action: Any): AppState =
             is FetchingProfilesStartedAction -> state.copy(isLoadingProfiles = true)
             is FetchingProfilesSuccessAction -> {
                 val rounds = generateRounds(action.profiles, state.settings.numQuestions)
-                state.copy(isLoadingProfiles = false, profiles = action.profiles, questions = rounds)
+                state.copy(isLoadingProfiles = false, items = action.profiles, questions = rounds)
             }
             is FetchingProfilesFailedAction -> state.copy(isLoadingProfiles = false, errorLoadingProfiles = true, errorMsg = action.message)
             is NamePickedAction -> {
-                val status = if (state.currentQuestionProfile().matches(action.name)) {
+                val status = if (state.currentQuestionItem().matches(action.name)) {
                     Question.Status.CORRECT
                 } else {
                     Question.Status.INCORRECT
@@ -45,14 +44,14 @@ fun reducer(state: AppState, action: Any): AppState =
             else -> throw AssertionError("Action ${action::class.simpleName} not handled")
         }
 
-fun generateRounds(profiles: List<Profile>, n: Int): List<Question> =
+fun generateRounds(profiles: List<Item>, n: Int): List<Question> =
         profiles.takeRandomDistinct(n)
                 .map {
                     val choiceList = profiles.takeRandomDistinct(3).toMutableList()
                     choiceList.add(abs(random.nextInt() % 4), it)
 
-                    Question(profileId = ProfileId(it.id), choices = choiceList
-                            .map { ProfileId(it.id) })
+                    Question(profileId = it.id, choices = choiceList
+                            .map { it.id })
                 }
 
 

common/src/commonMain/kotlin/com/willowtreeapps/common/boundary/TransformFunctions.kt

@@ -7,19 +7,19 @@ import com.willowtreeapps.common.repo.Profile
  * Functions for transforming AppState data into ViewState data to be used by Views.
  */
 fun AppState.toQuestionViewState(): QuestionViewState {
-    val profile = currentQuestionProfile()
-    val imageUrl = profile.headshot.url
-    val choice1 = getProfile(currentQuestion?.choices?.get(0))!!.displayName()
-    val choice2 = getProfile(currentQuestion?.choices?.get(1))!!.displayName()
-    val choice3 = getProfile(currentQuestion?.choices?.get(2))!!.displayName()
-    val choice4 = getProfile(currentQuestion?.choices?.get(3))!!.displayName()
-    val correctBtnNum = currentQuestion?.choices?.indexOfFirst { it.id == profile.id }!! + 1
-    var selectedBtnNum = currentQuestion?.choices?.indexOfFirst { getProfile(it)?.matches(currentQuestion?.answerName ?: "") ?: false}
+    val profile = currentQuestionItem()
+    val imageUrl = profile.imageUrl
+    val choice1 = getItem(currentQuestion?.choices?.get(0))!!.displayName()
+    val choice2 = getItem(currentQuestion?.choices?.get(1))!!.displayName()
+    val choice3 = getItem(currentQuestion?.choices?.get(2))!!.displayName()
+    val choice4 = getItem(currentQuestion?.choices?.get(3))!!.displayName()
+    val correctBtnNum = currentQuestion?.choices?.indexOfFirst { it == profile.id }!! + 1
+    var selectedBtnNum = currentQuestion?.choices?.indexOfFirst { getItem(it)?.matches(currentQuestion?.answerName ?: "") ?: false}
     if (selectedBtnNum != null) {
         selectedBtnNum += 1
     }
     return QuestionViewState(title = "Who is this?",
-            profileImageUrl = "https:$imageUrl",
+            profileImageUrl = imageUrl,
             currentQuestion = (currentQuestionIndex + 1).toString(),
             numQuestions = questions.size.toString(),
             button1Text = choice1,

common/src/commonMain/kotlin/com/willowtreeapps/common/repo/GatewayResponse.kt

@@ -1,5 +1,7 @@
 package com.willowtreeapps.common.repo
 
+import kotlinx.coroutines.delay
+
 
 /**
  * Wrapper around Gateway responses that allows returning an error state with code and message.
@@ -60,12 +62,12 @@ data class GenericError(val message: String)
  * @param ex exception that will be thrown if a success full response is not received
  * @return GatewayResponse will only return GatewayResponse object if it is successful
  */
-fun retrySuccessOrThrow(numRetries: Int, retryWaitInMs: Long, ex: Exception, f: () -> GatewayResponse<*, *>): GatewayResponse<*, *> {
+suspend fun <R, E> retrySuccessOrThrow(numRetries: Int, retryWaitInMs: Long, ex: Exception, f: suspend () -> GatewayResponse<R, E>): GatewayResponse<R, E> {
     val response = f()
     return if (response.isSuccessful) {
         response
     } else if (response.isFailure && numRetries > 0) {
-//        Thread.sleep(retryWaitInMs)
+        delay(retryWaitInMs)
         retrySuccessOrThrow(numRetries - 1, retryWaitInMs * 2, ex, f)
     } else {
         throw ex

common/src/commonMain/kotlin/com/willowtreeapps/common/repo/ItemRepository.kt

@@ -0,0 +1,61 @@
+package com.willowtreeapps.common.repo
+
+import com.willowtreeapps.common.Item
+import com.willowtreeapps.common.PlatformDispatcher
+import com.willowtreeapps.common.ProfileId
+
+/**
+ * interface for providing list of items for the game.  Items are generic representation.
+ * This may be used for any data source to generate questions.
+ */
+interface ItemRepository {
+    suspend fun fetchItems(): GatewayResponse<List<Item>, GenericError>
+}
+
+class ProfileItemRepository(val repo: ProfilesRepository = KtorProfilesRepository()) : ItemRepository {
+    override suspend fun fetchItems(): GatewayResponse<List<Item>, GenericError> {
+        val results = repo.profiles()
+        return if (results.isSuccessful) {
+            GatewayResponse.createSuccess(results.response?.map { Item(id = ProfileId(it.id), firstName = it.firstName, lastName = it.lastName, imageUrl = "https:${it.headshot.url}") },
+                    200, "")
+        } else {
+            GatewayResponse.createError(GenericError("Error"), 500, "")
+        }
+    }
+
+}
+
+class DogItemRepository(val repo: KtorDogsRepository = KtorDogsRepository(PlatformDispatcher)) : ItemRepository {
+    override suspend fun fetchItems(): GatewayResponse<List<Item>, GenericError> {
+        val results = repo.dogs()
+        return if (results.isSuccessful) {
+            GatewayResponse.createSuccess(results.response?.map {
+                Item(id = ProfileId(it.breed + "_" + it.subBreed),
+                        firstName = it.breed, lastName = it.subBreed ?: "",
+                        imageUrl = it.imageUrl)
+            },
+                    200, "")
+        } else {
+            GatewayResponse.createError(GenericError("Error"), 500, "")
+        }
+    }
+
+}
+
+class CatItemRepository(val repo: KtorCatsRepository = KtorCatsRepository(PlatformDispatcher)) : ItemRepository {
+    override suspend fun fetchItems(): GatewayResponse<List<Item>, GenericError> {
+        val results = repo.allBreeds()
+        return if (results.isSuccessful) {
+            GatewayResponse.createSuccess(results.response?.map {
+                Item(id = ProfileId(it.id),
+                        firstName = it.breed, lastName = "",
+                        imageUrl = it.imageUrl)
+            },
+                    200, "")
+        } else {
+            GatewayResponse.createError(GenericError("Error"), 500, "")
+        }
+    }
+
+}
+