diff --git a/src/main/java/com/example/demo/controller/RecipeUploadController.java b/src/main/java/com/example/demo/controller/RecipeUploadController.java index ba426ef..7f860d1 100644 --- a/src/main/java/com/example/demo/controller/RecipeUploadController.java +++ b/src/main/java/com/example/demo/controller/RecipeUploadController.java @@ -109,9 +109,9 @@ public class RecipeUploadController { } String quantityString = getListValue(form.getIngredientQuantity(), i); - BigDecimal quantity = null; + String quantity = null; if (quantityString != null && !quantityString.isBlank()) { - quantity = new BigDecimal(quantityString.trim()); + quantity = new String(quantityString.trim()); } String unit = getListValue(form.getIngredientUnit(), i); @@ -119,7 +119,7 @@ public class RecipeUploadController { ingredientDtos.add(new RecipeIngredientDto( ingredientName.trim(), - quantity, + quantity != null ? quantity.trim() : "", unit != null ? unit.trim() : "", notes != null ? notes.trim() : "")); } diff --git a/src/main/java/com/example/demo/dto/RecipeIngredientDto.java b/src/main/java/com/example/demo/dto/RecipeIngredientDto.java index f20e670..c1771cf 100644 --- a/src/main/java/com/example/demo/dto/RecipeIngredientDto.java +++ b/src/main/java/com/example/demo/dto/RecipeIngredientDto.java @@ -4,7 +4,7 @@ import java.math.BigDecimal; public class RecipeIngredientDto { private String ingredientName; - private BigDecimal quantity; + private String quantity; private String unit; private String notes; @@ -12,7 +12,7 @@ public class RecipeIngredientDto { super(); } - public RecipeIngredientDto(String ingredientName, BigDecimal quantity, String unit, String notes) { + public RecipeIngredientDto(String ingredientName, String quantity, String unit, String notes) { super(); this.ingredientName = ingredientName; this.quantity = quantity; @@ -29,11 +29,11 @@ public class RecipeIngredientDto { this.ingredientName = ingredientName; } - public BigDecimal getQuantity() { + public String getQuantity() { return quantity; } - public void setQuantity(BigDecimal quantity) { + public void setQuantity(String quantity) { this.quantity = quantity; } diff --git a/src/main/java/com/example/demo/entity/RecipeIngredient.java b/src/main/java/com/example/demo/entity/RecipeIngredient.java index 1971526..91c96ca 100644 --- a/src/main/java/com/example/demo/entity/RecipeIngredient.java +++ b/src/main/java/com/example/demo/entity/RecipeIngredient.java @@ -28,9 +28,9 @@ public class RecipeIngredient { @EqualsAndHashCode.Include private Ingredient ingredient; - @NotNull(message = "Please Provide a Quantity") - @Positive(message = "Quantity cannot be negative") - private BigDecimal quantity; + //@NotNull(message = "Please Provide a Quantity") + //@Positive(message = "Quantity cannot be negative") + private String quantity; @Column(columnDefinition = "TEXT") @Size(max = 32, message = "Unit cannot be longer than 32 characters") @@ -47,7 +47,7 @@ public class RecipeIngredient { public RecipeIngredient() { } - public RecipeIngredient(Recipe recipe, Ingredient ingredient, BigDecimal quantity, String unit, String notes) { + public RecipeIngredient(Recipe recipe, Ingredient ingredient, String quantity, String unit, String notes) { this.recipe = recipe; this.ingredient = ingredient; this.quantity = quantity; @@ -80,11 +80,11 @@ public class RecipeIngredient { this.ingredient = ingredient; } - public BigDecimal getQuantity() { + public String getQuantity() { return quantity; } - public void setQuantity(BigDecimal quantity) { + public void setQuantity(String quantity) { this.quantity = quantity; } diff --git a/src/main/resources/templates/create-recipe.html b/src/main/resources/templates/create-recipe.html index a4bb997..2bdc780 100644 --- a/src/main/resources/templates/create-recipe.html +++ b/src/main/resources/templates/create-recipe.html @@ -60,12 +60,12 @@