Merge pull request 'BUG FIX: Favourite state was not showing' (#2) from bugfix-round into main

Reviewed-on: #2

README.md

@@ -1,11 +1,13 @@
 # Mealient
 
-## DISCLAIMER
+## DISCLAIMERS
 
 This project is developed independently from the core Mealie project. It is NOT associated with the
 core Mealie developers. Any issues must be reported to the Mealient repository, NOT the Mealie
 repository.
 
+Also, this is a fork of the original Mealient project. All credit goes to Kirill Kamakin on GitHub for the original project.
+
 ## What is this?
 
 An unofficial Android client for [Mealie](https://github.com/mealie-recipes/mealie/). It enables you

app/build.gradle.kts

@@ -13,8 +13,8 @@ plugins {
 android {
     defaultConfig {
         applicationId = "com.atridad.mealient"
-        versionCode = 37
+        versionCode = 38
-        versionName = "0.5.0"
+        versionName = "0.5.1"
         testInstrumentationRunner = "com.atridad.mealient.MealientTestRunner"
         testInstrumentationRunnerArguments += mapOf("clearPackageData" to "true")
         resourceConfigurations += listOf("en", "es", "ru", "fr", "nl", "pt", "de")

app/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 37,
+      "versionCode": 38,
-      "versionName": "0.5.0",
+      "versionName": "0.5.1",
       "outputFile": "app-release.apk"
     }
   ],

app/src/main/java/com/atridad/mealient/data/network/MealieDataSourceWrapper.kt

@@ -11,7 +11,9 @@ import com.atridad.mealient.datasource.models.ParseRecipeURLRequest
 import com.atridad.mealient.model_mapper.ModelMapper
 import javax.inject.Inject
 
-class MealieDataSourceWrapper @Inject constructor(
+class MealieDataSourceWrapper
+@Inject
+constructor(
         private val dataSource: MealieDataSource,
         private val modelMapper: ModelMapper,
 ) : AddRecipeDataSource, RecipeDataSource, ParseRecipeDataSource {
@@ -26,7 +28,8 @@ class MealieDataSourceWrapper @Inject constructor(
             start: Int,
             limit: Int,
     ): List<GetRecipeSummaryResponse> {
-        // Imagine start is 30 and limit is 15. It means that we already have page 1 and 2, now we need page 3
+        // Imagine start is 30 and limit is 15. It means that we already have page 1 and 2, now we
+        // need page 3
         val page = start / limit + 1
         return dataSource.requestRecipes(page, limit)
     }
@@ -40,11 +43,31 @@ class MealieDataSourceWrapper @Inject constructor(
     }
 
     override suspend fun getFavoriteRecipes(): List<String> {
-        return dataSource.requestUserInfo().favoriteRecipes
+        val userInfo = dataSource.requestUserInfo()
+
+        // Use the correct favorites endpoint that actually works
+        return try {
+            val favoritesResponse = dataSource.getUserFavoritesAlternative(userInfo.id)
+            val favoriteRecipeIds =
+                    favoritesResponse.ratings.filter { it.isFavorite }.map { it.recipeId }
+
+            // Get all recipes to create UUID-to-slug mapping
+            val allRecipes = dataSource.requestRecipes(1, -1) // Get all recipes
+            val uuidToSlugMap = allRecipes.associate { it.remoteId to it.slug }
+
+            // Map favorite UUIDs to slugs
+            val favoriteSlugs = favoriteRecipeIds.mapNotNull { uuid -> uuidToSlugMap[uuid] }
+
+            favoriteSlugs
+        } catch (e: Exception) {
+            emptyList()
+        }
     }
 
     override suspend fun updateIsRecipeFavorite(recipeSlug: String, isFavorite: Boolean) {
-        val userId = dataSource.requestUserInfo().id
+        val userInfo = dataSource.requestUserInfo()
+        val userId = userInfo.id
+
         if (isFavorite) {
             dataSource.addFavoriteRecipe(userId, recipeSlug)
         } else {

app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipesRemoteMediator.kt

@@ -11,15 +11,17 @@ import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity
 import com.atridad.mealient.datasource.runCatchingExceptCancel
 import com.atridad.mealient.logging.Logger
 import com.atridad.mealient.model_mapper.ModelMapper
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.withContext
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @OptIn(ExperimentalPagingApi::class)
 @Singleton
-class RecipesRemoteMediator @Inject constructor(
+class RecipesRemoteMediator
+@Inject
+constructor(
         private val storage: RecipeStorage,
         private val network: RecipeDataSource,
         private val pagingSourceFactory: RecipePagingSourceFactory,
@@ -28,13 +30,15 @@ class RecipesRemoteMediator @Inject constructor(
         private val dispatchers: AppDispatchers,
 ) : RemoteMediator<Int, RecipeSummaryEntity>() {
 
-    @VisibleForTesting
+    @VisibleForTesting var lastRequestEnd: Int = 0
-    var lastRequestEnd: Int = 0
 
     override suspend fun load(
-        loadType: LoadType, state: PagingState<Int, RecipeSummaryEntity>
+            loadType: LoadType,
+            state: PagingState<Int, RecipeSummaryEntity>
     ): MediatorResult {
-        logger.v { "load() called with: lastRequestEnd = $lastRequestEnd, loadType = $loadType, state = $state" }
+        logger.v {
+            "load() called with: lastRequestEnd = $lastRequestEnd, loadType = $loadType, state = $state"
+        }
 
         if (loadType == PREPEND) {
             logger.i { "load: early exit, PREPEND isn't supported" }
@@ -44,9 +48,8 @@ class RecipesRemoteMediator @Inject constructor(
         val start = if (loadType == REFRESH) 0 else lastRequestEnd
         val limit = if (loadType == REFRESH) state.config.initialLoadSize else state.config.pageSize
 
-        val count: Int = runCatchingExceptCancel {
+        val count: Int =
-            updateRecipes(start, limit, loadType)
+                runCatchingExceptCancel { updateRecipes(start, limit, loadType) }.getOrElse {
-        }.getOrElse {
                     logger.e(it) { "load: can't load recipes" }
                     return MediatorResult.Error(it)
                 }
@@ -54,7 +57,8 @@ class RecipesRemoteMediator @Inject constructor(
         // After something is inserted into DB the paging sources have to be invalidated
         // But for some reason Room/Paging library don't do it automatically
         // Here we invalidate them manually.
-        // Read that trick here https://github.com/android/architecture-components-samples/issues/889#issuecomment-880847858
+        // Read that trick here
+        // https://github.com/android/architecture-components-samples/issues/889#issuecomment-880847858
         pagingSourceFactory.invalidate()
 
         logger.d { "load: expectedCount = $limit, received $count" }
@@ -67,21 +71,26 @@ class RecipesRemoteMediator @Inject constructor(
             limit: Int,
             loadType: LoadType = REFRESH,
     ): Int = coroutineScope {
-        logger.v { "updateRecipes() called with: start = $start, limit = $limit, loadType = $loadType" }
+        logger.v {
+            "updateRecipes() called with: start = $start, limit = $limit, loadType = $loadType"
+        }
         val deferredRecipes = async { network.requestRecipes(start, limit) }
-        val favorites = runCatchingExceptCancel {
+        val favorites =
-            network.getFavoriteRecipes()
+                runCatchingExceptCancel { network.getFavoriteRecipes() }
-        }.getOrDefault(emptyList()).toHashSet()
+                        .getOrDefault(emptyList())
+                        .toHashSet()
+
         val recipes = deferredRecipes.await()
-        val entities = withContext(dispatchers.default) {
+
+        val entities =
+                withContext(dispatchers.default) {
                     recipes.map { recipe ->
                         val isFavorite = favorites.contains(recipe.slug)
                         modelMapper.toRecipeSummaryEntity(recipe, isFavorite)
                     }
                 }
-        if (loadType == REFRESH) storage.refreshAll(entities)
+
-        else storage.saveRecipes(entities)
+        if (loadType == REFRESH) storage.refreshAll(entities) else storage.saveRecipes(entities)
         recipes.size
     }
-
 }

app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipesListViewModel.kt

@@ -5,13 +5,14 @@ import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import androidx.paging.map
-import dagger.hilt.android.lifecycle.HiltViewModel
 import com.atridad.mealient.architecture.valueUpdatesOnly
 import com.atridad.mealient.data.auth.AuthRepo
 import com.atridad.mealient.data.recipes.RecipeRepo
 import com.atridad.mealient.data.recipes.impl.RecipeImageUrlProvider
 import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity
 import com.atridad.mealient.logging.Logger
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -23,10 +24,11 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
 @HiltViewModel
-internal class RecipesListViewModel @Inject constructor(
+internal class RecipesListViewModel
+@Inject
+constructor(
         private val recipeRepo: RecipeRepo,
         private val logger: Logger,
         private val recipeImageUrlProvider: RecipeImageUrlProvider,
@@ -51,16 +53,19 @@ internal class RecipesListViewModel @Inject constructor(
                 }
             }
 
-    private val _screenState = MutableStateFlow(
+    private val _screenState =
-        RecipeListState(pagingDataRecipeState = pagingDataRecipeState)
+            MutableStateFlow(RecipeListState(pagingDataRecipeState = pagingDataRecipeState))
-    )
+    val screenState: StateFlow<RecipeListState>
-    val screenState: StateFlow<RecipeListState> get() = _screenState.asStateFlow()
+        get() = _screenState.asStateFlow()
 
     init {
-        authRepo.isAuthorizedFlow.valueUpdatesOnly().onEach { hasAuthorized ->
+        authRepo.isAuthorizedFlow
+                .valueUpdatesOnly()
+                .onEach { hasAuthorized ->
                     logger.v { "Authorization state changed to $hasAuthorized" }
                     if (hasAuthorized) recipeRepo.refreshRecipes()
-        }.launchIn(viewModelScope)
+                }
+                .launchIn(viewModelScope)
     }
 
     private fun onRecipeClicked(entity: RecipeSummaryEntity) {
@@ -75,22 +80,22 @@ internal class RecipesListViewModel @Inject constructor(
     private fun onFavoriteIconClick(recipeSummaryEntity: RecipeSummaryEntity) {
         logger.v { "onFavoriteIconClick() called with: recipeSummaryEntity = $recipeSummaryEntity" }
         viewModelScope.launch {
-            val result = recipeRepo.updateIsRecipeFavorite(
+            val result =
+                    recipeRepo.updateIsRecipeFavorite(
                             recipeSlug = recipeSummaryEntity.slug,
                             isFavorite = recipeSummaryEntity.isFavorite.not(),
                     )
-            val snackbar = result.fold(
+            val snackbar =
-                onSuccess = { isFavorite ->
+                    result.fold(
+                            onSuccess = { _ ->
                                 val name = recipeSummaryEntity.name
-                    if (isFavorite) {
+                                if (recipeSummaryEntity.isFavorite) {
-                        RecipeListSnackbar.FavoriteAdded(name)
-                    } else {
                                     RecipeListSnackbar.FavoriteRemoved(name)
+                                } else {
+                                    RecipeListSnackbar.FavoriteAdded(name)
                                 }
                             },
-                onFailure = {
+                            onFailure = { RecipeListSnackbar.FavoriteUpdateFailed }
-                    RecipeListSnackbar.FavoriteUpdateFailed
-                }
                     )
             _screenState.update { it.copy(snackbarState = snackbar) }
         }
@@ -101,7 +106,8 @@ internal class RecipesListViewModel @Inject constructor(
         viewModelScope.launch {
             val result = recipeRepo.deleteRecipe(recipeSummaryEntity)
             logger.d { "onDeleteConfirm: delete result is $result" }
-            val snackbar = result.fold(
+            val snackbar =
+                    result.fold(
                             onSuccess = { null },
                             onFailure = { RecipeListSnackbar.DeleteFailed },
                     )

app/src/main/java/com/atridad/mealient/ui/recipes/list/SearchTextField.kt

@@ -54,7 +54,11 @@ internal fun SearchTextField(
             focusedIndicatorColor = Color.Transparent,
             unfocusedIndicatorColor = Color.Transparent,
             disabledIndicatorColor = Color.Transparent,
-            errorIndicatorColor = Color.Transparent
+            errorIndicatorColor = Color.Transparent,
+            focusedContainerColor = Color.Transparent,
+            unfocusedContainerColor = Color.Transparent,
+            disabledContainerColor = Color.Transparent,
+            errorContainerColor = Color.Transparent
         )
     )
 }

database/src/main/kotlin/com/atridad/mealient/database/recipe/RecipeDao.kt

@@ -9,22 +9,21 @@ internal interface RecipeDao {
     @Query("SELECT * FROM recipe_summaries ORDER BY recipe_summaries_date_added DESC")
     fun queryRecipesByPages(): PagingSource<Int, RecipeSummaryEntity>
 
-    @Query("SELECT * FROM recipe_summaries WHERE recipe_summaries_name LIKE '%' || :query || '%' ORDER BY recipe_summaries_date_added DESC")
+    @Query(
+            "SELECT * FROM recipe_summaries WHERE recipe_summaries_name LIKE '%' || :query || '%' ORDER BY recipe_summaries_date_added DESC"
+    )
     fun queryRecipesByPages(query: String): PagingSource<Int, RecipeSummaryEntity>
 
     @Transaction
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertRecipeSummaries(recipeSummaryEntity: Iterable<RecipeSummaryEntity>)
 
-    @Transaction
+    @Transaction @Query("DELETE FROM recipe_summaries") suspend fun removeAllRecipes()
-    @Query("DELETE FROM recipe_summaries")
-    suspend fun removeAllRecipes()
 
     @Query("SELECT * FROM recipe_summaries ORDER BY recipe_summaries_date_added DESC")
     suspend fun queryAllRecipes(): List<RecipeSummaryEntity>
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertRecipe(recipe: RecipeEntity)
-    suspend fun insertRecipe(recipe: RecipeEntity)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertRecipes(recipe: List<RecipeEntity>)
@@ -36,10 +35,14 @@ internal interface RecipeDao {
     suspend fun insertRecipeIngredients(ingredients: List<RecipeIngredientEntity>)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertIngredientToInstructionEntities(entities: List<RecipeIngredientToInstructionEntity>)
+    suspend fun insertIngredientToInstructionEntities(
+            entities: List<RecipeIngredientToInstructionEntity>
+    )
 
     @Transaction
-    @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) // The lint is wrong, the columns are actually used
+    @SuppressWarnings(
+            RoomWarnings.CURSOR_MISMATCH
+    ) // The lint is wrong, the columns are actually used
     @Query(
             "SELECT * FROM recipe " +
                     "JOIN recipe_summaries USING(recipe_id) " +
@@ -48,7 +51,9 @@ internal interface RecipeDao {
                     "LEFT JOIN recipe_ingredient_to_instruction USING(recipe_id) " +
                     "WHERE recipe.recipe_id = :recipeId"
     )
-    suspend fun queryFullRecipeInfo(recipeId: String): RecipeWithSummaryAndIngredientsAndInstructions?
+    suspend fun queryFullRecipeInfo(
+            recipeId: String
+    ): RecipeWithSummaryAndIngredientsAndInstructions?
 
     @Query("DELETE FROM recipe_ingredient WHERE recipe_id IN (:recipeIds)")
     suspend fun deleteRecipeIngredients(vararg recipeIds: String)
@@ -59,12 +64,18 @@ internal interface RecipeDao {
     @Query("DELETE FROM recipe_ingredient_to_instruction WHERE recipe_id IN (:recipeIds)")
     suspend fun deleteRecipeIngredientToInstructions(vararg recipeIds: String)
 
-    @Query("UPDATE recipe_summaries SET recipe_summaries_is_favorite = 1 WHERE recipe_summaries_slug IN (:favorites)")
+    @Query(
+            "UPDATE recipe_summaries SET recipe_summaries_is_favorite = 1 WHERE recipe_summaries_slug IN (:favorites)"
+    )
     suspend fun setFavorite(favorites: List<String>)
 
-    @Query("UPDATE recipe_summaries SET recipe_summaries_is_favorite = 0 WHERE recipe_summaries_slug NOT IN (:favorites)")
+    @Query("UPDATE recipe_summaries SET recipe_summaries_is_favorite = 0")
+    suspend fun setAllNonFavorite()
+
+    @Query(
+            "UPDATE recipe_summaries SET recipe_summaries_is_favorite = 0 WHERE recipe_summaries_slug NOT IN (:favorites)"
+    )
     suspend fun setNonFavorite(favorites: List<String>)
 
-    @Delete
+    @Delete suspend fun deleteRecipe(entity: RecipeSummaryEntity)
-    suspend fun deleteRecipe(entity: RecipeSummaryEntity)
 }

database/src/main/kotlin/com/atridad/mealient/database/recipe/RecipeStorageImpl.kt

@@ -12,7 +12,9 @@ import com.atridad.mealient.database.recipe.entity.RecipeWithSummaryAndIngredien
 import com.atridad.mealient.logging.Logger
 import javax.inject.Inject
 
-internal class RecipeStorageImpl @Inject constructor(
+internal class RecipeStorageImpl
+@Inject
+constructor(
         private val db: AppDb,
         private val logger: Logger,
         private val recipeDao: RecipeDao,
@@ -48,7 +50,9 @@ internal class RecipeStorageImpl @Inject constructor(
             instructions: List<RecipeInstructionEntity>,
             ingredientToInstruction: List<RecipeIngredientToInstructionEntity>,
     ) {
-        logger.v { "saveRecipeInfo() called with: recipe = $recipe, ingredients = $ingredients, instructions = $instructions, ingredientToInstructions = $ingredientToInstruction" }
+        logger.v {
+            "saveRecipeInfo() called with: recipe = $recipe, ingredients = $ingredients, instructions = $instructions, ingredientToInstructions = $ingredientToInstruction"
+        }
         db.withTransaction {
             recipeDao.insertRecipe(recipe)
 
@@ -63,7 +67,9 @@ internal class RecipeStorageImpl @Inject constructor(
         }
     }
 
-    override suspend fun queryRecipeInfo(recipeId: String): RecipeWithSummaryAndIngredientsAndInstructions? {
+    override suspend fun queryRecipeInfo(
+            recipeId: String
+    ): RecipeWithSummaryAndIngredientsAndInstructions? {
         logger.v { "queryRecipeInfo() called with: recipeId = $recipeId" }
         val fullRecipeInfo = recipeDao.queryFullRecipeInfo(recipeId)
         logger.v { "queryRecipeInfo() returned: $fullRecipeInfo" }
@@ -73,8 +79,12 @@ internal class RecipeStorageImpl @Inject constructor(
     override suspend fun updateFavoriteRecipes(favorites: List<String>) {
         logger.v { "updateFavoriteRecipes() called with: favorites = $favorites" }
         db.withTransaction {
+            if (favorites.isNotEmpty()) {
                 recipeDao.setFavorite(favorites)
                 recipeDao.setNonFavorite(favorites)
+            } else {
+                recipeDao.setAllNonFavorite()
+            }
         }
     }
 

datasource/src/main/kotlin/com/atridad/mealient/datasource/MealieDataSource.kt

@@ -12,6 +12,7 @@ import com.atridad.mealient.datasource.models.GetShoppingListItemResponse
 import com.atridad.mealient.datasource.models.GetShoppingListResponse
 import com.atridad.mealient.datasource.models.GetShoppingListsResponse
 import com.atridad.mealient.datasource.models.GetUnitsResponse
+import com.atridad.mealient.datasource.models.GetUserFavoritesResponse
 import com.atridad.mealient.datasource.models.GetUserInfoResponse
 import com.atridad.mealient.datasource.models.ParseRecipeURLRequest
 import com.atridad.mealient.datasource.models.UpdateRecipeRequest
@@ -28,9 +29,7 @@ interface MealieDataSource {
             recipe: UpdateRecipeRequest,
     ): GetRecipeResponse
 
-    /**
+    /** Tries to acquire authentication token using the provided credentials */
-     * Tries to acquire authentication token using the provided credentials
-     */
     suspend fun authenticate(
             username: String,
             password: String,
@@ -82,4 +81,6 @@ interface MealieDataSource {
     suspend fun deleteShoppingList(id: String)
 
     suspend fun updateShoppingListName(id: String, name: String)
+
+    suspend fun getUserFavoritesAlternative(userId: String): GetUserFavoritesResponse
 }

datasource/src/main/kotlin/com/atridad/mealient/datasource/MealieService.kt

@@ -12,6 +12,7 @@ import com.atridad.mealient.datasource.models.GetShoppingListResponse
 import com.atridad.mealient.datasource.models.GetShoppingListsResponse
 import com.atridad.mealient.datasource.models.GetTokenResponse
 import com.atridad.mealient.datasource.models.GetUnitsResponse
+import com.atridad.mealient.datasource.models.GetUserFavoritesResponse
 import com.atridad.mealient.datasource.models.GetUserInfoResponse
 import com.atridad.mealient.datasource.models.ParseRecipeURLRequest
 import com.atridad.mealient.datasource.models.UpdateRecipeRequest
@@ -70,4 +71,6 @@ internal interface MealieService {
     suspend fun updateShoppingList(id: String, request: JsonElement)
 
     suspend fun getShoppingListJson(id: String): JsonElement
+
+    suspend fun getUserFavoritesAlternative(userId: String): GetUserFavoritesResponse
 }

datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/MealieDataSourceImpl.kt

@@ -17,6 +17,7 @@ import com.atridad.mealient.datasource.models.GetShoppingListItemResponse
 import com.atridad.mealient.datasource.models.GetShoppingListResponse
 import com.atridad.mealient.datasource.models.GetShoppingListsResponse
 import com.atridad.mealient.datasource.models.GetUnitsResponse
+import com.atridad.mealient.datasource.models.GetUserFavoritesResponse
 import com.atridad.mealient.datasource.models.GetUserInfoResponse
 import com.atridad.mealient.datasource.models.ParseRecipeURLRequest
 import com.atridad.mealient.datasource.models.UpdateRecipeRequest
@@ -24,31 +25,37 @@ import com.atridad.mealient.datasource.models.VersionResponse
 import io.ktor.client.call.NoTransformationFoundException
 import io.ktor.client.call.body
 import io.ktor.client.plugins.ResponseException
+import java.net.SocketException
+import java.net.SocketTimeoutException
+import javax.inject.Inject
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.jsonObject
-import java.net.SocketException
-import java.net.SocketTimeoutException
-import javax.inject.Inject
 
-internal class MealieDataSourceImpl @Inject constructor(
+internal class MealieDataSourceImpl
+@Inject
+constructor(
         private val networkRequestWrapper: NetworkRequestWrapper,
         private val service: MealieService,
 ) : MealieDataSource {
 
     override suspend fun createRecipe(
             recipe: CreateRecipeRequest,
-    ): String = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ): String =
+            networkRequestWrapper
+                    .makeCallAndHandleUnauthorized(
                             block = { service.createRecipe(recipe) },
                             logMethod = { "createRecipe" },
                             logParameters = { "recipe = $recipe" }
-    ).trim('"')
+                    )
+                    .trim('"')
 
     override suspend fun updateRecipe(
             slug: String,
             recipe: UpdateRecipeRequest,
-    ): GetRecipeResponse = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ): GetRecipeResponse =
+            networkRequestWrapper.makeCallAndHandleUnauthorized(
                     block = { service.updateRecipe(recipe, slug) },
                     logMethod = { "updateRecipe" },
                     logParameters = { "slug = $slug, recipe = $recipe" }
@@ -57,13 +64,21 @@ internal class MealieDataSourceImpl @Inject constructor(
     override suspend fun authenticate(
             username: String,
             password: String,
-    ): String = networkRequestWrapper.makeCall(
+    ): String =
+            networkRequestWrapper
+                    .makeCall(
                             block = { service.getToken(username, password) },
                             logMethod = { "authenticate" },
                             logParameters = { "username = $username, password = $password" }
-    ).map { it.accessToken }.getOrElse {
+                    )
-        val errorDetail = (it as? ResponseException)?.response?.body<ErrorDetail>() ?: throw it
+                    .map { it.accessToken }
-        throw if (errorDetail.detail == "Unauthorized") NetworkError.Unauthorized(it) else it
+                    .getOrElse {
+                        val errorDetail =
+                                (it as? ResponseException)?.response?.body<ErrorDetail>()
+                                        ?: throw it
+                        throw if (errorDetail.detail == "Unauthorized")
+                                NetworkError.Unauthorized(it)
+                        else it
                     }
 
     override suspend fun getVersionInfo(baseURL: String): VersionResponse =
@@ -71,10 +86,13 @@ internal class MealieDataSourceImpl @Inject constructor(
                             block = { service.getVersion(baseURL) },
                             logMethod = { "getVersionInfo" },
                             logParameters = { "baseURL = $baseURL" }
-        ).getOrElse {
+                    )
+                    .getOrElse {
                         throw when (it) {
-                is ResponseException, is NoTransformationFoundException -> NetworkError.NotMealie(it)
+                            is ResponseException, is NoTransformationFoundException ->
-                is SocketTimeoutException, is SocketException -> NetworkError.NoServerConnection(it)
+                                    NetworkError.NotMealie(it)
+                            is SocketTimeoutException, is SocketException ->
+                                    NetworkError.NoServerConnection(it)
                             else -> NetworkError.MalformedUrl(it)
                         }
                     }
@@ -82,15 +100,21 @@ internal class MealieDataSourceImpl @Inject constructor(
     override suspend fun requestRecipes(
             page: Int,
             perPage: Int,
-    ): List<GetRecipeSummaryResponse> = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ): List<GetRecipeSummaryResponse> {
+        val response =
+                networkRequestWrapper.makeCallAndHandleUnauthorized(
                         block = { service.getRecipeSummary(page, perPage) },
                         logMethod = { "requestRecipes" },
                         logParameters = { "page = $page, perPage = $perPage" }
-    ).items
+                )
+
+        return response.items
+    }
 
     override suspend fun requestRecipeInfo(
             slug: String,
-    ): GetRecipeResponse = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ): GetRecipeResponse =
+            networkRequestWrapper.makeCallAndHandleUnauthorized(
                     block = { service.getRecipe(slug) },
                     logMethod = { "requestRecipeInfo" },
                     logParameters = { "slug = $slug" }
@@ -98,7 +122,8 @@ internal class MealieDataSourceImpl @Inject constructor(
 
     override suspend fun parseRecipeFromURL(
             request: ParseRecipeURLRequest,
-    ): String = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ): String =
+            networkRequestWrapper.makeCallAndHandleUnauthorized(
                     block = { service.createRecipeFromURL(request) },
                     logMethod = { "parseRecipeFromURL" },
                     logParameters = { "request = $request" }
@@ -106,40 +131,51 @@ internal class MealieDataSourceImpl @Inject constructor(
 
     override suspend fun createApiToken(
             request: CreateApiTokenRequest,
-    ): CreateApiTokenResponse = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ): CreateApiTokenResponse =
+            networkRequestWrapper.makeCallAndHandleUnauthorized(
                     block = { service.createApiToken(request) },
                     logMethod = { "createApiToken" },
                     logParameters = { "request = $request" }
             )
 
     override suspend fun requestUserInfo(): GetUserInfoResponse {
-        return networkRequestWrapper.makeCallAndHandleUnauthorized(
+        val response =
+                networkRequestWrapper.makeCallAndHandleUnauthorized(
                         block = { service.getUserSelfInfo() },
                         logMethod = { "requestUserInfo" },
                 )
+
+        return response
     }
 
     override suspend fun removeFavoriteRecipe(
             userId: String,
             recipeSlug: String,
-    ): Unit = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ): Unit {
+
+        networkRequestWrapper.makeCallAndHandleUnauthorized(
                 block = { service.removeFavoriteRecipe(userId, recipeSlug) },
                 logMethod = { "removeFavoriteRecipe" },
                 logParameters = { "userId = $userId, recipeSlug = $recipeSlug" }
         )
+    }
 
     override suspend fun addFavoriteRecipe(
             userId: String,
             recipeSlug: String,
-    ): Unit = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ): Unit {
+
+        networkRequestWrapper.makeCallAndHandleUnauthorized(
                 block = { service.addFavoriteRecipe(userId, recipeSlug) },
                 logMethod = { "addFavoriteRecipe" },
                 logParameters = { "userId = $userId, recipeSlug = $recipeSlug" }
         )
+    }
 
     override suspend fun deleteRecipe(
             slug: String,
-    ): Unit = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ): Unit =
+            networkRequestWrapper.makeCallAndHandleUnauthorized(
                     block = { service.deleteRecipe(slug) },
                     logMethod = { "deleteRecipe" },
                     logParameters = { "slug = $slug" }
@@ -148,7 +184,8 @@ internal class MealieDataSourceImpl @Inject constructor(
     override suspend fun getShoppingLists(
             page: Int,
             perPage: Int,
-    ): GetShoppingListsResponse = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ): GetShoppingListsResponse =
+            networkRequestWrapper.makeCallAndHandleUnauthorized(
                     block = { service.getShoppingLists(page, perPage) },
                     logMethod = { "getShoppingLists" },
                     logParameters = { "page = $page, perPage = $perPage" }
@@ -156,7 +193,8 @@ internal class MealieDataSourceImpl @Inject constructor(
 
     override suspend fun getShoppingList(
             id: String,
-    ): GetShoppingListResponse = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ): GetShoppingListResponse =
+            networkRequestWrapper.makeCallAndHandleUnauthorized(
                     block = { service.getShoppingList(id) },
                     logMethod = { "getShoppingList" },
                     logParameters = { "id = $id" }
@@ -164,7 +202,8 @@ internal class MealieDataSourceImpl @Inject constructor(
 
     private suspend fun getShoppingListItem(
             id: String,
-    ): JsonElement = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ): JsonElement =
+            networkRequestWrapper.makeCallAndHandleUnauthorized(
                     block = { service.getShoppingListItem(id) },
                     logMethod = { "getShoppingListItem" },
                     logParameters = { "id = $id" }
@@ -173,7 +212,8 @@ internal class MealieDataSourceImpl @Inject constructor(
     private suspend fun updateShoppingListItem(
             id: String,
             request: JsonElement,
-    ) = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ) =
+            networkRequestWrapper.makeCallAndHandleUnauthorized(
                     block = { service.updateShoppingListItem(id, request) },
                     logMethod = { "updateShoppingListItem" },
                     logParameters = { "id = $id, request = $request" }
@@ -181,7 +221,8 @@ internal class MealieDataSourceImpl @Inject constructor(
 
     override suspend fun deleteShoppingListItem(
             id: String,
-    ) = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ) =
+            networkRequestWrapper.makeCallAndHandleUnauthorized(
                     block = { service.deleteShoppingListItem(id) },
                     logMethod = { "deleteShoppingListItem" },
                     logParameters = { "id = $id" }
@@ -192,7 +233,8 @@ internal class MealieDataSourceImpl @Inject constructor(
     ) {
         // Has to be done in two steps because we can't specify only the changed fields
         val remoteItem = getShoppingListItem(item.id)
-        val updatedItem = remoteItem.jsonObject.toMutableMap().apply {
+        val updatedItem =
+                remoteItem.jsonObject.toMutableMap().apply {
                     put("checked", JsonPrimitive(item.checked))
                     put("isFood", JsonPrimitive(item.isFood))
                     put("note", JsonPrimitive(item.note))
@@ -221,7 +263,8 @@ internal class MealieDataSourceImpl @Inject constructor(
 
     override suspend fun addShoppingListItem(
             request: CreateShoppingListItemRequest,
-    ) = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ) =
+            networkRequestWrapper.makeCallAndHandleUnauthorized(
                     block = { service.createShoppingListItem(request) },
                     logMethod = { "addShoppingListItem" },
                     logParameters = { "request = $request" }
@@ -229,7 +272,8 @@ internal class MealieDataSourceImpl @Inject constructor(
 
     override suspend fun addShoppingList(
             request: CreateShoppingListRequest,
-    ) = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ) =
+            networkRequestWrapper.makeCallAndHandleUnauthorized(
                     block = { service.createShoppingList(request) },
                     logMethod = { "createShoppingList" },
                     logParameters = { "request = $request" }
@@ -238,7 +282,8 @@ internal class MealieDataSourceImpl @Inject constructor(
     private suspend fun updateShoppingList(
             id: String,
             request: JsonElement,
-    ) = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ) =
+            networkRequestWrapper.makeCallAndHandleUnauthorized(
                     block = { service.updateShoppingList(id, request) },
                     logMethod = { "updateShoppingList" },
                     logParameters = { "id = $id, request = $request" }
@@ -246,7 +291,8 @@ internal class MealieDataSourceImpl @Inject constructor(
 
     private suspend fun getShoppingListJson(
             id: String,
-    ) = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ) =
+            networkRequestWrapper.makeCallAndHandleUnauthorized(
                     block = { service.getShoppingListJson(id) },
                     logMethod = { "getShoppingListJson" },
                     logParameters = { "id = $id" }
@@ -254,21 +300,34 @@ internal class MealieDataSourceImpl @Inject constructor(
 
     override suspend fun deleteShoppingList(
             id: String,
-    ) = networkRequestWrapper.makeCallAndHandleUnauthorized(
+    ) =
+            networkRequestWrapper.makeCallAndHandleUnauthorized(
                     block = { service.deleteShoppingList(id) },
                     logMethod = { "deleteShoppingList" },
                     logParameters = { "id = $id" }
             )
 
-    override suspend fun updateShoppingListName(
+    override suspend fun updateShoppingListName(id: String, name: String) {
-        id: String,
-        name: String
-    ) {
         // Has to be done in two steps because we can't specify only the changed fields
         val remoteItem = getShoppingListJson(id)
-        val updatedItem = remoteItem.jsonObject.toMutableMap().apply {
+        val updatedItem =
-            put("name", JsonPrimitive(name))
+                remoteItem
-        }.let(::JsonObject)
+                        .jsonObject
+                        .toMutableMap()
+                        .apply { put("name", JsonPrimitive(name)) }
+                        .let(::JsonObject)
         updateShoppingList(id, updatedItem)
     }
+
+    override suspend fun getUserFavoritesAlternative(userId: String): GetUserFavoritesResponse {
+
+        val response =
+                networkRequestWrapper.makeCallAndHandleUnauthorized(
+                        block = { service.getUserFavoritesAlternative(userId) },
+                        logMethod = { "getUserFavoritesAlternative" },
+                        logParameters = { "userId = $userId" }
+                )
+
+        return response
+    }
 }

datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/MealieServiceKtor.kt

@@ -14,6 +14,7 @@ import com.atridad.mealient.datasource.models.GetShoppingListResponse
 import com.atridad.mealient.datasource.models.GetShoppingListsResponse
 import com.atridad.mealient.datasource.models.GetTokenResponse
 import com.atridad.mealient.datasource.models.GetUnitsResponse
+import com.atridad.mealient.datasource.models.GetUserFavoritesResponse
 import com.atridad.mealient.datasource.models.GetUserInfoResponse
 import com.atridad.mealient.datasource.models.ParseRecipeURLRequest
 import com.atridad.mealient.datasource.models.UpdateRecipeRequest
@@ -34,11 +35,13 @@ import io.ktor.http.contentType
 import io.ktor.http.parameters
 import io.ktor.http.path
 import io.ktor.http.takeFrom
-import kotlinx.serialization.json.JsonElement
 import javax.inject.Inject
 import javax.inject.Provider
+import kotlinx.serialization.json.JsonElement
 
-internal class MealieServiceKtor @Inject constructor(
+internal class MealieServiceKtor
+@Inject
+constructor(
         private val httpClient: HttpClient,
         private val serverUrlProviderProvider: Provider<ServerUrlProvider>,
 ) : MealieService {
@@ -52,111 +55,109 @@ internal class MealieServiceKtor @Inject constructor(
             append("password", password)
         }
 
-        return httpClient.post {
+        return httpClient
+                .post {
                     endpoint("/api/auth/token")
                     setBody(FormDataContent(formParameters))
-        }.body()
+                }
+                .body()
     }
 
     override suspend fun createRecipe(addRecipeRequest: CreateRecipeRequest): String {
-        return httpClient.post {
+        return httpClient
+                .post {
                     endpoint("/api/recipes")
                     contentType(ContentType.Application.Json)
                     setBody(addRecipeRequest)
-        }.body()
+                }
+                .body()
     }
 
     override suspend fun updateRecipe(
             addRecipeRequest: UpdateRecipeRequest,
             slug: String,
     ): GetRecipeResponse {
-        return httpClient.patch {
+        return httpClient
+                .patch {
                     endpoint("/api/recipes/$slug")
                     contentType(ContentType.Application.Json)
                     setBody(addRecipeRequest)
-        }.body()
+                }
+                .body()
     }
 
     override suspend fun getVersion(baseURL: String): VersionResponse {
-        return httpClient.get {
+        return httpClient.get { endpoint(baseURL, "/api/app/about") }.body()
-            endpoint(baseURL, "/api/app/about")
-        }.body()
     }
 
     override suspend fun getRecipeSummary(page: Int, perPage: Int): GetRecipesResponse {
-        return httpClient.get {
+        return httpClient
+                .get {
                     endpoint("/api/recipes") {
                         parameters.append("page", page.toString())
                         parameters.append("perPage", perPage.toString())
                     }
-        }.body()
+                }
+                .body()
     }
 
     override suspend fun getRecipe(slug: String): GetRecipeResponse {
-        return httpClient.get {
+        return httpClient.get { endpoint("/api/recipes/$slug") }.body()
-            endpoint("/api/recipes/$slug")
-        }.body()
     }
 
     override suspend fun createRecipeFromURL(request: ParseRecipeURLRequest): String {
-        return httpClient.post {
+        return httpClient
+                .post {
                     endpoint("/api/recipes/create-url")
                     contentType(ContentType.Application.Json)
                     setBody(request)
-        }.body()
+                }
+                .body()
     }
 
     override suspend fun createApiToken(request: CreateApiTokenRequest): CreateApiTokenResponse {
-        return httpClient.post {
+        return httpClient
+                .post {
                     endpoint("/api/users/api-tokens")
                     contentType(ContentType.Application.Json)
                     setBody(request)
-        }.body()
+                }
+                .body()
     }
 
     override suspend fun getUserSelfInfo(): GetUserInfoResponse {
-        return httpClient.get {
+        return httpClient.get { endpoint("/api/users/self") }.body()
-            endpoint("/api/users/self")
-        }.body()
     }
 
     override suspend fun removeFavoriteRecipe(userId: String, recipeSlug: String) {
-        httpClient.delete {
+        httpClient.delete { endpoint("/api/users/$userId/favorites/$recipeSlug") }
-            endpoint("/api/users/$userId/favorites/$recipeSlug")
-        }
     }
 
     override suspend fun addFavoriteRecipe(userId: String, recipeSlug: String) {
-        httpClient.post {
+        httpClient.post { endpoint("/api/users/$userId/favorites/$recipeSlug") }
-            endpoint("/api/users/$userId/favorites/$recipeSlug")
-        }
     }
 
     override suspend fun deleteRecipe(slug: String) {
-        httpClient.delete {
+        httpClient.delete { endpoint("/api/recipes/$slug") }
-            endpoint("/api/recipes/$slug")
-        }
     }
 
     override suspend fun getShoppingLists(page: Int, perPage: Int): GetShoppingListsResponse {
-        return httpClient.get {
+        return httpClient
+                .get {
                     endpoint("/api/households/shopping/lists") {
                         parameters.append("page", page.toString())
                         parameters.append("perPage", perPage.toString())
                     }
-        }.body()
+                }
+                .body()
     }
 
     override suspend fun getShoppingList(id: String): GetShoppingListResponse {
-        return httpClient.get {
+        return httpClient.get { endpoint("/api/households/shopping/lists/$id") }.body()
-            endpoint("/api/households/shopping/lists/$id")
-        }.body()
     }
 
     override suspend fun getShoppingListItem(id: String): JsonElement {
-        return httpClient.get {
+        return httpClient.get { endpoint("/api/households/shopping/items/$id") }.body()
-            endpoint("/api/households/shopping/items/$id")
-        }.body()
     }
 
     override suspend fun updateShoppingListItem(id: String, request: JsonElement) {
@@ -168,25 +169,19 @@ internal class MealieServiceKtor @Inject constructor(
     }
 
     override suspend fun deleteShoppingListItem(id: String) {
-        httpClient.delete {
+        httpClient.delete { endpoint("/api/households/shopping/items/$id") }
-            endpoint("/api/households/shopping/items/$id")
-        }
     }
 
     override suspend fun getFoods(perPage: Int): GetFoodsResponse {
-        return httpClient.get {
+        return httpClient
-            endpoint("/api/foods") {
+                .get { endpoint("/api/foods") { parameters.append("perPage", perPage.toString()) } }
-                parameters.append("perPage", perPage.toString())
+                .body()
-            }
-        }.body()
     }
 
     override suspend fun getUnits(perPage: Int): GetUnitsResponse {
-        return httpClient.get {
+        return httpClient
-            endpoint("/api/units") {
+                .get { endpoint("/api/units") { parameters.append("perPage", perPage.toString()) } }
-                parameters.append("perPage", perPage.toString())
+                .body()
-            }
-        }.body()
     }
 
     override suspend fun createShoppingListItem(request: CreateShoppingListItemRequest) {
@@ -206,9 +201,7 @@ internal class MealieServiceKtor @Inject constructor(
     }
 
     override suspend fun deleteShoppingList(id: String) {
-        httpClient.delete {
+        httpClient.delete { endpoint("/api/households/shopping/lists/$id") }
-            endpoint("/api/households/shopping/lists/$id")
-        }
     }
 
     override suspend fun updateShoppingList(id: String, request: JsonElement) {
@@ -220,9 +213,11 @@ internal class MealieServiceKtor @Inject constructor(
     }
 
     override suspend fun getShoppingListJson(id: String): JsonElement {
-        return httpClient.get {
+        return httpClient.get { endpoint("/api/households/shopping/lists/$id") }.body()
-            endpoint("/api/households/shopping/lists/$id")
+    }
-        }.body()
+
+    override suspend fun getUserFavoritesAlternative(userId: String): GetUserFavoritesResponse {
+        return httpClient.get { endpoint("/api/users/$userId/favorites") }.body()
     }
 
     private suspend fun HttpRequestBuilder.endpoint(
@@ -230,11 +225,7 @@ internal class MealieServiceKtor @Inject constructor(
             block: URLBuilder.() -> Unit = {},
     ) {
         val baseUrl = checkNotNull(serverUrlProvider.getUrl()) { "Server URL is not set" }
-        endpoint(
+        endpoint(baseUrl = baseUrl, path = path, block = block)
-            baseUrl = baseUrl,
-            path = path,
-            block = block
-        )
     }
 
     private fun HttpRequestBuilder.endpoint(

datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetUserFavoritesResponse.kt

@@ -0,0 +1,18 @@
+package com.atridad.mealient.datasource.models
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GetUserFavoritesResponse(
+        @SerialName("ratings") val ratings: List<UserRatingResponse> = emptyList(),
+)
+
+@Serializable
+data class UserRatingResponse(
+        @SerialName("recipeId") val recipeId: String,
+        @SerialName("rating") val rating: Double? = null,
+        @SerialName("isFavorite") val isFavorite: Boolean,
+        @SerialName("userId") val userId: String,
+        @SerialName("id") val id: String,
+)

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 # https://maven.google.com/web/index.html?q=com.android.tools.build#com.android.tools.build:gradle
-androidGradlePlugin = "8.5.2"
+androidGradlePlugin = "8.9.0"
 # https://github.com/JetBrains/kotlin/releases
 kotlin = "2.0.10"
 # https://dagger.dev/hilt/gradle-setup

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME