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

Move V0 responses to v0 package

Browse Source
This commit is contained in:
Kirill Kamakin
2022-10-29 18:15:10 +02:00
parent 3f2f945d99
commit 7702dbebd1
40 changed files with 261 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/gq/kirmanak/mealient/data/add/AddRecipeDataSource.kt
View File

@@ -1,7 +1,7 @@
package gq.kirmanak.mealient.data.add
import gq.kirmanak.mealient.datasource.models.AddRecipeRequest
import gq.kirmanak.mealient.datasource.v0.models.AddRecipeRequestV0
interface AddRecipeDataSource {
suspend fun addRecipe(recipe: AddRecipeRequest): String
suspend fun addRecipe(recipe: AddRecipeRequestV0): String
}

6
app/src/main/java/gq/kirmanak/mealient/data/add/AddRecipeRepo.kt
View File

@@ -1,13 +1,13 @@
package gq.kirmanak.mealient.data.add
import gq.kirmanak.mealient.datasource.models.AddRecipeRequest
import gq.kirmanak.mealient.datasource.v0.models.AddRecipeRequestV0
import kotlinx.coroutines.flow.Flow
interface AddRecipeRepo {
val addRecipeRequestFlow: Flow<AddRecipeRequest>
val addRecipeRequestFlow: Flow<AddRecipeRequestV0>
suspend fun preserve(recipe: AddRecipeRequest)
suspend fun preserve(recipe: AddRecipeRequestV0)
suspend fun clear()

6
app/src/main/java/gq/kirmanak/mealient/data/add/impl/AddRecipeRepoImpl.kt
View File

@@ -2,7 +2,7 @@ package gq.kirmanak.mealient.data.add.impl
import gq.kirmanak.mealient.data.add.AddRecipeDataSource
import gq.kirmanak.mealient.data.add.AddRecipeRepo
import gq.kirmanak.mealient.datasource.models.AddRecipeRequest
import gq.kirmanak.mealient.datasource.v0.models.AddRecipeRequestV0
import gq.kirmanak.mealient.datastore.recipe.AddRecipeStorage
import gq.kirmanak.mealient.extensions.toAddRecipeRequest
import gq.kirmanak.mealient.extensions.toDraft
@@ -20,10 +20,10 @@ class AddRecipeRepoImpl @Inject constructor(
private val logger: Logger,
) : AddRecipeRepo {
override val addRecipeRequestFlow: Flow<AddRecipeRequest>
override val addRecipeRequestFlow: Flow<AddRecipeRequestV0>
get() = addRecipeStorage.updates.map { it.toAddRecipeRequest() }
override suspend fun preserve(recipe: AddRecipeRequest) {
override suspend fun preserve(recipe: AddRecipeRequestV0) {
logger.v { "preserveRecipe() called with: recipe = $recipe" }
addRecipeStorage.save(recipe.toDraft())
}

6
app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt
View File

@@ -1,15 +1,15 @@
package gq.kirmanak.mealient.data.auth.impl
import gq.kirmanak.mealient.data.auth.AuthDataSource
import gq.kirmanak.mealient.datasource.MealieDataSource
import gq.kirmanak.mealient.datasource.v0.MealieDataSourceV0
import javax.inject.Inject
import javax.inject.Singleton
@Singleton
class AuthDataSourceImpl @Inject constructor(
private val mealieDataSource: MealieDataSource,
private val V0Source: MealieDataSourceV0,
) : AuthDataSource {
override suspend fun authenticate(username: String, password: String, baseUrl: String): String =
mealieDataSource.authenticate(baseUrl, username, password)
V0Source.authenticate(baseUrl, username, password)
}

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

@@ -8,9 +8,9 @@ import gq.kirmanak.mealient.data.baseurl.VersionInfo
import gq.kirmanak.mealient.data.recipes.network.FullRecipeInfo
import gq.kirmanak.mealient.data.recipes.network.RecipeDataSource
import gq.kirmanak.mealient.data.recipes.network.RecipeSummaryInfo
import gq.kirmanak.mealient.datasource.MealieDataSource
import gq.kirmanak.mealient.datasource.models.AddRecipeRequest
import gq.kirmanak.mealient.datasource.models.NetworkError
import gq.kirmanak.mealient.datasource.NetworkError
import gq.kirmanak.mealient.datasource.v0.MealieDataSourceV0
import gq.kirmanak.mealient.datasource.v0.models.AddRecipeRequestV0
import gq.kirmanak.mealient.datasource.v1.MealieDataSourceV1
import gq.kirmanak.mealient.extensions.runCatchingExceptCancel
import gq.kirmanak.mealient.extensions.toFullRecipeInfo
@@ -23,19 +23,19 @@ import javax.inject.Singleton
class MealieDataSourceWrapper @Inject constructor(
private val baseURLStorage: BaseURLStorage,
private val authRepo: AuthRepo,
private val source: MealieDataSource,
private val v1Source: MealieDataSourceV1,
private val V0source: MealieDataSourceV0,
private val V1Source: MealieDataSourceV1,
) : AddRecipeDataSource, RecipeDataSource, VersionDataSource {
override suspend fun addRecipe(recipe: AddRecipeRequest): String =
withAuthHeader { token -> source.addRecipe(getUrl(), token, recipe) }
override suspend fun addRecipe(recipe: AddRecipeRequestV0): String =
withAuthHeader { token -> V0source.addRecipe(getUrl(), token, recipe) }
override suspend fun getVersionInfo(baseUrl: String): VersionInfo =
runCatchingExceptCancel {
source.getVersionInfo(baseUrl).toVersionInfo()
V0source.getVersionInfo(baseUrl).toVersionInfo()
}.getOrElse {
if (it is NetworkError.NotMealie) {
v1Source.getVersionInfo(baseUrl).toVersionInfo()
V1Source.getVersionInfo(baseUrl).toVersionInfo()
} else {
throw it
}
@@ -45,9 +45,9 @@ class MealieDataSourceWrapper @Inject constructor(
withAuthHeader { token ->
val url = getUrl()
if (isV1()) {
v1Source.requestRecipes(url, token, start, limit).map { it.toRecipeSummaryInfo() }
V1Source.requestRecipes(url, token, start, limit).map { it.toRecipeSummaryInfo() }
} else {
source.requestRecipes(url, token, start, limit).map { it.toRecipeSummaryInfo() }
V0source.requestRecipes(url, token, start, limit).map { it.toRecipeSummaryInfo() }
}
}
@@ -55,9 +55,9 @@ class MealieDataSourceWrapper @Inject constructor(
withAuthHeader { token ->
val url = getUrl()
if (isV1()) {
v1Source.requestRecipeInfo(url, token, slug).toFullRecipeInfo()
V1Source.requestRecipeInfo(url, token, slug).toFullRecipeInfo()
} else {
source.requestRecipeInfo(url, token, slug).toFullRecipeInfo()
V0source.requestRecipeInfo(url, token, slug).toFullRecipeInfo()
}
}