diff --git a/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt b/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt index 0ef3061..e131eb4 100644 --- a/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt +++ b/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt @@ -113,10 +113,10 @@ fun changePassword(ctx: Context, oldPassword: String, newPassword: String) { } @Serializable -data class ShoppingListAddRecipeRequest(val id: Int, val multiplier: Int) +data class ShoppingListAddRecipeRequest(val multiplier: String) -fun AddRecipeToShoppingList(ctx: Context, id: Int, multiplier: Int) { - val request = ShoppingListAddRecipeRequest(id, multiplier) +fun AddRecipeToShoppingList(ctx: Context, id: Int, multiplier: String) { + val request = ShoppingListAddRecipeRequest(multiplier) - return requestJson(ctx, "POST", "/api/ShoppingList/recipeadd", request) + return requestJson(ctx, "POST", "/api/ShoppingList/recipeadd/$id", request) } 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 d2859d0..9a4fb30 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 @@ -129,7 +129,7 @@ class DishDetailsActivity : AppCompatActivity() { try { val multiplierEditText = findViewById(R.id.ingredient_multiplier) val multiplierText = multiplierEditText.text.toString() - AddRecipeToShoppingList(this, dishId, multiplierText.toIntOrNull() ?: 1) + AddRecipeToShoppingList(this, dishId, multiplierText) } catch (e: ApiRequestException) { runOnUiThread { Toast.makeText(this, e.message, Toast.LENGTH_LONG).show() diff --git a/backend/API/Controllers/ShoppingListController.cs b/backend/API/Controllers/ShoppingListController.cs index 7fe11b1..6ce80fb 100644 --- a/backend/API/Controllers/ShoppingListController.cs +++ b/backend/API/Controllers/ShoppingListController.cs @@ -99,8 +99,8 @@ namespace API.Controllers /// The recipes ingredients to be added /// 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, string multiplier = "1") + [HttpPost("recipeadd/{recipeId}")] + public async Task AddARecipesItems( int recipeId, [FromBody] string multiplier = "1") { var claims = HttpContext.User.Claims; string userIdString = claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value;