diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts index b51531c..c10b1b3 100644 --- a/app/app/build.gradle.kts +++ b/app/app/build.gradle.kts @@ -20,6 +20,7 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" buildConfigField("String", "API_BASE_URL", project.property("API_BASE_URL").toString()) + } buildTypes { diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishDetailsActivity.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishDetailsActivity.kt index e25238e..d2859d0 100644 --- a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishDetailsActivity.kt +++ b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishDetailsActivity.kt @@ -10,7 +10,6 @@ import android.view.ViewGroup import android.widget.Button import android.widget.LinearLayout import android.widget.Toast -import androidx.appcompat.app.AppCompatActivity import tech.mercantec.easyeat.R import tech.mercantec.easyeat.helpers.ApiRequestException import tech.mercantec.easyeat.helpers.RecipeDetailsResponse @@ -19,6 +18,7 @@ import kotlin.concurrent.thread import android.widget.EditText import android.widget.ImageButton import android.widget.TextView +import androidx.appcompat.app.AppCompatActivity import androidx.core.widget.doAfterTextChanged import tech.mercantec.easyeat.helpers.AddRecipeToShoppingList import tech.mercantec.easyeat.models.Ingredient diff --git a/backend/API/BusinessLogic/ShoppingListLogic.cs b/backend/API/BusinessLogic/ShoppingListLogic.cs index dd61249..d416fd0 100644 --- a/backend/API/BusinessLogic/ShoppingListLogic.cs +++ b/backend/API/BusinessLogic/ShoppingListLogic.cs @@ -111,13 +111,15 @@ namespace API.BusinessLogic } // Adds an entire recipes ingredients to the shoppinglist - public async Task AddRecipeToShoppingList(int userId, int recipeId, int multiplier) + public async Task AddRecipeToShoppingList(int userId, int recipeId, string multiplier) { var user = await _dbAccess.ReadShoppingList(userId); var recipe = await _recipeDBAccess.ReadRecipe(recipeId); var ingredients = recipe.Ingredients; - for (int i = 0; i < multiplier; i++) + int multiToInt = int.Parse(multiplier); + + for (int i = 0; i < multiToInt; i++) { foreach (var ingredient in ingredients) { diff --git a/backend/API/Controllers/ShoppingListController.cs b/backend/API/Controllers/ShoppingListController.cs index e4c049c..7fe11b1 100644 --- a/backend/API/Controllers/ShoppingListController.cs +++ b/backend/API/Controllers/ShoppingListController.cs @@ -100,7 +100,7 @@ namespace API.Controllers /// returns a okobjectresult with a boolean that is true if it fails it returns a confliftobjectresult with a message of why it failed [Authorize] [HttpPost("recipeadd")] - public async Task AddARecipesItems(int recipeId, int multiplier = 1) + public async Task AddARecipesItems(int recipeId, string multiplier = "1") { var claims = HttpContext.User.Claims; string userIdString = claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value;