Merge pull request #372 from EkChinHui/branch-fix-photo

Branch fix constraints bug

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

@@ -6,6 +6,7 @@
 
 import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.MainPageCommand;
+import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.budget.Budget;
 
@@ -43,7 +44,7 @@ public CreateBudgetCommand(Budget toCreate) {
      * @return the commmand result along with a success message
      */
     @Override
-    public CommandResult execute(Model model) {
+    public CommandResult execute(Model model) throws CommandException {
         model.saveToHistory();
         model.addBudget(toCreate);
         return new CommandResult(String.format(MESSAGE_SUCCESS, toCreate));

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

@@ -64,7 +64,7 @@ public interface Model {
 
     void closeBudget();
 
-    void addBudget(Budget budget);
+    void addBudget(Budget budget) throws CommandException;
 
     void editBudget(Budget toEdit, Budget editedBudget);
 

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

@@ -48,7 +48,7 @@ public class ModelManager implements Model {
     private final History<VersionedNusave> history;
 
     /**
-     * Initializes a ModelManager with the given addressBook and userPrefs.
+     * Initializes a ModelManager with the given nusave and userPrefs.
      */
     public ModelManager(ReadOnlyNusave nusave, ReadOnlyUserPrefs userPrefs) {
         super();
@@ -176,8 +176,11 @@ private BudgetIndex getActualBudgetIndex(BudgetIndex budgetIndex) {
      * @param budget the budget to be added
      */
     @Override
-    public void addBudget(Budget budget) {
+    public void addBudget(Budget budget) throws CommandException {
         requireNonNull(budget);
+        if (nusave.isBudgetOverLimit()) {
+            throw new CommandException("You are not allowed to have more than 100 budgets");
+        }
         nusave.addBudgetToFront(budget);
         displayAllRenderables();
     }
@@ -299,9 +302,12 @@ public void deleteExpenditure(ExpenditureIndex expenditureIndex) {
      * @param expenditure the expenditure to be added
      */
     @Override
-    public void addExpenditure(Expenditure expenditure) {
+    public void addExpenditure(Expenditure expenditure) throws CommandException {
         requireNonNull(expenditure);
         Optional<Integer> budgetIndex = this.state.getBudgetIndex();
+        if (nusave.isExpenditureOverLimit(budgetIndex)) {
+            throw new CommandException("You are not allowed to have more than 100 expenditures");
+        }
         nusave.addExpenditure(expenditure, this.state.getBudgetIndex());
         setTotalExpenditure(nusave.getTotalExpenditureValue(budgetIndex));
         displayAllRenderables();

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

@@ -122,6 +122,10 @@ public int getIndexOfBudget(Budget budget) {
         return budgetList.getIndexOfBudget(budget);
     }
 
+    public boolean isBudgetOverLimit() {
+        return budgetList.getSize() > 100;
+    }
+
     //=========== Expenditure ==================================================================================
     /**
      * Adds a expenditure to the NUSave budget according to its index.
@@ -165,6 +169,18 @@ public String getTotalExpenditureValue(Optional<Integer> budgetIndexOpt) {
         return this.budgetList.getTotalExpenditureValue(budgetIndex);
     }
 
+    /**
+     *
+     * @param budgetIndexOpt
+     * @return
+     */
+    public boolean isExpenditureOverLimit(Optional<Integer> budgetIndexOpt) {
+        assert budgetIndexOpt.isPresent();
+        int budgetIndex = budgetIndexOpt.get();
+        int expenditureSize = budgetList.getExpenditures(budgetIndex).getExpenditureSize();
+        return expenditureSize > 99;
+    }
+
     //=========== ObservableList ==================================================================================
     /**
      * Sets the observable list displayed in UI based on the

src/test/java/seedu/address/logic/commands/main/ClearBudgetsCommandTest.java

@@ -4,6 +4,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.ModelManager;
 import seedu.address.testutil.TypicalBudget;
@@ -19,7 +20,7 @@ public void execute_emptyNusave_success() {
     }
 
     @Test
-    public void execute_nonEmptyNusave_success() {
+    public void execute_nonEmptyNusave_success() throws CommandException {
         Model model = new ModelManager();
         model.addBudget(TypicalBudget.getMcDonaldsBudget());
         Model expectedModel = new ModelManager();

src/test/java/seedu/address/model/ModelManagerTest.java

@@ -225,7 +225,7 @@ void listBudget_noBudgets() throws CommandException {
     }
 
     @Test
-    void sortBudgetsByName() {
+    void sortBudgetsByName() throws CommandException {
         ModelManager modelManager = new ModelManager(getTypicalNusave(), new UserPrefs());
 
         modelManager.addBudget(getSubwayBudget());
@@ -240,7 +240,7 @@ void sortBudgetsByName() {
     }
 
     @Test
-    void sortBudgetsByCreatedDate() {
+    void sortBudgetsByCreatedDate() throws CommandException {
         ModelManager modelManager = new ModelManager(getTypicalNusave(), new UserPrefs());
 
         modelManager.addBudget(getMcDonaldsBudget());
@@ -263,7 +263,7 @@ void deleteExpenditure() {
     }
 
     @Test
-    void addExpenditure() {
+    void addExpenditure() throws CommandException {
         ModelManager modelManager = new ModelManager(getTypicalNusave(), new UserPrefs());
         modelManager.openBudget(new BudgetIndexManager(0));
         modelManager.addExpenditure(getMcMuffinExpenditure());