atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Remove recipe from local db when deleted

Browse Source
This commit is contained in:
Kirill Kamakin
2022-12-16 20:24:40 +01:00
parent 28fa19c988
commit 226097d096
9 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeRepo.kt
View File

@@ -20,5 +20,5 @@ interface RecipeRepo {
suspend fun updateIsRecipeFavorite(recipeSlug: String, isFavorite: Boolean): Result<Unit>
suspend fun deleteRecipe(recipeSlug: String): Result<Unit>
suspend fun deleteRecipe(entity: RecipeSummaryEntity): Result<Unit>
}

2
app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeStorage.kt
View File

@@ -19,4 +19,6 @@ interface RecipeStorage {
suspend fun queryRecipeInfo(recipeId: String): FullRecipeEntity?
suspend fun updateFavoriteRecipes(favorites: List<String>)
suspend fun deleteRecipe(entity: RecipeSummaryEntity)
}

5
app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeStorageImpl.kt
View File

@@ -80,4 +80,9 @@ class RecipeStorageImpl @Inject constructor(
recipeDao.setNonFavorite(favorites)
}
}
override suspend fun deleteRecipe(entity: RecipeSummaryEntity) {
logger.v { "deleteRecipeBySlug() called with: entity = $entity" }
recipeDao.deleteRecipe(entity)
}
}

15
app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoImpl.kt
View File

@@ -78,15 +78,20 @@ class RecipeRepoImpl @Inject constructor(
): Result<Unit> = runCatchingExceptCancel {
logger.v { "updateIsRecipeFavorite() called with: recipeSlug = $recipeSlug, isFavorite = $isFavorite" }
dataSource.updateIsRecipeFavorite(recipeSlug, isFavorite)
mediator.onFavoritesChange()
val favorites = dataSource.getFavoriteRecipes()
storage.updateFavoriteRecipes(favorites)
pagingSourceFactory.invalidate()
}.onFailure {
logger.e(it) { "Can't update recipe's is favorite status" }
}
override suspend fun deleteRecipe(recipeSlug: String): Result<Unit> = runCatchingExceptCancel {
logger.v { "deleteRecipe() called with: recipeSlug = $recipeSlug" }
dataSource.deleteRecipe(recipeSlug)
// TODO update local db
override suspend fun deleteRecipe(
entity: RecipeSummaryEntity
): Result<Unit> = runCatchingExceptCancel {
logger.v { "deleteRecipe() called with: entity = $entity" }
dataSource.deleteRecipe(entity.slug)
storage.deleteRecipe(entity)
pagingSourceFactory.invalidate()
}.onFailure {
logger.e(it) { "Can't delete recipe" }
}

6
app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediator.kt
View File

@@ -83,10 +83,4 @@ class RecipesRemoteMediator @Inject constructor(
recipes.size
}
suspend fun onFavoritesChange() {
logger.v { "onFavoritesChange() called" }
val favorites = network.getFavoriteRecipes()
storage.updateFavoriteRecipes(favorites)
pagingSourceFactory.invalidate()
}
}

2
app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesListViewModel.kt
View File

@@ -71,7 +71,7 @@ class RecipesListViewModel @Inject constructor(
fun onDeleteConfirm(recipeSummaryEntity: RecipeSummaryEntity) {
logger.v { "onDeleteConfirm() called with: recipeSummaryEntity = $recipeSummaryEntity" }
viewModelScope.launch {
val result = recipeRepo.deleteRecipe(recipeSummaryEntity.slug)
val result = recipeRepo.deleteRecipe(recipeSummaryEntity)
_deleteRecipeResult.emit(result)
}
}

12
app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoTest.kt
View File

@@ -70,19 +70,25 @@ class RecipeRepoTest : BaseUnitTest() {
@Test
fun `when remove favorite recipe expect correct sequence`() = runTest {
coEvery { dataSource.getFavoriteRecipes() } returns listOf("porridge")
subject.updateIsRecipeFavorite("cake", false)
coVerify {
dataSource.updateIsRecipeFavorite(eq("cake"), eq(false))
remoteMediator.onFavoritesChange()
dataSource.getFavoriteRecipes()
storage.updateFavoriteRecipes(eq(listOf("porridge")))
pagingSourceFactory.invalidate()
}
}
@Test
fun `when add favorite recipe expect correct sequence`() = runTest {
coEvery { dataSource.getFavoriteRecipes() } returns listOf("porridge", "cake")
subject.updateIsRecipeFavorite("porridge", true)
coVerify {
dataSource.updateIsRecipeFavorite(eq("porridge"), eq(true))
remoteMediator.onFavoritesChange()
dataSource.getFavoriteRecipes()
storage.updateFavoriteRecipes(eq(listOf("porridge", "cake")))
pagingSourceFactory.invalidate()
}
}
@@ -92,7 +98,7 @@ class RecipeRepoTest : BaseUnitTest() {
dataSource.updateIsRecipeFavorite(any(), any())
} throws Unauthorized(IOException())
subject.updateIsRecipeFavorite("porridge", true)
coVerify(inverse = true) { remoteMediator.onFavoritesChange() }
coVerify(inverse = true) { dataSource.getFavoriteRecipes() }
}
@Test

21
app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediatorTest.kt
View File

@@ -144,27 +144,6 @@ class RecipesRemoteMediatorTest : BaseUnitTest() {
coVerify { storage.refreshAll(TEST_RECIPE_SUMMARY_ENTITIES) }
}
@Test
fun `when favorites change expect network call`() = runTest {
coEvery { dataSource.getFavoriteRecipes() } returns listOf("cake", "porridge")
subject.onFavoritesChange()
coVerify { dataSource.getFavoriteRecipes() }
}
@Test
fun `when favorites change expect storage update`() = runTest {
coEvery { dataSource.getFavoriteRecipes() } returns listOf("cake", "porridge")
subject.onFavoritesChange()
coVerify { storage.updateFavoriteRecipes(eq(listOf("cake", "porridge"))) }
}
@Test
fun `when favorites change expect factory invalidation`() = runTest {
coEvery { dataSource.getFavoriteRecipes() } returns listOf("cake", "porridge")
subject.onFavoritesChange()
coVerify { pagingSourceFactory.invalidate() }
}
@Test
fun `when recipe update requested but favorite fails expect non-zero updates`() = runTest {
coEvery { dataSource.getFavoriteRecipes() } throws Unauthorized(IOException())