From 13ffe6114d7e010d2ad5b3e652fb8f9448dee456 Mon Sep 17 00:00:00 2001 From: ziyi105 Date: Wed, 1 Nov 2023 22:42:58 +0800 Subject: [PATCH 1/3] Use string builder for encoding pantryStock and add a new line after every ingredient --- src/main/java/seedu/cafectrl/storage/Encoder.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/seedu/cafectrl/storage/Encoder.java b/src/main/java/seedu/cafectrl/storage/Encoder.java index cc56cf9cfb..1270767140 100644 --- a/src/main/java/seedu/cafectrl/storage/Encoder.java +++ b/src/main/java/seedu/cafectrl/storage/Encoder.java @@ -66,9 +66,14 @@ public static ArrayList encodePantryStock(Pantry pantry) { ArrayList pantryStockInString = new ArrayList<>(); ArrayList pantryStock = pantry.getPantryStock(); for (Ingredient ingredient : pantryStock) { - String encodedIngredient = ingredient.getName() + DIVIDER - + ingredient.getQty() + DIVIDER + ingredient.getUnit(); - pantryStockInString.add(encodedIngredient); + StringBuilder encodedIngredient = new StringBuilder(); + encodedIngredient.append(ingredient.getName()); + encodedIngredient.append(DIVIDER); + encodedIngredient.append(ingredient.getQty()); + encodedIngredient.append(DIVIDER); + encodedIngredient.append(ingredient.getUnit()); + encodedIngredient.append(System.lineSeparator()); + pantryStockInString.add(encodedIngredient.toString()); } return pantryStockInString; } From 290857cf6c34a1dfe2f50a891f7fb512a7ff23d9 Mon Sep 17 00:00:00 2001 From: ziyi105 Date: Wed, 1 Nov 2023 22:46:51 +0800 Subject: [PATCH 2/3] Standardise formating of help command --- src/main/java/seedu/cafectrl/command/AddDishCommand.java | 2 +- src/main/java/seedu/cafectrl/command/BuyIngredientCommand.java | 2 +- src/main/java/seedu/cafectrl/command/EditPriceCommand.java | 2 +- src/main/java/seedu/cafectrl/command/ViewTotalStockCommand.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/seedu/cafectrl/command/AddDishCommand.java b/src/main/java/seedu/cafectrl/command/AddDishCommand.java index de5742f2da..32eb1ac79a 100644 --- a/src/main/java/seedu/cafectrl/command/AddDishCommand.java +++ b/src/main/java/seedu/cafectrl/command/AddDishCommand.java @@ -12,7 +12,7 @@ public class AddDishCommand extends Command { public static final String MESSAGE_USAGE = "To add a new dish to the menu: \n" + COMMAND_WORD + " name/DISH_NAME price/DISH_PRICE ingredient/INGREDIENT1_NAME qty/INGREDIENT1_QTY" + "[, ingredient/INGREDIENT2_NAME, qty/INGREDIENT2_QTY...]\n" - + "Example:\n" + + "Example:" + COMMAND_WORD + " name/chicken rice price/3.00 ingredient/rice qty/200g, ingredient/chicken qty/100g"; protected Menu menu; diff --git a/src/main/java/seedu/cafectrl/command/BuyIngredientCommand.java b/src/main/java/seedu/cafectrl/command/BuyIngredientCommand.java index e013aa9e46..68095577f9 100644 --- a/src/main/java/seedu/cafectrl/command/BuyIngredientCommand.java +++ b/src/main/java/seedu/cafectrl/command/BuyIngredientCommand.java @@ -16,7 +16,7 @@ public class BuyIngredientCommand extends Command { public static final String MESSAGE_USAGE = "\nTo buy ingredient:\n" + COMMAND_WORD + " ingredient/INGREDIENT1_NAME qty/INGREDIENT1_QTY" + "[, ingredient/INGREDIENT2_NAME, qty/INGREDIENT2_QTY...]\n" - + "Example:\n" + + "Example:" + COMMAND_WORD + " ingredient/rice qty/200g, ingredient/chicken qty/100g"; protected Ui ui; diff --git a/src/main/java/seedu/cafectrl/command/EditPriceCommand.java b/src/main/java/seedu/cafectrl/command/EditPriceCommand.java index c5c4eb059b..a021f7f9bc 100644 --- a/src/main/java/seedu/cafectrl/command/EditPriceCommand.java +++ b/src/main/java/seedu/cafectrl/command/EditPriceCommand.java @@ -10,7 +10,7 @@ */ public class EditPriceCommand extends Command { public static final String COMMAND_WORD = "edit_price"; - public static final String MESSAGE_USAGE = COMMAND_WORD + "To edit price of a menu item: \n" + public static final String MESSAGE_USAGE = "To edit price of a menu item: \n" + "edit_price index/DISH_INDEX price/NEW_PRICE\n" + "Example: edit_price index/1 price/4.50"; diff --git a/src/main/java/seedu/cafectrl/command/ViewTotalStockCommand.java b/src/main/java/seedu/cafectrl/command/ViewTotalStockCommand.java index b0f1dedae5..6cd6d1ec88 100644 --- a/src/main/java/seedu/cafectrl/command/ViewTotalStockCommand.java +++ b/src/main/java/seedu/cafectrl/command/ViewTotalStockCommand.java @@ -10,7 +10,7 @@ public class ViewTotalStockCommand extends Command { public static final String COMMAND_WORD = "view_stock"; - public static final String MESSAGE_USAGE = "To view pantry stock:\n " + COMMAND_WORD; + public static final String MESSAGE_USAGE = "To view pantry stock:\n" + COMMAND_WORD; protected Ui ui; protected Pantry pantry; private ArrayList pantryStock; From 2b6b642a324b69b20185fb492c9ae8a47e3c4497 Mon Sep 17 00:00:00 2001 From: ziyi105 Date: Wed, 1 Nov 2023 23:13:20 +0800 Subject: [PATCH 3/3] Decoding of pantryStock: trim the quantity before parseInt --- src/main/java/seedu/cafectrl/command/AddOrderCommand.java | 2 +- src/main/java/seedu/cafectrl/storage/Decoder.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/seedu/cafectrl/command/AddOrderCommand.java b/src/main/java/seedu/cafectrl/command/AddOrderCommand.java index 5c90f0b6cc..a201398318 100644 --- a/src/main/java/seedu/cafectrl/command/AddOrderCommand.java +++ b/src/main/java/seedu/cafectrl/command/AddOrderCommand.java @@ -12,7 +12,7 @@ public class AddOrderCommand extends Command { public static final String COMMAND_WORD = "add_order"; public static final String MESSAGE_USAGE = "To add a new order: \n" + COMMAND_WORD - + "name/DISH_NAME qty/QUANTITY\n" + + " name/DISH_NAME qty/QUANTITY\n" + "Example: " + COMMAND_WORD + "name/chicken rice qty/2"; diff --git a/src/main/java/seedu/cafectrl/storage/Decoder.java b/src/main/java/seedu/cafectrl/storage/Decoder.java index 79956b6a13..b26c805bf1 100644 --- a/src/main/java/seedu/cafectrl/storage/Decoder.java +++ b/src/main/java/seedu/cafectrl/storage/Decoder.java @@ -80,7 +80,7 @@ public static Pantry decodePantryStockData(ArrayList encodedPantryStock) ui.showToUser(ErrorMessages.ERROR_IN_PANTRY_STOCK_DATA); } else { Ingredient ingredient = new Ingredient(decodedData[0], - Integer.parseInt(decodedData[1]), decodedData[2]); + Integer.parseInt(decodedData[1].trim()), decodedData[2]); pantryStock.add(ingredient); } } @@ -99,7 +99,7 @@ private static boolean isValidPantryStockFormat(String[] decodedPantryStock) { return false; } else { try { - Integer.parseInt(decodedPantryStock[1]); + Integer.parseInt(decodedPantryStock[1].trim()); } catch (NumberFormatException e) { ui.showToUser(ErrorMessages.ERROR_IN_PANTRY_STOCK_DATA); return false;