From 715f99a6edf2dbfa5b0491dff98a081e8589dba0 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Fri, 5 Aug 2022 21:57:55 +0200 Subject: [PATCH] Use AddRecipeRequest mappers --- .../data/add/impl/AddRecipeRepoImpl.kt | 29 ++----------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/gq/kirmanak/mealient/data/add/impl/AddRecipeRepoImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/add/impl/AddRecipeRepoImpl.kt index 23b7698..8a0a0a5 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/add/impl/AddRecipeRepoImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/add/impl/AddRecipeRepoImpl.kt @@ -2,11 +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.data.add.models.AddRecipeIngredient -import gq.kirmanak.mealient.data.add.models.AddRecipeInstruction import gq.kirmanak.mealient.data.add.models.AddRecipeRequest -import gq.kirmanak.mealient.data.add.models.AddRecipeSettings -import gq.kirmanak.mealient.datastore.recipe.AddRecipeDraft import gq.kirmanak.mealient.datastore.recipe.AddRecipeStorage import gq.kirmanak.mealient.logging.Logger import kotlinx.coroutines.flow.Flow @@ -23,32 +19,11 @@ class AddRecipeRepoImpl @Inject constructor( ) : AddRecipeRepo { override val addRecipeRequestFlow: Flow - get() = addRecipeStorage.updates.map { it -> - AddRecipeRequest( - name = it.recipeName, - description = it.recipeDescription, - recipeYield = it.recipeYield, - recipeIngredient = it.recipeIngredients.map { AddRecipeIngredient(note = it) }, - recipeInstructions = it.recipeInstructions.map { AddRecipeInstruction(text = it) }, - settings = AddRecipeSettings( - public = it.isRecipePublic, - disableComments = it.areCommentsDisabled, - ) - ) - } + get() = addRecipeStorage.updates.map { AddRecipeRequest(it) } override suspend fun preserve(recipe: AddRecipeRequest) { logger.v { "preserveRecipe() called with: recipe = $recipe" } - val input = AddRecipeDraft( - recipeName = recipe.name, - recipeDescription = recipe.description, - recipeYield = recipe.recipeYield, - recipeInstructions = recipe.recipeInstructions.map { it.text }, - recipeIngredients = recipe.recipeIngredient.map { it.note }, - isRecipePublic = recipe.settings.public, - areCommentsDisabled = recipe.settings.disableComments, - ) - addRecipeStorage.save(input) + addRecipeStorage.save(recipe.toDraft()) } override suspend fun clear() {