update remote data source to return MovieData instead of MovieEntity

Author: AliAsadi

data/src/main/kotlin/com/aliasadi/data/entities/MovieData.kt

@@ -22,4 +22,13 @@ fun MovieData.toDomain() = MovieEntity(
     description = description,
     title = title,
     category = category
+)
+
+fun MovieData.toDbData() = MovieDbData(
+    id = id,
+    image = image,
+    description = description,
+    title = title,
+    category = category,
+    backgroundUrl = backgroundUrl
 )

data/src/main/kotlin/com/aliasadi/data/repository/movie/MovieDataSource.kt

@@ -1,6 +1,7 @@
 package com.aliasadi.data.repository.movie
 
 import androidx.paging.PagingSource
+import com.aliasadi.data.entities.MovieData
 import com.aliasadi.data.entities.MovieDbData
 import com.aliasadi.data.entities.MovieRemoteKeyDbData
 import com.aliasadi.domain.entities.MovieEntity
@@ -12,17 +13,17 @@ import com.aliasadi.domain.util.Result
 interface MovieDataSource {
 
     interface Remote {
-        suspend fun getMovies(page: Int, limit: Int): Result<List<MovieEntity>>
-        suspend fun getMovies(movieIds: List<Int>): Result<List<MovieEntity>>
-        suspend fun getMovie(movieId: Int): Result<MovieEntity>
-        suspend fun search(query: String, page: Int, limit: Int): Result<List<MovieEntity>>
+        suspend fun getMovies(page: Int, limit: Int): Result<List<MovieData>>
+        suspend fun getMovies(movieIds: List<Int>): Result<List<MovieData>>
+        suspend fun getMovie(movieId: Int): Result<MovieData>
+        suspend fun search(query: String, page: Int, limit: Int): Result<List<MovieData>>
     }
 
     interface Local {
         fun movies(): PagingSource<Int, MovieDbData>
         suspend fun getMovies(): Result<List<MovieEntity>>
         suspend fun getMovie(movieId: Int): Result<MovieEntity>
-        suspend fun saveMovies(movieEntities: List<MovieEntity>)
+        suspend fun saveMovies(movies: List<MovieData>)
         suspend fun getLastRemoteKey(): MovieRemoteKeyDbData?
         suspend fun saveRemoteKey(key: MovieRemoteKeyDbData)
         suspend fun clearMovies()

data/src/main/kotlin/com/aliasadi/data/repository/movie/MovieLocalDataSource.kt

@@ -3,8 +3,10 @@ package com.aliasadi.data.repository.movie
 import androidx.paging.PagingSource
 import com.aliasadi.data.db.movies.MovieDao
 import com.aliasadi.data.db.movies.MovieRemoteKeyDao
+import com.aliasadi.data.entities.MovieData
 import com.aliasadi.data.entities.MovieDbData
 import com.aliasadi.data.entities.MovieRemoteKeyDbData
+import com.aliasadi.data.entities.toDbData
 import com.aliasadi.data.entities.toDomain
 import com.aliasadi.data.exception.DataNotAvailableException
 import com.aliasadi.data.mapper.toDbData
@@ -36,8 +38,8 @@ class MovieLocalDataSource(
         } ?: Result.Error(DataNotAvailableException())
     }
 
-    override suspend fun saveMovies(movieEntities: List<MovieEntity>) {
-        movieDao.saveMovies(movieEntities.map { it.toDbData() })
+    override suspend fun saveMovies(movies: List<MovieData>) {
+        movieDao.saveMovies(movies.map { it.toDbData() })
     }
 
     override suspend fun getLastRemoteKey(): MovieRemoteKeyDbData? {

data/src/main/kotlin/com/aliasadi/data/repository/movie/MovieRepositoryImpl.kt

@@ -12,6 +12,7 @@ import com.aliasadi.domain.repository.MovieRepository
 import com.aliasadi.domain.util.Result
 import com.aliasadi.domain.util.Result.Error
 import com.aliasadi.domain.util.Result.Success
+import com.aliasadi.domain.util.map
 import com.aliasadi.domain.util.onError
 import com.aliasadi.domain.util.onSuccess
 import kotlinx.coroutines.flow.Flow
@@ -60,7 +61,7 @@ class MovieRepositoryImpl(
     override suspend fun getMovie(movieId: Int): Result<MovieEntity> {
         return when (val localResult = local.getMovie(movieId)) {
             is Success -> localResult
-            is Error -> remote.getMovie(movieId)
+            is Error -> remote.getMovie(movieId).map { it.toDomain() }
         }
     }
 

data/src/main/kotlin/com/aliasadi/data/repository/movie/SearchMoviePagingSource.kt

@@ -2,6 +2,7 @@ package com.aliasadi.data.repository.movie
 
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
+import com.aliasadi.data.entities.toDomain
 import com.aliasadi.domain.entities.MovieEntity
 import com.aliasadi.domain.util.Result.Error
 import com.aliasadi.domain.util.Result.Success
@@ -21,7 +22,7 @@ class SearchMoviePagingSource(
 
         return when (val result = remote.search(query, page, params.loadSize)) {
             is Success -> LoadResult.Page(
-                data = result.data.distinctBy { movie -> movie.id },
+                data = result.data.map { it.toDomain() }.distinctBy { movie -> movie.id },
                 prevKey = if (page == STARTING_PAGE_INDEX) null else page - 1,
                 nextKey = if (result.data.isEmpty()) null else page + 1
             )

data/src/mock/kotlin/com/aliasadi/data/repository/movie/MovieRemoteDataSource.kt

@@ -1,6 +1,7 @@
 package com.aliasadi.data.repository.movie
 
 import com.aliasadi.data.api.MovieApi
+import com.aliasadi.data.entities.MovieData
 import com.aliasadi.data.entities.toDomain
 import com.aliasadi.data.exception.DataNotAvailableException
 import com.aliasadi.data.util.JsonLoader
@@ -20,40 +21,40 @@ class MovieRemoteDataSource(
         const val DEFAULT_API_DELAY = 500L
     }
 
-    override suspend fun getMovies(page: Int, limit: Int): Result<List<MovieEntity>> {
+    override suspend fun getMovies(page: Int, limit: Int): Result<List<MovieData>> {
         delay(DEFAULT_API_DELAY)
         return if (page == 2) {
             Result.Success(emptyList())
         } else {
-            Result.Success(JsonLoader.loadMovies().map { it.toDomain() })
+            Result.Success(JsonLoader.loadMovies())
         }
     }
 
-    override suspend fun getMovies(movieIds: List<Int>): Result<List<MovieEntity>> {
+    override suspend fun getMovies(movieIds: List<Int>): Result<List<MovieData>> {
         delay(DEFAULT_API_DELAY)
         val movies = JsonLoader.loadMovies().filter { it.id in movieIds }
-        return Result.Success(movies.map { it.toDomain() })
+        return Result.Success(movies)
     }
 
-    override suspend fun getMovie(movieId: Int): Result<MovieEntity> {
+    override suspend fun getMovie(movieId: Int): Result<MovieData> {
         delay(DEFAULT_API_DELAY)
         val movie = JsonLoader.loadMovies().find { it.id == movieId }
         return if (movie != null) {
-            Result.Success(movie.toDomain())
+            Result.Success(movie)
         } else {
             Result.Error(DataNotAvailableException())
         }
     }
 
-    override suspend fun search(query: String, page: Int, limit: Int): Result<List<MovieEntity>> {
+    override suspend fun search(query: String, page: Int, limit: Int): Result<List<MovieData>> {
         delay(DEFAULT_API_DELAY)
         return if (page == 2) {
             Result.Success(emptyList())
         } else {
             val filteredMovies = JsonLoader.loadMovies().filter {
                 it.title.contains(query, ignoreCase = true) || it.description.contains(query, ignoreCase = true)
             }
-            Result.Success(filteredMovies.map { it.toDomain() })
+            Result.Success(filteredMovies)
         }
     }
 }

data/src/prod/kotlin/com/aliasadi/data/repository/movie/MovieRemoteDataSource.kt

@@ -1,6 +1,7 @@
 package com.aliasadi.data.repository.movie
 
 import com.aliasadi.data.api.MovieApi
+import com.aliasadi.data.entities.MovieData
 import com.aliasadi.data.entities.toDomain
 import com.aliasadi.data.util.safeApiCall
 import com.aliasadi.domain.entities.MovieEntity
@@ -13,19 +14,19 @@ class MovieRemoteDataSource(
     private val movieApi: MovieApi
 ) : MovieDataSource.Remote {
 
-    override suspend fun getMovies(page: Int, limit: Int): Result<List<MovieEntity>> = safeApiCall {
-        movieApi.getMovies(page, limit).map { it.toDomain() }
+    override suspend fun getMovies(page: Int, limit: Int): Result<List<MovieData>> = safeApiCall {
+        movieApi.getMovies(page, limit)
     }
 
-    override suspend fun getMovies(movieIds: List<Int>): Result<List<MovieEntity>> = safeApiCall {
-        movieApi.getMovies(movieIds).map { it.toDomain() }
+    override suspend fun getMovies(movieIds: List<Int>): Result<List<MovieData>> = safeApiCall {
+        movieApi.getMovies(movieIds)
     }
 
-    override suspend fun getMovie(movieId: Int): Result<MovieEntity> = safeApiCall {
-        movieApi.getMovie(movieId).toDomain()
+    override suspend fun getMovie(movieId: Int): Result<MovieData> = safeApiCall {
+        movieApi.getMovie(movieId)
     }
 
-    override suspend fun search(query: String, page: Int, limit: Int): Result<List<MovieEntity>> = safeApiCall {
-        movieApi.search(query, page, limit).map { it.toDomain() }
+    override suspend fun search(query: String, page: Int, limit: Int): Result<List<MovieData>> = safeApiCall {
+        movieApi.search(query, page, limit)
     }
 }