Merge pull request #111 from buddhavineeth/master

add exceptions for Goal
AY1920S2-CS2103T-F11-1 · Mar 19, 2020 · 17f6ca7 · 17f6ca7
2 parents f1b56c7 + f747aee
commit 17f6ca7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/main/java/life/calgo/logic/commands/GoalCommand.java b/src/main/java/life/calgo/logic/commands/GoalCommand.java
@@ -18,6 +18,15 @@ public class GoalCommand extends Command {
 
     public static final String MESSAGE_SUCCESS = "Successfully updated your daily caloric goal to %1$d.";
 
+    public static final String MESSAGE_FAILURE_TYPE = "Please key in a non-zero whole number for your "
+            + "daily caloric goal.";
+
+    public static final String MESSAGE_FAILURE_NEGATIVE = "Please key in a positive whole number for your "
+            + "daily caloric goal.";
+
+    public static final String MESSAGE_WARNING = "That is a really low goal to set. Warning: You may suffer from"
+            + " malnutrition. Don't worry! Calgo is here to help you build healthier eating habits.";
+
     private final int numCaloriesDaily;
 
     public GoalCommand(int numberCaloriesDaily) {
@@ -28,6 +37,9 @@ public GoalCommand(int numberCaloriesDaily) {
     public CommandResult execute(Model model) {
         requireNonNull(model);
         model.updateDailyGoal(this.numCaloriesDaily);
+        if (this.numCaloriesDaily <= 1000) {
+            return new CommandResult(MESSAGE_WARNING);
+        }
         return new CommandResult(String.format(MESSAGE_SUCCESS, numCaloriesDaily));
     }
 

diff --git a/src/main/java/life/calgo/logic/parser/GoalCommandParser.java b/src/main/java/life/calgo/logic/parser/GoalCommandParser.java
@@ -10,8 +10,8 @@
 public class GoalCommandParser implements Parser<GoalCommand> {
     /**
      * Parses the given {@code String} of arguments in the context of the GoalCommand
-     * and returns a GoalCommand object for execution.
-     * @throws ParseException if the user input does not conform the expected format
+     * and returns a GoalCommand object for execution
+     * @throws ParseException if the user input does not conform the expected format or is less than or equal to 0
      */
     public GoalCommand parse(String args) throws ParseException {
         String trimmedArgs = args.trim();
@@ -25,10 +25,12 @@ public GoalCommand parse(String args) throws ParseException {
         try {
             targetCalories = Integer.parseInt(splitArgs[1]);
         } catch (NumberFormatException e) {
-            throw new ParseException(
-                    String.format(Messages.MESSAGE_INVALID_COMMAND_FORMAT, GoalCommand.MESSAGE_USAGE)
-            );
+            throw new ParseException(GoalCommand.MESSAGE_FAILURE_TYPE);
         }
+        if (targetCalories <= 0) {
+            throw new ParseException(GoalCommand.MESSAGE_FAILURE_NEGATIVE);
+        }
+
         return new GoalCommand(targetCalories);
     }
 }