[Update] remove search for characters and comics

Author: jeprubio

app/src/androidTest/java/com/rumosoft/marvelcompose/data/FakeCharactersNetwork.kt

@@ -1,24 +1,23 @@
 package com.rumosoft.marvelcompose.data
 
-import com.rumosoft.characters.data.repository.CHARACTERS_SEARCH_LIMIT
+import com.rumosoft.characters.data.repository.CHARACTERS_LIMIT
 import com.rumosoft.marvelapi.data.network.CharactersNetwork
 import com.rumosoft.marvelapi.data.network.HeroesResult
 import com.rumosoft.marvelapi.data.network.apimodels.HeroDto
 import com.rumosoft.marvelapi.data.network.apimodels.PaginationInfo
 import javax.inject.Inject
 
 class FakeCharactersNetwork @Inject constructor(): CharactersNetwork {
-    override suspend fun searchHeroes(
+    override suspend fun getHeroes(
         offset: Int,
         limit: Int,
-        nameStartsWith: String
     ): Result<HeroesResult> {
         val heroesResult = HeroesResult(
             paginationInfo = PaginationInfo(
                 current = 0,
                 total = 0,
             ),
-            characters = (offset .. offset + CHARACTERS_SEARCH_LIMIT).map {
+            characters = (offset .. offset + CHARACTERS_LIMIT).map {
                 HeroDto(
                     id = it.toLong(),
                     name = "character $it",
@@ -33,7 +32,7 @@ class FakeCharactersNetwork @Inject constructor(): CharactersNetwork {
     }
 
     override suspend fun getHeroDetails(heroId: Long): Result<HeroDto?> {
-        val hero = searchHeroes(0, 0, "").getOrNull()?.characters?.find { it.id == heroId }
+        val hero = getHeroes(0, 0).getOrNull()?.characters?.find { it.id == heroId }
         return hero?.let {
             Result.success(it)
         } ?: Result.failure(Exception("Hero not found"))

app/src/androidTest/java/com/rumosoft/marvelcompose/data/FakeComicsNetwork.kt

@@ -1,24 +1,22 @@
 package com.rumosoft.marvelcompose.data
 
-import com.rumosoft.characters.data.repository.CHARACTERS_SEARCH_LIMIT
 import com.rumosoft.marvelapi.data.network.ComicsNetwork
 import com.rumosoft.marvelapi.data.network.ComicsResult
 import com.rumosoft.marvelapi.data.network.apimodels.ComicDto
 import com.rumosoft.marvelapi.data.network.apimodels.PaginationInfo
 import javax.inject.Inject
 
 class FakeComicsNetwork @Inject constructor(): ComicsNetwork {
-    override suspend fun searchComics(
+    override suspend fun getComics(
         offset: Int,
         limit: Int,
-        titleStartsWith: String
     ): Result<ComicsResult> {
         val comicsResult = ComicsResult(
             paginationInfo = PaginationInfo(
                 current = 0,
                 total = 0,
             ),
-            comics = (offset..offset + CHARACTERS_SEARCH_LIMIT).map {
+            comics = (offset..offset + limit).map {
                 ComicDto(
                     id = it,
                     title = "comic $it",

feature-characters/src/androidTest/java/com/rumosoft/characters/presentation/screen/HeroListRobot.kt

@@ -1,6 +1,5 @@
 package com.rumosoft.characters.presentation.screen
 
-import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
@@ -12,21 +11,15 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.hasContentDescription
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.ComposeContentTestRule
-import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.ui.test.performClick
-import androidx.compose.ui.test.performTextInput
 import androidx.compose.ui.test.performTouchInput
 import androidx.compose.ui.test.swipeUp
-import androidx.test.platform.app.InstrumentationRegistry
 import com.rumosoft.characters.presentation.FakeCharacters
 import com.rumosoft.characters.presentation.viewmodel.state.HeroListState
 import com.rumosoft.characters.presentation.viewmodel.state.HeroListSuccessResult
-import com.rumosoft.components.R
 import com.rumosoft.components.presentation.theme.MarvelComposeTheme
 
 fun HeroListScreenTest.heroListRobot(func: HeroListRobot.() -> Unit) =
@@ -39,20 +32,13 @@ class HeroListRobot(private val composeTestRule: ComposeContentTestRule) {
     init {
         composeTestRule.setContent {
             MarvelComposeTheme {
-                var searchState by remember { mutableStateOf("") }
-                var showSearchBar by remember { mutableStateOf(false) }
                 var endReached by remember { mutableStateOf(false) }
                 if (endReached) {
                     Text(END_REACHED_TEXT)
                 }
                 Scaffold(
                     topBar = {
-                        CharactersTopBar(
-                            searchText = searchState,
-                            showSearchBar = showSearchBar,
-                            onToggleSearchClick = { showSearchBar = true },
-                            onValueChanged = { searchState = it },
-                        )
+                        CharactersTopBar()
                     }
                 ) { innerPadding ->
                     Box(modifier = Modifier.padding(innerPadding)) {
@@ -74,19 +60,6 @@ class HeroListRobot(private val composeTestRule: ComposeContentTestRule) {
         }
     }
 
-    @OptIn(ExperimentalTestApi::class)
-    fun onCharacterSearched(searchText: String) {
-        onMagnifierTapped()
-        composeTestRule.waitUntilExactlyOneExists(hasContentDescription(getString(R.string.search_text)))
-        composeTestRule.onNodeWithContentDescription(getString(R.string.search_text))
-            .performClick()
-            .performTextInput(searchText)
-    }
-
-    fun onMagnifierTapped() {
-        composeTestRule.onNodeWithContentDescription(getString(R.string.search)).performClick()
-    }
-
     infix fun verify(func: HeroListResultRobot.() -> Unit) =
         HeroListResultRobot(composeTestRule).apply { func() }
 }
@@ -96,13 +69,6 @@ class HeroListResultRobot(private val composeTestRule: ComposeContentTestRule) {
         textIsDisplayed(name)
     }
 
-    fun searchIsDisplayed() {
-        contentDescriptionIsDisplayed(getString(R.string.search_text))
-    }
-
-    fun textIsSearched(name: String) {
-        textIsDisplayed(name)
-    }
 
     fun endIsReached() {
         composeTestRule.onNodeWithText(END_REACHED_TEXT).assertIsDisplayed()
@@ -117,13 +83,4 @@ class HeroListResultRobot(private val composeTestRule: ComposeContentTestRule) {
         composeTestRule.waitUntilExactlyOneExists(hasText(text))
         composeTestRule.onNodeWithText(text).assertIsDisplayed()
     }
-
-    @OptIn(ExperimentalTestApi::class)
-    fun contentDescriptionIsDisplayed(contentDescription: String) {
-        composeTestRule.waitUntilExactlyOneExists(hasContentDescription(contentDescription))
-        composeTestRule.onNodeWithContentDescription(contentDescription).assertIsDisplayed()
-    }
 }
-
-private fun getString(@StringRes stringResource: Int) =
-    InstrumentationRegistry.getInstrumentation().targetContext.getString(stringResource)

feature-characters/src/androidTest/java/com/rumosoft/characters/presentation/screen/HeroListScreenTest.kt

@@ -16,23 +16,6 @@ class HeroListScreenTest {
         }
     }
 
-    @Test
-    fun whenMagnifierTappedItShowsSearchTextInput() {
-        heroListRobot {
-            onMagnifierTapped()
-        } verify {
-            searchIsDisplayed()
-        }
-    }
-
-    @Test
-    fun whenCharacterIsSearchedItsShownInSearchTextInput() {
-        heroListRobot {
-            onCharacterSearched("searchText")
-        } verify {
-            textIsSearched("searchText")
-        }
-    }
 
     @Test
     fun withoutASwipeUpEndReachedIsNotInvoked() {

feature-characters/src/main/java/com/rumosoft/characters/data/repository/SearchRepositoryImpl.kt

@@ -2,29 +2,28 @@ package com.rumosoft.characters.data.repository
 
 import com.rumosoft.characters.data.mappers.toHero
 import com.rumosoft.characters.domain.model.Character
-import com.rumosoft.characters.domain.usecase.interfaces.SearchRepository
+import com.rumosoft.characters.domain.usecase.interfaces.CharactersRepository
 import com.rumosoft.marvelapi.data.network.CallInProgressException
 import com.rumosoft.marvelapi.data.network.CharactersNetwork
 import timber.log.Timber
 import javax.inject.Inject
 
-const val CHARACTERS_SEARCH_LIMIT = 20
+const val CHARACTERS_LIMIT = 20
 
-class SearchRepositoryImpl @Inject constructor(
+class CharactersRepositoryImpl @Inject constructor(
     private val network: CharactersNetwork,
-) : SearchRepository {
+) : CharactersRepository {
     private var isRequestInProgress = false
 
-    override suspend fun performSearch(
-        nameStartsWith: String,
+    override suspend fun getCharacters(
         page: Int,
     ): Result<List<Character>> {
         if (isRequestInProgress) {
             Timber.d("Request is in progress")
             return Result.failure(CallInProgressException("Request is in progress"))
         }
-        Timber.d("Performing Network Search")
-        val networkResult = performNetworkSearch(nameStartsWith, page)
+        Timber.d("Fetching characters")
+        val networkResult = performNetworkFetch(page)
         if (networkResult.isSuccess) {
             Timber.d("Returned results")
         }
@@ -44,13 +43,12 @@ class SearchRepositoryImpl @Inject constructor(
         return network.getComicThumbnail(comicId)
     }
 
-    private suspend fun performNetworkSearch(
-        nameStartsWith: String,
+    private suspend fun performNetworkFetch(
         page: Int,
     ): Result<List<Character>> {
         isRequestInProgress = true
-        val offset = (page - 1) * CHARACTERS_SEARCH_LIMIT
-        val networkResult = network.searchHeroes(offset, CHARACTERS_SEARCH_LIMIT, nameStartsWith)
+        val offset = (page - 1) * CHARACTERS_LIMIT
+        val networkResult = network.getHeroes(offset, CHARACTERS_LIMIT)
         isRequestInProgress = false
         return networkResult.map { result ->
             result.characters?.map { it.toHero() } ?: emptyList()

feature-characters/src/main/java/com/rumosoft/characters/domain/model/Character.kt

@@ -1,14 +1,9 @@
 package com.rumosoft.characters.domain.model
 
-import android.net.Uri
-import android.os.Bundle
 import android.os.Parcelable
 import androidx.annotation.Keep
-import androidx.navigation.NavType
-import com.rumosoft.marvelapi.infrastructure.extensions.parcelable
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
 
 @Keep
 @Parcelize
@@ -30,16 +25,3 @@ data class Link(
     val url: String,
 ) : Parcelable
 
-val CharacterNavType = object : NavType<Character>(isNullableAllowed = false) {
-    override fun put(bundle: Bundle, key: String, value: Character) {
-        bundle.putParcelable(key, value)
-    }
-
-    override fun get(bundle: Bundle, key: String): Character? {
-        return bundle.parcelable(key) as Character?
-    }
-
-    override fun parseValue(value: String): Character {
-        return Json.decodeFromString(Uri.decode(value))
-    }
-}

feature-characters/src/main/java/com/rumosoft/characters/domain/usecase/GetCharacterDetailsUseCase.kt

@@ -1,11 +1,11 @@
 package com.rumosoft.characters.domain.usecase
 
 import com.rumosoft.characters.domain.model.Character
-import com.rumosoft.characters.domain.usecase.interfaces.SearchRepository
+import com.rumosoft.characters.domain.usecase.interfaces.CharactersRepository
 import javax.inject.Inject
 
 class GetCharacterDetailsUseCase @Inject constructor(
-    private val repository: SearchRepository,
+    private val repository: CharactersRepository,
 ) {
     suspend operator fun invoke(
         characterId: Long,

feature-characters/src/main/java/com/rumosoft/characters/domain/usecase/GetComicThumbnailUseCase.kt

@@ -1,10 +1,10 @@
 package com.rumosoft.characters.domain.usecase
 
-import com.rumosoft.characters.domain.usecase.interfaces.SearchRepository
+import com.rumosoft.characters.domain.usecase.interfaces.CharactersRepository
 import javax.inject.Inject
 
 class GetComicThumbnailUseCase @Inject constructor(
-    private val repository: SearchRepository,
+    private val repository: CharactersRepository,
 ) {
     suspend operator fun invoke(comicId: Int): Result<String> =
         repository.getThumbnail(comicId)

feature-characters/src/main/java/com/rumosoft/characters/domain/usecase/SearchUseCase.kt

@@ -1,12 +1,12 @@
 package com.rumosoft.characters.domain.usecase
 
 import com.rumosoft.characters.domain.model.Character
-import com.rumosoft.characters.domain.usecase.interfaces.SearchRepository
+import com.rumosoft.characters.domain.usecase.interfaces.CharactersRepository
 import javax.inject.Inject
 
-class SearchUseCase @Inject constructor(
-    private val repository: SearchRepository,
+class GetCharactersUseCase @Inject constructor(
+    private val repository: CharactersRepository,
 ) {
-    suspend operator fun invoke(nameStart: String, page: Int): Result<List<Character>> =
-        repository.performSearch(nameStart, page)
+    suspend operator fun invoke(page: Int): Result<List<Character>> =
+        repository.getCharacters(page)
 }

feature-characters/src/main/java/com/rumosoft/characters/domain/usecase/interfaces/SearchRepository.kt

@@ -2,8 +2,8 @@ package com.rumosoft.characters.domain.usecase.interfaces
 
 import com.rumosoft.characters.domain.model.Character
 
-interface SearchRepository {
-    suspend fun performSearch(nameStartsWith: String, page: Int): Result<List<Character>>
+interface CharactersRepository {
+    suspend fun getCharacters(page: Int): Result<List<Character>>
     suspend fun getCharacterDetails(heroId: Long): Result<Character?>
     suspend fun getThumbnail(comicId: Int): Result<String>
 }