Allow viewing recipes on V1

app/src/main/java/gq/kirmanak/mealient/data/network/MealieDataSourceWrapper.kt

@@ -9,8 +9,10 @@ import gq.kirmanak.mealient.data.recipes.network.RecipeDataSource
 import gq.kirmanak.mealient.datasource.MealieDataSource
 import gq.kirmanak.mealient.datasource.models.AddRecipeRequest
 import gq.kirmanak.mealient.datasource.models.GetRecipeResponse
-import gq.kirmanak.mealient.datasource.models.GetRecipeSummaryResponse
 import gq.kirmanak.mealient.datasource.models.NetworkError
+import gq.kirmanak.mealient.datasource.v1.MealieDataSourceV1
+import gq.kirmanak.mealient.datasource.v1.models.GetRecipeSummaryResponseV1
+import gq.kirmanak.mealient.extensions.runCatchingExceptCancel
 import gq.kirmanak.mealient.extensions.toVersionInfo
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -20,28 +22,52 @@ class MealieDataSourceWrapper @Inject constructor(
     private val baseURLStorage: BaseURLStorage,
     private val authRepo: AuthRepo,
     private val mealieDataSource: MealieDataSource,
+    private val mealieDataSourceV1: MealieDataSourceV1,
 ) : AddRecipeDataSource, RecipeDataSource, VersionDataSource {
 
     override suspend fun addRecipe(recipe: AddRecipeRequest): String =
-        withAuthHeader { token -> addRecipe(getUrl(), token, recipe) }
+        withAuthHeader { token -> mealieDataSource.addRecipe(getUrl(), token, recipe) }
 
     override suspend fun getVersionInfo(baseUrl: String): VersionInfo =
         mealieDataSource.getVersionInfo(baseUrl).toVersionInfo()
 
-    override suspend fun requestRecipes(start: Int, limit: Int): List<GetRecipeSummaryResponse> =
-        withAuthHeader { token -> requestRecipes(getUrl(), token, start, limit) }
+    override suspend fun requestRecipes(start: Int, limit: Int): List<GetRecipeSummaryResponseV1> =
+        withAuthHeader { token ->
+            runCatchingExceptCancel {
+                mealieDataSource.requestRecipes(getUrl(), token, start, limit).map {
+                    GetRecipeSummaryResponseV1(
+                        remoteId = it.remoteId.toString(),
+                        name = it.name,
+                        slug = it.slug,
+                        image = it.image,
+                        description = it.description,
+                        recipeCategories = it.recipeCategories,
+                        tags = it.tags,
+                        rating = it.rating,
+                        dateAdded = it.dateAdded,
+                        dateUpdated = it.dateUpdated,
+                    )
+                }
+            }.getOrElse {
+                if (it is NetworkError.NotMealie) {
+                    mealieDataSourceV1.requestRecipes(getUrl(), token, start, limit)
+                } else {
+                    throw it
+                }
+            }
+        }
 
     override suspend fun requestRecipeInfo(slug: String): GetRecipeResponse =
-        withAuthHeader { token -> requestRecipeInfo(getUrl(), token, slug) }
+        withAuthHeader { token -> mealieDataSource.requestRecipeInfo(getUrl(), token, slug) }
 
     private suspend fun getUrl() = baseURLStorage.requireBaseURL()
 
-    private suspend inline fun <T> withAuthHeader(block: MealieDataSource.(String?) -> T): T =
-        mealieDataSource.runCatching { block(authRepo.getAuthHeader()) }.getOrElse {
+    private suspend inline fun <T> withAuthHeader(block: (String?) -> T): T =
+        runCatching { block(authRepo.getAuthHeader()) }.getOrElse {
             if (it is NetworkError.Unauthorized) {
                 authRepo.invalidateAuthHeader()
                 // Trying again with new authentication header
-                mealieDataSource.block(authRepo.getAuthHeader())
+                block(authRepo.getAuthHeader())
             } else {
                 throw it
             }

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

@@ -4,14 +4,14 @@ import androidx.paging.PagingSource
 import gq.kirmanak.mealient.database.recipe.entity.FullRecipeInfo
 import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity
 import gq.kirmanak.mealient.datasource.models.GetRecipeResponse
-import gq.kirmanak.mealient.datasource.models.GetRecipeSummaryResponse
+import gq.kirmanak.mealient.datasource.v1.models.GetRecipeSummaryResponseV1
 
 interface RecipeStorage {
-    suspend fun saveRecipes(recipes: List<GetRecipeSummaryResponse>)
+    suspend fun saveRecipes(recipes: List<GetRecipeSummaryResponseV1>)
 
     fun queryRecipes(): PagingSource<Int, RecipeSummaryEntity>
 
-    suspend fun refreshAll(recipes: List<GetRecipeSummaryResponse>)
+    suspend fun refreshAll(recipes: List<GetRecipeSummaryResponseV1>)
 
     suspend fun clearAllLocalData()
 

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

@@ -6,7 +6,7 @@ import gq.kirmanak.mealient.database.AppDb
 import gq.kirmanak.mealient.database.recipe.RecipeDao
 import gq.kirmanak.mealient.database.recipe.entity.*
 import gq.kirmanak.mealient.datasource.models.GetRecipeResponse
-import gq.kirmanak.mealient.datasource.models.GetRecipeSummaryResponse
+import gq.kirmanak.mealient.datasource.v1.models.GetRecipeSummaryResponseV1
 import gq.kirmanak.mealient.extensions.recipeEntity
 import gq.kirmanak.mealient.extensions.toRecipeEntity
 import gq.kirmanak.mealient.extensions.toRecipeIngredientEntity
@@ -23,7 +23,7 @@ class RecipeStorageImpl @Inject constructor(
     private val recipeDao: RecipeDao by lazy { db.recipeDao() }
 
     override suspend fun saveRecipes(
-        recipes: List<GetRecipeSummaryResponse>
+        recipes: List<GetRecipeSummaryResponseV1>
     ) = db.withTransaction {
         logger.v { "saveRecipes() called with $recipes" }
 
@@ -96,7 +96,7 @@ class RecipeStorageImpl @Inject constructor(
         return recipeDao.queryRecipesByPages()
     }
 
-    override suspend fun refreshAll(recipes: List<GetRecipeSummaryResponse>) {
+    override suspend fun refreshAll(recipes: List<GetRecipeSummaryResponseV1>) {
         logger.v { "refreshAll() called with: recipes = $recipes" }
         db.withTransaction {
             recipeDao.removeAllRecipes()

app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeDataSource.kt

@@ -1,10 +1,10 @@
 package gq.kirmanak.mealient.data.recipes.network
 
 import gq.kirmanak.mealient.datasource.models.GetRecipeResponse
-import gq.kirmanak.mealient.datasource.models.GetRecipeSummaryResponse
+import gq.kirmanak.mealient.datasource.v1.models.GetRecipeSummaryResponseV1
 
 interface RecipeDataSource {
-    suspend fun requestRecipes(start: Int, limit: Int): List<GetRecipeSummaryResponse>
+    suspend fun requestRecipes(start: Int, limit: Int): List<GetRecipeSummaryResponseV1>
 
     suspend fun requestRecipeInfo(slug: String): GetRecipeResponse
 }

app/src/main/java/gq/kirmanak/mealient/extensions/RemoteToLocalMappings.kt

@@ -6,6 +6,7 @@ import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientEntity
 import gq.kirmanak.mealient.database.recipe.entity.RecipeInstructionEntity
 import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity
 import gq.kirmanak.mealient.datasource.models.*
+import gq.kirmanak.mealient.datasource.v1.models.GetRecipeSummaryResponseV1
 import gq.kirmanak.mealient.datastore.recipe.AddRecipeDraft
 
 fun GetRecipeResponse.toRecipeEntity() = RecipeEntity(
@@ -31,7 +32,7 @@ fun GetRecipeInstructionResponse.toRecipeInstructionEntity(remoteId: String) =
         text = text
     )
 
-fun GetRecipeSummaryResponse.recipeEntity() = RecipeSummaryEntity(
+fun GetRecipeSummaryResponseV1.recipeEntity() = RecipeSummaryEntity(
     remoteId = remoteId,
     name = name,
     slug = slug,