Cleanup

Author: alirezaeiii

common/src/main/java/com/sample/tmdb/common/base/BaseRepository.kt

@@ -8,10 +8,10 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 
-abstract class BaseRepository<T>(private val context: Context, private val ioDispatcher: CoroutineDispatcher) {
-    protected abstract suspend fun getSuccessResult(id: Any?): T
+abstract class BaseRepository<T, S>(private val context: Context, private val ioDispatcher: CoroutineDispatcher) {
+    protected abstract suspend fun getSuccessResult(id: S?): T
 
-    fun getResult(isRefreshing: Boolean = false, id: Any?): Flow<Async<T>> = flow {
+    fun getResult(isRefreshing: Boolean = false, id: S? = null): Flow<Async<T>> = flow {
         emit(Async.Loading(isRefreshing))
         try {
             emit(Async.Success(getSuccessResult(id)))

common/src/main/java/com/sample/tmdb/common/base/BaseViewModel.kt

@@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
 
-open class BaseViewModel<T>(private val repository: BaseRepository<T>, private val id: Any? = null) : ViewModel() {
+open class BaseViewModel<T, S>(private val repository: BaseRepository<T, S>, private val id: S? = null) : ViewModel() {
 
     private val _state = MutableStateFlow(ViewState<T>(isLoading = true))
     val state = _state.asStateFlow()

common/src/main/java/com/sample/tmdb/common/base/TMDbViewModel.kt

@@ -1,6 +1,6 @@
 package com.sample.tmdb.common.base
 
-open class TMDbViewModel<T>(repository: BaseRepository<T>, id: Any? = null) : BaseViewModel<T>(repository, id) {
+open class TMDbViewModel<T, S>(repository: BaseRepository<T, S>, id: S? = null) : BaseViewModel<T, S>(repository, id) {
     init {
         refresh()
     }

common/src/main/java/com/sample/tmdb/common/ui/Content.kt

@@ -12,8 +12,8 @@ import com.sample.tmdb.common.ui.component.TMDbProgressBar
 import kotlinx.coroutines.flow.collectLatest
 
 @Composable
-fun <T> Content(
-    viewModel: BaseViewModel<T>,
+fun <T, S> Content(
+    viewModel: BaseViewModel<T, S>,
     scaffoldState: ScaffoldState? = null,
     successScreen: @Composable (T) -> Unit,
 ) {

core/data/src/main/java/com/sample/tmdb/data/di/RepositoryModule.kt

@@ -35,6 +35,8 @@ import com.sample.tmdb.domain.repository.BaseDetailRepository
 import com.sample.tmdb.domain.repository.BaseFeedRepository
 import com.sample.tmdb.domain.repository.BasePagingRepository
 import com.sample.tmdb.domain.repository.BookmarkDetailsRepository
+import com.sample.tmdb.domain.utils.BookmarkMovie
+import com.sample.tmdb.domain.utils.BookmarkTVShow
 import com.sample.tmdb.domain.utils.Discover
 import com.sample.tmdb.domain.utils.Latest
 import com.sample.tmdb.domain.utils.NowPlaying
@@ -188,7 +190,7 @@ abstract class RepositoryModule {
 
     @Singleton
     @Binds
-    internal abstract fun bindPersonRepository(personRepository: PersonRepository): BaseRepository<Person>
+    internal abstract fun bindPersonRepository(personRepository: PersonRepository): BaseRepository<Person, String>
 
     @Singleton
     @Binds
@@ -204,15 +206,15 @@ abstract class RepositoryModule {
 
     @Singleton
     @Binds
-    @JvmSuppressWildcards
+    @BookmarkMovie
     internal abstract fun bindBookmarkMovieRepository(
         bookmarkMovieRepository: BookmarkMovieRepository,
-    ): BaseRepository<List<Movie>>
+    ): BaseRepository<List<Movie>, Nothing>
 
     @Singleton
     @Binds
-    @JvmSuppressWildcards
+    @BookmarkTVShow
     internal abstract fun bindBookmarkTVShowRepository(
         bookmarkTVShowRepository: BookmarkTVShowRepository,
-    ): BaseRepository<List<TVShow>>
+    ): BaseRepository<List<TVShow>, Nothing>
 }

core/data/src/main/java/com/sample/tmdb/data/repository/PersonRepository.kt

@@ -16,6 +16,6 @@ class PersonRepository @Inject constructor(
     private val personApi: PersonService,
     @ApplicationContext context: Context,
     @IoDispatcher ioDispatcher: CoroutineDispatcher,
-) : BaseRepository<Person>(context, ioDispatcher) {
-    override suspend fun getSuccessResult(id: Any?): Person = personApi.getPerson(id as String).asDomainModel()
+) : BaseRepository<Person, String>(context, ioDispatcher) {
+    override suspend fun getSuccessResult(id: String?): Person = personApi.getPerson(id!!).asDomainModel()
 }

core/data/src/main/java/com/sample/tmdb/data/repository/movie/detail/BookmarkMovieRepository.kt

@@ -16,6 +16,6 @@ class BookmarkMovieRepository @Inject constructor(
     private val movieDao: MovieDao,
     @ApplicationContext context: Context,
     @IoDispatcher ioDispatcher: CoroutineDispatcher,
-) : BaseRepository<List<@JvmSuppressWildcards Movie>>(context, ioDispatcher) {
-    override suspend fun getSuccessResult(id: Any?): List<Movie> = movieDao.getBookmarks().asDomainModel()
+) : BaseRepository<List<Movie>, Nothing>(context, ioDispatcher) {
+    override suspend fun getSuccessResult(id: Nothing?): List<Movie> = movieDao.getBookmarks().asDomainModel()
 }

core/data/src/main/java/com/sample/tmdb/data/repository/tvshow/detail/BookmarkTVShowRepository.kt

@@ -16,6 +16,6 @@ class BookmarkTVShowRepository @Inject constructor(
     private val tvShowDao: TVShowDao,
     @ApplicationContext context: Context,
     @IoDispatcher ioDispatcher: CoroutineDispatcher,
-) : BaseRepository<List<@JvmSuppressWildcards TVShow>>(context, ioDispatcher) {
-    override suspend fun getSuccessResult(id: Any?): List<TVShow> = tvShowDao.getBookmarks().asDomainModel()
+) : BaseRepository<List<TVShow>, Nothing>(context, ioDispatcher) {
+    override suspend fun getSuccessResult(id: Nothing?): List<TVShow> = tvShowDao.getBookmarks().asDomainModel()
 }

core/data/src/test/java/com/sample/tmdb/data/repository/BaseBookmarkRepositoryTest.kt

@@ -15,14 +15,14 @@ import org.mockito.ArgumentMatchers.anyInt
 import org.mockito.Mockito.`when`
 
 abstract class BaseBookmarkRepositoryTest<T : TMDbItem> : BaseRepositoryTest() {
-    protected lateinit var repository: BaseRepository<List<T>>
+    protected lateinit var repository: BaseRepository<List<T>, Nothing>
 
     @Test
     fun `load bookmark success`() {
         mockApiResponse()
         runTest {
-            assertThat(repository.getResult(id = null).first(), `is`(Async.Loading()))
-            val result = (repository.getResult(id = null).last() as Async.Success).data
+            assertThat(repository.getResult().first(), `is`(Async.Loading()))
+            val result = (repository.getResult().last() as Async.Success).data
             assertEquals(emptyList<T>(), result)
         }
     }
@@ -31,7 +31,7 @@ abstract class BaseBookmarkRepositoryTest<T : TMDbItem> : BaseRepositoryTest() {
     fun `load bookmark failed`() = runTest {
         val errorMsg = "error message"
         `when`(context.getString(anyInt())).thenReturn(errorMsg)
-        repository.getResult(id = null).test {
+        repository.getResult().test {
             assertEquals(Async.Loading(), awaitItem())
             assertEquals(Async.Error(errorMsg), awaitItem())
             awaitComplete()

core/data/src/test/java/com/sample/tmdb/data/repository/BaseFeedRepositoryTest.kt

@@ -21,8 +21,8 @@ abstract class BaseFeedRepositoryTest<T : TMDbItem> : BaseRepositoryTest() {
     fun `load feeds success`() {
         mockApiResponse()
         runTest {
-            assertThat(repository.getResult(id = null).first(), `is`(Async.Loading()))
-            val result = (repository.getResult(id = null).last() as Async.Success).data
+            assertThat(repository.getResult().first(), `is`(Async.Loading()))
+            val result = (repository.getResult().last() as Async.Success).data
             assertThat(result[0].feeds, `is`(emptyList()))
             assertThat(result[1].feeds, `is`(emptyList()))
             assertThat(result[2].feeds, `is`(emptyList()))
@@ -37,7 +37,7 @@ abstract class BaseFeedRepositoryTest<T : TMDbItem> : BaseRepositoryTest() {
         val errorMsg = "error message"
         `when`(context.getString(anyInt())).thenReturn(errorMsg)
         runTest {
-            repository.getResult(id = null).test {
+            repository.getResult().test {
                 assertEquals(Async.Loading(), awaitItem())
                 assertEquals(Async.Error(errorMsg), awaitItem())
                 awaitComplete()