Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migration to Result<> #126

Merged
merged 18 commits into from
Sep 23, 2024
Merged

Migration to Result<> #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
328179e
Delete ResultState.kt
VictorKabata Sep 23, 2024
d9dfcef
Update domain repos with result instead of resultState
VictorKabata Sep 23, 2024
5b6fc90
Update SafeApiCall.kt
VictorKabata Sep 23, 2024
bd3e483
Update favorite repo to use result
VictorKabata Sep 23, 2024
7686815
Update settings repo to use runCatching
VictorKabata Sep 23, 2024
75536ac
Update movie details repo
VictorKabata Sep 23, 2024
e1efe6e
Update SafeApiCall.kt
VictorKabata Sep 23, 2024
7796a60
Code clean up
VictorKabata Sep 23, 2024
842c34e
Update FavoritesRepositoryImpl.kt
VictorKabata Sep 23, 2024
3879b39
Update movie repository
VictorKabata Sep 23, 2024
6b71690
Update search repo
VictorKabata Sep 23, 2024
b97dbd0
Update MovieDetailsRepositoryImpl.kt
VictorKabata Sep 23, 2024
dd9e714
Update home viewmodel
VictorKabata Sep 23, 2024
813affd
Update DetailsViewModel.kt
VictorKabata Sep 23, 2024
8c94343
Update FavoritesViewModel.kt
VictorKabata Sep 23, 2024
021d4a2
Update viewmodels
VictorKabata Sep 23, 2024
d1bbffd
Update viewmodels
VictorKabata Sep 23, 2024
fd98079
Linting
VictorKabata Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions composeApp/src/commonMain/kotlin/com/vickbt/composeApp/data/cache/daos/FavoriteMovieDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ interface FavoriteMovieDao {
suspend fun saveFavoriteMovie(movie: MovieDetailsEntity)

@Query("SELECT * FROM `Favorite Movies`")
fun getAllFavoriteMovies(): Flow<List<MovieDetailsEntity>>
fun getAllFavoriteMovies(): Flow<List<MovieDetailsEntity>?>

@Query("SELECT * FROM `Favorite Movies` WHERE id = :id")
suspend fun getFavoriteMovie(id: Int): MovieDetailsEntity
fun getFavoriteMovie(id: Int): Flow<MovieDetailsEntity?>

@Query("DELETE FROM `Favorite Movies` WHERE id = :id")
suspend fun deleteFavoriteMovie(id: Int)
Expand All @@ -25,5 +25,5 @@ interface FavoriteMovieDao {
suspend fun deleteAllFavoriteMovies()

@Query("SELECT COUNT() FROM `Favorite Movies` WHERE id = :id")
fun isMovieFavorite(id: Int): Flow<Boolean>
fun isMovieFavorite(id: Int): Flow<Boolean?>
}
8 changes: 5 additions & 3 deletions ...p/src/commonMain/kotlin/com/vickbt/composeApp/data/datasources/FavoritesRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ class FavoritesRepositoryImpl(
private val appDatabase: AppDatabase
) : FavoritesRepository {

override suspend fun getFavouriteMovies(): Flow<List<MovieDetails>> {
return appDatabase.favoriteMovieDao().getAllFavoriteMovies().map {
it.map { movieDetail -> movieDetail.toDomain() }
override suspend fun getFavouriteMovies(): Result<Flow<List<MovieDetails>?>> {
return runCatching {
appDatabase.favoriteMovieDao().getAllFavoriteMovies().map {
it?.map { movieDetail -> movieDetail.toDomain() }
}
}
}
}
67 changes: 27 additions & 40 deletions ...rc/commonMain/kotlin/com/vickbt/composeApp/data/datasources/MovieDetailsRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,80 +11,67 @@ import com.vickbt.composeApp.domain.models.Cast
import com.vickbt.composeApp.domain.models.Movie
import com.vickbt.composeApp.domain.models.MovieDetails
import com.vickbt.composeApp.domain.repositories.MovieDetailsRepository
import com.vickbt.composeApp.utils.ResultState
import io.ktor.client.HttpClient
import io.ktor.client.call.body
import io.ktor.client.request.get
import io.ktor.client.request.parameter
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.firstOrNull
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.map

class MovieDetailsRepositoryImpl(
private val httpClient: HttpClient,
private val appDatabase: AppDatabase
) : MovieDetailsRepository {

override suspend fun fetchMovieDetails(movieId: Int): Flow<ResultState<MovieDetails>> {
val isMovieCached = isMovieFavorite(movieId = movieId).firstOrNull()
override suspend fun fetchMovieDetails(movieId: Int): Result<Flow<MovieDetails?>> {
val isMovieCached = isMovieFavorite(movieId = movieId).getOrDefault(flowOf(false))
.firstOrNull()

return if (isMovieCached == true) {
try {
val cachedFavoriteMovie = getFavoriteMovie(movieId = movieId)
flowOf(ResultState.Success(data = cachedFavoriteMovie))
} catch (e: Exception) {
flowOf(ResultState.Failure(exception = e))
}
getFavoriteMovie(movieId = movieId)
} else {
flowOf(
safeApiCall {
val response =
httpClient.get(urlString = "movie/$movieId").body<MovieDetailsDto>()
response.toDomain()
}
)
safeApiCall {
httpClient.get(urlString = "movie/$movieId").body<MovieDetailsDto>().toDomain()
}
}
}

override suspend fun fetchMovieCast(movieId: Int): Flow<ResultState<Cast>> {
return flowOf(
safeApiCall {
val response = httpClient.get(urlString = "movie/$movieId/credits").body<CastDto>()

response.toDomain()
}
)
override suspend fun fetchMovieCast(movieId: Int): Result<Flow<Cast>> {
return safeApiCall {
httpClient.get(urlString = "movie/$movieId/credits").body<CastDto>().toDomain()
}
}

override suspend fun fetchSimilarMovies(
movieId: Int,
page: Int
): Flow<ResultState<List<Movie>?>> {
return flowOf(
safeApiCall {
val response = httpClient.get(urlString = "movie/$movieId/similar") {
parameter("page", page)
}.body<MovieResultsDto>()
): Result<Flow<List<Movie>?>> {
return safeApiCall {
val response = httpClient.get(urlString = "movie/$movieId/similar") {
parameter("page", page)
}.body<MovieResultsDto>()

response.movies?.map { it.toDomain() }
}
)
response.movies?.map { it.toDomain() }
}
}

override suspend fun saveFavoriteMovie(movie: MovieDetails) {
appDatabase.favoriteMovieDao().saveFavoriteMovie(movie = movie.toEntity())
runCatching { appDatabase.favoriteMovieDao().saveFavoriteMovie(movie = movie.toEntity()) }
}

override suspend fun getFavoriteMovie(movieId: Int): MovieDetails {
val favMovieDao = appDatabase.favoriteMovieDao()
return favMovieDao.getFavoriteMovie(id = movieId).toDomain()
override suspend fun getFavoriteMovie(movieId: Int): Result<Flow<MovieDetails?>> {
return runCatching {
appDatabase.favoriteMovieDao().getFavoriteMovie(id = movieId).map { it?.toDomain() }
}
}

override suspend fun deleteFavoriteMovie(movieId: Int) {
appDatabase.favoriteMovieDao().deleteFavoriteMovie(id = movieId)
runCatching { appDatabase.favoriteMovieDao().deleteFavoriteMovie(id = movieId) }
}

override suspend fun isMovieFavorite(movieId: Int): Flow<Boolean> {
return appDatabase.favoriteMovieDao().isMovieFavorite(id = movieId)
override suspend fun isMovieFavorite(movieId: Int): Result<Flow<Boolean?>> {
return runCatching { appDatabase.favoriteMovieDao().isMovieFavorite(id = movieId) }
}
}
70 changes: 30 additions & 40 deletions ...eApp/src/commonMain/kotlin/com/vickbt/composeApp/data/datasources/MoviesRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,67 +5,57 @@ import com.vickbt.composeApp.data.network.models.MovieResultsDto
import com.vickbt.composeApp.data.network.utils.safeApiCall
import com.vickbt.composeApp.domain.models.Movie
import com.vickbt.composeApp.domain.repositories.MoviesRepository
import com.vickbt.composeApp.utils.ResultState
import io.ktor.client.HttpClient
import io.ktor.client.call.body
import io.ktor.client.request.get
import io.ktor.client.request.parameter
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flowOf

class MoviesRepositoryImpl constructor(
class MoviesRepositoryImpl(
private val httpClient: HttpClient
) : MoviesRepository {

override suspend fun fetchNowPlayingMovies(page: Int): Flow<ResultState<List<Movie>?>> {
return flowOf(
safeApiCall {
val response = httpClient.get(urlString = "movie/now_playing") {
parameter("page", page)
}.body<MovieResultsDto>()
override suspend fun fetchNowPlayingMovies(page: Int): Result<Flow<List<Movie>?>> {
return safeApiCall {
val response = httpClient.get(urlString = "movie/now_playing") {
parameter("page", page)
}.body<MovieResultsDto>()

response.movies?.map { it.toDomain() }
}
)
response.movies?.map { it.toDomain() }
}
}

override suspend fun fetchTrendingMovies(
mediaType: String,
timeWindow: String,
page: Int
): Flow<ResultState<List<Movie>?>> {
return flowOf(
safeApiCall {
val response = httpClient.get(urlString = "trending/$mediaType/$timeWindow") {
parameter("page", page)
}.body<MovieResultsDto>()

response.movies?.map { it.toDomain() }
}
)
): Result<Flow<List<Movie>?>> {
return safeApiCall {
val response = httpClient.get(urlString = "trending/$mediaType/$timeWindow") {
parameter("page", page)
}.body<MovieResultsDto>()

response.movies?.map { it.toDomain() }
}
}

override suspend fun fetchPopularMovies(page: Int): Flow<ResultState<List<Movie>?>> {
return flowOf(
safeApiCall {
val response = httpClient.get(urlString = "movie/popular") {
parameter("page", page)
}.body<MovieResultsDto>()
override suspend fun fetchPopularMovies(page: Int): Result<Flow<List<Movie>?>> {
return safeApiCall {
val response = httpClient.get(urlString = "movie/popular") {
parameter("page", page)
}.body<MovieResultsDto>()

response.movies?.map { it.toDomain() }
}
)
response.movies?.map { it.toDomain() }
}
}

override suspend fun fetchUpcomingMovies(page: Int): Flow<ResultState<List<Movie>?>> {
return flowOf(
safeApiCall {
val response = httpClient.get(urlString = "movie/upcoming") {
parameter("page", page)
}.body<MovieResultsDto>()
override suspend fun fetchUpcomingMovies(page: Int): Result<Flow<List<Movie>?>> {
return safeApiCall {
val response = httpClient.get(urlString = "movie/upcoming") {
parameter("page", page)
}.body<MovieResultsDto>()

response.movies?.map { it.toDomain() }
}
)
response.movies?.map { it.toDomain() }
}
}
}
20 changes: 8 additions & 12 deletions ...eApp/src/commonMain/kotlin/com/vickbt/composeApp/data/datasources/SearchRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ import com.vickbt.composeApp.data.network.models.MovieResultsDto
import com.vickbt.composeApp.data.network.utils.safeApiCall
import com.vickbt.composeApp.domain.models.Movie
import com.vickbt.composeApp.domain.repositories.SearchRepository
import com.vickbt.composeApp.utils.ResultState
import io.ktor.client.HttpClient
import io.ktor.client.call.body
import io.ktor.client.request.get
import io.ktor.client.request.parameter
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flowOf

class SearchRepositoryImpl(
private val httpClient: HttpClient
Expand All @@ -20,16 +18,14 @@ class SearchRepositoryImpl(
override suspend fun searchMovie(
movieName: String,
page: Int
): Flow<ResultState<List<Movie>?>> {
return flowOf(
safeApiCall {
val response = httpClient.get(urlString = "search/movie") {
parameter("query", movieName)
parameter("page", page)
}.body<MovieResultsDto>()
): Result<Flow<List<Movie>?>> {
return safeApiCall {
val response = httpClient.get(urlString = "search/movie") {
parameter("query", movieName)
parameter("page", page)
}.body<MovieResultsDto>()

response.movies?.map { it.toDomain() }
}
)
response.movies?.map { it.toDomain() }
}
}
}
16 changes: 10 additions & 6 deletions ...pp/src/commonMain/kotlin/com/vickbt/composeApp/data/datasources/SettingsRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,19 @@ class SettingsRepositoryImpl(
}
}

override suspend fun getThemePreference(): Flow<Int> {
return dataStore.data.map { preferences ->
preferences[intPreferencesKey(KEY_THEME)] ?: 2
override suspend fun getThemePreference(): Result<Flow<Int>> {
return runCatching {
dataStore.data.map { preferences ->
preferences[intPreferencesKey(KEY_THEME)] ?: 2
}
}
}

override suspend fun getImageQualityPreference(): Flow<Int> {
return dataStore.data.map { preferences ->
preferences[intPreferencesKey(KEY_IMAGE_QUALITY)] ?: 1
override suspend fun getImageQualityPreference(): Result<Flow<Int>> {
return runCatching {
dataStore.data.map { preferences ->
preferences[intPreferencesKey(KEY_IMAGE_QUALITY)] ?: 1
}
}
}
}
30 changes: 5 additions & 25 deletions composeApp/src/commonMain/kotlin/com/vickbt/composeApp/data/network/utils/SafeApiCall.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,14 @@ package com.vickbt.composeApp.data.network.utils
import com.vickbt.composeApp.data.mappers.toDomain
import com.vickbt.composeApp.data.network.models.ErrorResponseDto
import com.vickbt.composeApp.domain.models.ErrorResponse
import com.vickbt.composeApp.utils.ResultState
import io.ktor.client.call.body
import io.ktor.client.plugins.ClientRequestException
import io.ktor.client.plugins.RedirectResponseException
import io.ktor.client.plugins.ServerResponseException
import io.ktor.client.statement.HttpResponse
import io.ktor.util.network.UnresolvedAddressException
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flowOf

suspend fun <T : Any?> safeApiCall(apiCall: suspend () -> T): ResultState<T> {
return try {
ResultState.Loading

ResultState.Success(apiCall.invoke())
} catch (e: RedirectResponseException) {
val error = parseNetworkError(e.response.body())
ResultState.Failure(exception = error)
} catch (e: ClientRequestException) {
val error = parseNetworkError(e.response.body())
ResultState.Failure(exception = error)
} catch (e: ServerResponseException) {
val error = parseNetworkError(e.response.body())
ResultState.Failure(exception = error)
} catch (e: UnresolvedAddressException) {
val error = parseNetworkError(exception = e)
ResultState.Failure(exception = error)
} catch (e: Exception) {
val error = parseNetworkError(exception = e)
ResultState.Failure(exception = error)
suspend fun <T : Any?> safeApiCall(apiCall: suspend () -> T): Result<Flow<T>> {
return runCatching {
flowOf(apiCall.invoke())
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...pp/src/commonMain/kotlin/com/vickbt/composeApp/domain/repositories/FavoritesRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ import kotlinx.coroutines.flow.Flow
interface FavoritesRepository {

/**Returns a list of movies that are favourite from the database*/
suspend fun getFavouriteMovies(): Flow<List<MovieDetails>>
suspend fun getFavouriteMovies(): Result<Flow<List<MovieDetails>?>>
}
11 changes: 5 additions & 6 deletions ...src/commonMain/kotlin/com/vickbt/composeApp/domain/repositories/MovieDetailsRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,31 @@ import com.vickbt.composeApp.domain.models.Cast
import com.vickbt.composeApp.domain.models.Movie
import com.vickbt.composeApp.domain.models.MovieDetails
import com.vickbt.composeApp.domain.utils.Constants.STARTING_PAGE_INDEX
import com.vickbt.composeApp.utils.ResultState
import kotlinx.coroutines.flow.Flow

interface MovieDetailsRepository {

/**Fetch movie details from network source*/
suspend fun fetchMovieDetails(movieId: Int): Flow<ResultState<MovieDetails>>
suspend fun fetchMovieDetails(movieId: Int): Result<Flow<MovieDetails?>>

/**Fetch movie cast from network source*/
suspend fun fetchMovieCast(movieId: Int): Flow<ResultState<Cast>>
suspend fun fetchMovieCast(movieId: Int): Result<Flow<Cast>>

/** Fetches similar movies from network source*/
suspend fun fetchSimilarMovies(
movieId: Int,
page: Int = STARTING_PAGE_INDEX
): Flow<ResultState<List<Movie>?>>
): Result<Flow<List<Movie>?>>

/**Save movie details to local cache*/
suspend fun saveFavoriteMovie(movie: MovieDetails)

/**Retrieve cached movie details from local cache based on its ID*/
suspend fun getFavoriteMovie(movieId: Int): MovieDetails?
suspend fun getFavoriteMovie(movieId: Int): Result<Flow<MovieDetails?>>

/**Delete previously saved movie details from local cache*/
suspend fun deleteFavoriteMovie(movieId: Int)

/**Check if movie details record is available in the local cache*/
suspend fun isMovieFavorite(movieId: Int): Flow<Boolean>
suspend fun isMovieFavorite(movieId: Int): Result<Flow<Boolean?>>
}
Loading
Loading