Merge pull request nus-cs2103-AY2021S1#79 from yuanxing-y/budget-commands

Add showBudget and setBudget commands

Author: yuanxing-z

docs/UserGuide.md

@@ -145,10 +145,10 @@ Examples:
 
 Set the budget for UniSave. Default zero budget. Pop up for input when first launched.
 
-Format: `setBudget a/AMOUNT`
+Format: `setBudget AMOUNT`
 
 Example:
-`setBudget a/1000`: Set the budget to 1000.
+`setBudget 1000`: Set the budget to 1000.
 
 ### Show budget : `showBudget`
 

src/main/java/seedu/address/logic/commands/SetBudgetCommand.java

@@ -0,0 +1,26 @@
+package seedu.address.logic.commands;
+
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+public class SetBudgetCommand extends Command {
+    public static final String COMMAND_WORD = "setBudget";
+    public static final String MESSAGE_SET_BUDGET_SUCCESS = "Successful! Te budget is now S$ %.2f.\n";
+    public static final String MESSAGE_SET_BUDGET_FAIL = "Set Budget failed, please enter a valid budget.\n";
+
+    private final double budget;
+
+    public SetBudgetCommand(double budget) {
+        requireAllNonNull(budget);
+        this.budget = budget;
+    }
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        model.setExpenseBookBudget(budget);
+        String msg = String.format(MESSAGE_SET_BUDGET_SUCCESS, budget);
+        return new CommandResult(msg);
+    }
+}

src/main/java/seedu/address/logic/commands/ShowBudgetCommand.java

@@ -0,0 +1,25 @@
+package seedu.address.logic.commands;
+
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+
+public class ShowBudgetCommand extends Command {
+
+    public static final String COMMAND_WORD = "showBudget";
+    public static final String MESSAGE_BUDGET = "Current budget is: S$ %.2f\n";
+    public static final String MESSAGE_REMAINING = "Remaining budget is: S$ %.2f\n";
+    public static final String MESSAGE_SETNEW = "Your current budget is S$0.00, \n"
+            + "please set a new budget with command: setBudget AMOUNT\n";
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        if (model.getExpenseBookBudget() == 0) {
+            return new CommandResult(MESSAGE_SETNEW);
+        } else {
+            String budgetMsg = String.format(MESSAGE_BUDGET, model.getExpenseBookBudget());
+            String remainingMsg = String.format(MESSAGE_REMAINING, model.getExpenseBookRemaining());
+
+            return new CommandResult(budgetMsg + remainingMsg);
+        }
+    }
+}

src/main/java/seedu/address/logic/parser/ExpenseBookParser.java

@@ -6,9 +6,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import seedu.address.logic.commands.Command;
-import seedu.address.logic.commands.DescriptionCommand;
-import seedu.address.logic.commands.HelpCommand;
+import seedu.address.logic.commands.*;
 import seedu.address.logic.parser.exceptions.ParseException;
 
 /**
@@ -44,6 +42,14 @@ public Command parseCommand(String userInput) throws ParseException {
                     .COMMAND_WORD:
                 return new DescriptionCommandParser().parse(arguments);
 
+            case ShowBudgetCommand
+                    .COMMAND_WORD:
+                return new ShowBudgetCommandParser().parse(arguments);
+
+            case SetBudgetCommand
+                    .COMMAND_WORD:
+                return new SetBudgetCommandParser().parse(arguments);
+
             default:
                 throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
         }

src/main/java/seedu/address/logic/parser/SetBudgetCommandParser.java

@@ -0,0 +1,22 @@
+package seedu.address.logic.parser;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.DeleteCommand;
+import seedu.address.logic.commands.SetBudgetCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+public class SetBudgetCommandParser implements Parser<SetBudgetCommand> {
+    @Override
+    public SetBudgetCommand parse(String userInput) throws ParseException {
+        try {
+            //needs oop later
+            double budget = Double.parseDouble(userInput.split(" ")[1]);
+            return new SetBudgetCommand(budget);
+        } catch (Exception pe) {
+            throw new ParseException(
+                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, SetBudgetCommand.MESSAGE_SET_BUDGET_FAIL), pe);
+        }
+    }
+}

src/main/java/seedu/address/logic/parser/ShowBudgetCommandParser.java

@@ -0,0 +1,14 @@
+package seedu.address.logic.parser;
+
+import seedu.address.logic.commands.DescriptionCommand;
+import seedu.address.logic.commands.ShowBudgetCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.person.Description;
+
+public class ShowBudgetCommandParser implements Parser<ShowBudgetCommand> {
+
+    @Override
+    public ShowBudgetCommand parse(String userInput) throws ParseException {
+        return new ShowBudgetCommand();
+    }
+}

src/main/java/seedu/address/model/ExpenseBook.java

@@ -125,4 +125,19 @@ public boolean equals(Object other) {
     public int hashCode() {
         return expenses.hashCode();
     }
+
+    //yuanxing edited
+    public void setBudget(double budget) {
+        expenses.setBudget(budget);
+    }
+
+    public double getBudget() {
+        return expenses.getBudget();
+    }
+
+    public double getRemainingBudget() {
+        return expenses.getRemainingBudget();
+    }
+    //end of yuanxing edits
+
 }

src/main/java/seedu/address/model/ExpenseModelManager.java

@@ -163,4 +163,21 @@ public boolean equals(Object obj) {
                 && filteredExpenses.equals(other.filteredExpenses);
     }
 
+    //yuanxing edited
+    @Override
+    public double getExpenseBookBudget() {
+        return expenseBook.getBudget();
+    }
+
+    @Override
+    public double getExpenseBookRemaining() {
+        return expenseBook.getRemainingBudget();
+    }
+
+    @Override
+    public void setExpenseBookBudget(double budget) {
+        expenseBook.setBudget(budget);
+    }
+
+
 }

src/main/java/seedu/address/model/Model.java

@@ -96,4 +96,10 @@ public interface Model {
      * @param predicate
      */
     void updateFilteredExpenseList(Predicate<Expense> predicate);
+
+    double getExpenseBookBudget();
+
+    double getExpenseBookRemaining();
+
+    void setExpenseBookBudget(double budget);
 }

src/main/java/seedu/address/model/ModelManager.java

@@ -174,6 +174,24 @@ public void updateFilteredPersonList(Predicate<Person> predicate) {
     public void updateFilteredExpenseList(Predicate<Expense> predicate) {
     }
 
+    //dummy
+    @Override
+    public double getExpenseBookBudget() {
+        return 0;
+    }
+
+    //dummy
+    @Override
+    public double getExpenseBookRemaining() {
+        return 0;
+    }
+
+    //dummy
+    @Override
+    public void setExpenseBookBudget(double budget) {
+
+    }
+
     @Override
     public boolean equals(Object obj) {
         // short circuit if same object