From 37cd82653edc793879ae6e275f165da13c191106 Mon Sep 17 00:00:00 2001 From: NaychiMin Date: Wed, 1 Nov 2023 20:26:44 +0800 Subject: [PATCH 1/3] Fixed minor bugs and add in clearer error messages. Fixes #94 --- .../cafectrl/command/ShowSalesByDayCommand.java | 3 +++ .../seedu/cafectrl/command/ShowSalesCommand.java | 1 + src/main/java/seedu/cafectrl/data/Pantry.java | 14 +++++++++----- src/main/java/seedu/cafectrl/parser/Parser.java | 3 ++- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/seedu/cafectrl/command/ShowSalesByDayCommand.java b/src/main/java/seedu/cafectrl/command/ShowSalesByDayCommand.java index 2ce786fe6d..5b6d5a9eba 100644 --- a/src/main/java/seedu/cafectrl/command/ShowSalesByDayCommand.java +++ b/src/main/java/seedu/cafectrl/command/ShowSalesByDayCommand.java @@ -6,6 +6,9 @@ public class ShowSalesByDayCommand extends Command { public static final String COMMAND_WORD = "show_sale"; + public static final String MESSAGE_USAGE = "To show sales for a chosen day:\n " + + "Command Format:" + COMMAND_WORD + " day/DAY_TO_DISPLAY\n" + + "Example: " + COMMAND_WORD + " day/1"; private final int day; private final Ui ui; diff --git a/src/main/java/seedu/cafectrl/command/ShowSalesCommand.java b/src/main/java/seedu/cafectrl/command/ShowSalesCommand.java index 352f3ad324..85da1ca180 100644 --- a/src/main/java/seedu/cafectrl/command/ShowSalesCommand.java +++ b/src/main/java/seedu/cafectrl/command/ShowSalesCommand.java @@ -6,6 +6,7 @@ public class ShowSalesCommand extends Command { public static final String COMMAND_WORD = "show_sales"; + public static final String MESSAGE_USAGE = "To show sales for all days:\n" + COMMAND_WORD; private Sales sales; private Ui ui; private Menu menu; diff --git a/src/main/java/seedu/cafectrl/data/Pantry.java b/src/main/java/seedu/cafectrl/data/Pantry.java index ca2e78a428..ed69be8798 100644 --- a/src/main/java/seedu/cafectrl/data/Pantry.java +++ b/src/main/java/seedu/cafectrl/data/Pantry.java @@ -102,13 +102,17 @@ public boolean isDishCooked(ArrayList dishIngredients) { //for each ingredient that is used in the dish, update the stock of ingredient left. for (Ingredient dishIngredient : dishIngredients) { Ingredient usedIngredientFromStock = getIngredient(dishIngredient); - int stockQuantity = usedIngredientFromStock.getQty(); - int usedQuantity = dishIngredient.getQty(); - int finalQuantity = stockQuantity-usedQuantity; - if(finalQuantity < 0) { + if(usedIngredientFromStock == null){ return false; + } else { + int stockQuantity = usedIngredientFromStock.getQty(); + int usedQuantity = dishIngredient.getQty(); + int finalQuantity = stockQuantity - usedQuantity; + if (finalQuantity < 0) { + return false; + } + usedIngredientFromStock.setQty(finalQuantity); } - usedIngredientFromStock.setQty(finalQuantity); } return true; } diff --git a/src/main/java/seedu/cafectrl/parser/Parser.java b/src/main/java/seedu/cafectrl/parser/Parser.java index cca229192d..82444f3a50 100644 --- a/src/main/java/seedu/cafectrl/parser/Parser.java +++ b/src/main/java/seedu/cafectrl/parser/Parser.java @@ -486,7 +486,8 @@ private static Command prepareShowSalesByDay(String arguments, Ui ui, Sales sale Matcher matcher = showSaleByDayPattern.matcher(arguments.trim()); if (!matcher.matches()) { - return new IncorrectCommand(ErrorMessages.INVALID_SHOW_SALE_DAY_FORMAT_MESSAGE, ui); + return new IncorrectCommand(ErrorMessages.INVALID_SHOW_SALE_DAY_FORMAT_MESSAGE + + ShowSalesByDayCommand.MESSAGE_USAGE, ui); } try { From 8186e9f6918c090a680d4c35c25b1b537f74b675 Mon Sep 17 00:00:00 2001 From: NaychiMin Date: Wed, 1 Nov 2023 20:35:26 +0800 Subject: [PATCH 2/3] Improve coding standard. Fixes #94 --- src/main/java/seedu/cafectrl/data/Pantry.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/seedu/cafectrl/data/Pantry.java b/src/main/java/seedu/cafectrl/data/Pantry.java index ed69be8798..fb92a33134 100644 --- a/src/main/java/seedu/cafectrl/data/Pantry.java +++ b/src/main/java/seedu/cafectrl/data/Pantry.java @@ -102,17 +102,16 @@ public boolean isDishCooked(ArrayList dishIngredients) { //for each ingredient that is used in the dish, update the stock of ingredient left. for (Ingredient dishIngredient : dishIngredients) { Ingredient usedIngredientFromStock = getIngredient(dishIngredient); - if(usedIngredientFromStock == null){ + if(usedIngredientFromStock == null) { return false; - } else { - int stockQuantity = usedIngredientFromStock.getQty(); - int usedQuantity = dishIngredient.getQty(); - int finalQuantity = stockQuantity - usedQuantity; - if (finalQuantity < 0) { - return false; - } - usedIngredientFromStock.setQty(finalQuantity); } + int stockQuantity = usedIngredientFromStock.getQty(); + int usedQuantity = dishIngredient.getQty(); + int finalQuantity = stockQuantity - usedQuantity; + if (finalQuantity < 0) { + return false; + } + usedIngredientFromStock.setQty(finalQuantity); } return true; } From fadf1244e23eb269d17783421253d9f26448fb02 Mon Sep 17 00:00:00 2001 From: NaychiMin Date: Wed, 1 Nov 2023 20:36:19 +0800 Subject: [PATCH 3/3] Improve coding standard. Fixes #94 --- src/main/java/seedu/cafectrl/data/Pantry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/seedu/cafectrl/data/Pantry.java b/src/main/java/seedu/cafectrl/data/Pantry.java index fb92a33134..bbfb851529 100644 --- a/src/main/java/seedu/cafectrl/data/Pantry.java +++ b/src/main/java/seedu/cafectrl/data/Pantry.java @@ -102,7 +102,7 @@ public boolean isDishCooked(ArrayList dishIngredients) { //for each ingredient that is used in the dish, update the stock of ingredient left. for (Ingredient dishIngredient : dishIngredients) { Ingredient usedIngredientFromStock = getIngredient(dishIngredient); - if(usedIngredientFromStock == null) { + if (usedIngredientFromStock == null) { return false; } int stockQuantity = usedIngredientFromStock.getQty();