diff --git a/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/service/ShoppingListService.java b/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/service/ShoppingListService.java index 8f855a3336818047a24e85eb9e94313a874f24f1..3fca374bb9ec940acb470425adb5487c570548f5 100644 --- a/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/service/ShoppingListService.java +++ b/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/service/ShoppingListService.java @@ -322,7 +322,7 @@ public class ShoppingListService { ShoppingList shoppingList = shoppingListRepository.findById(loggedInAccount.getShoppingList().getId()).get(); recipe.getIngredient().forEach(ingredient -> { double itemAmount = ingredient.getItem().getAmount().getQuantity(); - double ingredientAmount = ingredient.getAmount().getQuantity()*peopleCount; + double ingredientAmount = ingredient.getAmount().deserialize().convertTo(ingredient.getItem().getAmount().deserialize().getUnit()).getQuantity()*peopleCount; double amountOfItemInFridge = getAmountOfItemFromFridge(ingredient.getItem(),loggedInAccount); double ingredientAmountNotOwned = ingredientAmount - amountOfItemInFridge; double ingredientAmountToReserve = Math.min(ingredientAmount, amountOfItemInFridge); @@ -332,7 +332,7 @@ public class ShoppingListService { } double quantityToAddOfWare = ingredientAmountNotOwned/itemAmount; if (quantityToAddOfWare > 0) { - Ingredient shoppingListIngredient = new Ingredient(ingredient.getItem(), new SerializedAmount(Math.ceil(quantityToAddOfWare), ingredient.getItem().getAmount().getUnit())); + Ingredient shoppingListIngredient = new Ingredient(ingredient.getItem(), new Amount(Math.ceil(quantityToAddOfWare), Count.COUNT).serialize()); shoppingListIngredient.setStatus(Ingredient.Status.REQUESTED); ingredientRepository.save(shoppingListIngredient); shoppingList.addIngredient(shoppingListIngredient);