ReiMerc/easyeat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed addrecipe to shoppinglist

Browse Source
This commit is contained in:
LilleBRG 2025-05-14 09:53:46 +02:00
parent ba00a6e35e
commit 4b8dcb865c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
View File

@ -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<ShoppingListAddRecipeRequest, Unit>(ctx, "POST", "/api/ShoppingList/recipeadd", request)
return requestJson<ShoppingListAddRecipeRequest, Unit>(ctx, "POST", "/api/ShoppingList/recipeadd/$id", request)
}

2
app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishDetailsActivity.kt
View File

@ -129,7 +129,7 @@ class DishDetailsActivity : AppCompatActivity() {
try {
val multiplierEditText = findViewById<EditText>(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()

4
backend/API/Controllers/ShoppingListController.cs
View File

@ -99,8 +99,8 @@ namespace API.Controllers
/// <param name="recipeId">The recipes ingredients to be added</param>
/// <returns>returns a okobjectresult with a boolean that is true if it fails it returns a confliftobjectresult with a message of why it failed</returns>
[Authorize]
[HttpPost("recipeadd")]
public async Task<IActionResult> AddARecipesItems(int recipeId, string multiplier = "1")
[HttpPost("recipeadd/{recipeId}")]
public async Task<IActionResult> AddARecipesItems( int recipeId, [FromBody] string multiplier = "1")
{
var claims = HttpContext.User.Claims;
string userIdString = claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value;