Merge branch 'master' of git.reim.ar:ReiMerc/easyeat

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 {

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

backend/API/BusinessLogic/ShoppingListLogic.cs

@@ -111,13 +111,15 @@ namespace API.BusinessLogic
         }
 
         // Adds an entire recipes ingredients to the shoppinglist
-        public async Task<IActionResult> AddRecipeToShoppingList(int userId, int recipeId, int multiplier)
+        public async Task<IActionResult> 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)
                 {

backend/API/Controllers/ShoppingListController.cs

@@ -100,7 +100,7 @@ namespace API.Controllers
         /// <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, int multiplier = 1)
+        public async Task<IActionResult> AddARecipesItems(int recipeId, string multiplier = "1")
         {
             var claims = HttpContext.User.Claims;
             string userIdString = claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value;