Merge pull request #43 from telferang/branch-logging-and-assertion

Branch logging and assertion

src/main/java/seedu/budgetbuddy/BudgetBuddy.java

@@ -14,7 +14,7 @@
 import java.util.ArrayList;
 
 /**
- * The main class for the BudgetBuddy application.
+ * Runs the main class for the BudgetBuddy application.
  *
  * This class initiates the BudgetBuddy application by managing the overall lifecycle
  * of the application, including loading saved data, handling user commands, and saving

src/main/java/seedu/budgetbuddy/Parser.java

@@ -1,39 +1,39 @@
 package seedu.budgetbuddy;
 
-import seedu.budgetbuddy.commands.AddExpenseCommand;
-import seedu.budgetbuddy.commands.AddIncomeCommand;
-import seedu.budgetbuddy.commands.AddBudgetCommand;
+import seedu.budgetbuddy.commands.expense.AddExpenseCommand;
+import seedu.budgetbuddy.commands.income.AddIncomeCommand;
+import seedu.budgetbuddy.commands.budget.AddBudgetCommand;
 import seedu.budgetbuddy.commands.Command;
-import seedu.budgetbuddy.commands.DeductBudgetCommand;
-import seedu.budgetbuddy.commands.DeleteExpenseCommand;
-import seedu.budgetbuddy.commands.DeleteIncomeCommand;
-import seedu.budgetbuddy.commands.DisplayIncomeCommand;
+import seedu.budgetbuddy.commands.budget.DeductBudgetCommand;
+import seedu.budgetbuddy.commands.expense.DeleteExpenseCommand;
+import seedu.budgetbuddy.commands.income.DeleteIncomeCommand;
+import seedu.budgetbuddy.commands.income.DisplayIncomeCommand;
 import seedu.budgetbuddy.commands.ExitCommand;
 import seedu.budgetbuddy.commands.HelpCommand;
 import seedu.budgetbuddy.commands.IncorrectCommand;
-import seedu.budgetbuddy.commands.ListBudgetCommand;
-import seedu.budgetbuddy.commands.ListExpenseCommand;
-import seedu.budgetbuddy.commands.ListIncomeCommand;
-import seedu.budgetbuddy.commands.DisplayExpenseCommand;
+import seedu.budgetbuddy.commands.budget.ListBudgetCommand;
+import seedu.budgetbuddy.commands.expense.ListExpenseCommand;
+import seedu.budgetbuddy.commands.income.ListIncomeCommand;
+import seedu.budgetbuddy.commands.expense.DisplayExpenseCommand;
 import seedu.budgetbuddy.exceptions.BudgetBuddyException;
-import seedu.budgetbuddy.commands.SearchExpenseCommand;
+import seedu.budgetbuddy.commands.expense.SearchExpenseCommand;
 import seedu.budgetbuddy.transaction.budget.Budget;
 import seedu.budgetbuddy.transaction.budget.BudgetManager;
 import seedu.budgetbuddy.transaction.expense.Category;
 import seedu.budgetbuddy.transaction.expense.Expense;
 import seedu.budgetbuddy.transaction.expense.ExpenseManager;
 import seedu.budgetbuddy.transaction.income.Income;
 import seedu.budgetbuddy.transaction.income.IncomeManager;
-import seedu.budgetbuddy.validators.AddExpenseValidator;
-import seedu.budgetbuddy.validators.AddIncomeValidator;
-import seedu.budgetbuddy.validators.AddBudgetValidator;
-import seedu.budgetbuddy.validators.DeductBudgetValidator;
-import seedu.budgetbuddy.validators.DeleteExpenseValidator;
-import seedu.budgetbuddy.validators.DeleteIncomeValidator;
-import seedu.budgetbuddy.validators.DisplayIncomeValidator;
-import seedu.budgetbuddy.validators.ListBudgetValidator;
-import seedu.budgetbuddy.validators.DisplayExpenseValidator;
-import seedu.budgetbuddy.validators.SearchExpenseValidator;
+import seedu.budgetbuddy.validators.expense.AddExpenseValidator;
+import seedu.budgetbuddy.validators.income.AddIncomeValidator;
+import seedu.budgetbuddy.validators.budget.AddBudgetValidator;
+import seedu.budgetbuddy.validators.budget.DeductBudgetValidator;
+import seedu.budgetbuddy.validators.expense.DeleteExpenseValidator;
+import seedu.budgetbuddy.validators.income.DeleteIncomeValidator;
+import seedu.budgetbuddy.validators.income.DisplayIncomeValidator;
+import seedu.budgetbuddy.validators.budget.ListBudgetValidator;
+import seedu.budgetbuddy.validators.expense.DisplayExpenseValidator;
+import seedu.budgetbuddy.validators.expense.SearchExpenseValidator;
 
 import java.time.LocalDate;
 import java.time.YearMonth;

src/main/java/seedu/budgetbuddy/commands/AddBudgetCommand.java → src/main/java/seedu/budgetbuddy/commands/budget/AddBudgetCommand.java

@@ -1,5 +1,6 @@
-package seedu.budgetbuddy.commands;
+package seedu.budgetbuddy.commands.budget;
 
+import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.transaction.budget.Budget;
 import seedu.budgetbuddy.transaction.budget.BudgetManager;
 

src/main/java/seedu/budgetbuddy/commands/DeductBudgetCommand.java → src/main/java/seedu/budgetbuddy/commands/budget/DeductBudgetCommand.java

@@ -1,5 +1,6 @@
-package seedu.budgetbuddy.commands;
+package seedu.budgetbuddy.commands.budget;
 
+import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.transaction.budget.Budget;
 import seedu.budgetbuddy.transaction.budget.BudgetManager;
 

src/main/java/seedu/budgetbuddy/commands/ListBudgetCommand.java → src/main/java/seedu/budgetbuddy/commands/budget/ListBudgetCommand.java

@@ -1,5 +1,6 @@
-package seedu.budgetbuddy.commands;
+package seedu.budgetbuddy.commands.budget;
 
+import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.transaction.budget.BudgetManager;
 
 import java.time.YearMonth;

src/main/java/seedu/budgetbuddy/commands/AddExpenseCommand.java → src/main/java/seedu/budgetbuddy/commands/expense/AddExpenseCommand.java

@@ -1,5 +1,6 @@
-package seedu.budgetbuddy.commands;
+package seedu.budgetbuddy.commands.expense;
 
+import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.transaction.expense.Category;
 import seedu.budgetbuddy.transaction.expense.Expense;
 import seedu.budgetbuddy.transaction.expense.ExpenseManager;

src/main/java/seedu/budgetbuddy/commands/DeleteExpenseCommand.java → src/main/java/seedu/budgetbuddy/commands/expense/DeleteExpenseCommand.java

@@ -1,5 +1,6 @@
-package seedu.budgetbuddy.commands;
+package seedu.budgetbuddy.commands.expense;
 
+import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.transaction.expense.ExpenseManager;
 
 /**

src/main/java/seedu/budgetbuddy/commands/DisplayExpenseCommand.java → src/main/java/seedu/budgetbuddy/commands/expense/DisplayExpenseCommand.java

@@ -1,6 +1,7 @@
-package seedu.budgetbuddy.commands;
+package seedu.budgetbuddy.commands.expense;
 
 import seedu.budgetbuddy.Ui;
+import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.transaction.expense.Category;
 import seedu.budgetbuddy.transaction.expense.ExpenseManager;
 

src/main/java/seedu/budgetbuddy/commands/ListExpenseCommand.java → src/main/java/seedu/budgetbuddy/commands/expense/ListExpenseCommand.java

@@ -1,5 +1,6 @@
-package seedu.budgetbuddy.commands;
+package seedu.budgetbuddy.commands.expense;
 
+import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.transaction.expense.ExpenseManager;
 
 /**

src/main/java/seedu/budgetbuddy/commands/SearchExpenseCommand.java → src/main/java/seedu/budgetbuddy/commands/expense/SearchExpenseCommand.java

@@ -1,9 +1,10 @@
-package seedu.budgetbuddy.commands;
+package seedu.budgetbuddy.commands.expense;
 
 import seedu.budgetbuddy.Ui;
+import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.transaction.expense.ExpenseManager;
 
-public class SearchExpenseCommand extends Command{
+public class SearchExpenseCommand extends Command {
     private String keyword;
 
     /**

src/main/java/seedu/budgetbuddy/commands/AddIncomeCommand.java → src/main/java/seedu/budgetbuddy/commands/income/AddIncomeCommand.java

@@ -1,5 +1,6 @@
-package seedu.budgetbuddy.commands;
+package seedu.budgetbuddy.commands.income;
 
+import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.transaction.income.IncomeManager;
 import seedu.budgetbuddy.transaction.income.Income;
 

src/main/java/seedu/budgetbuddy/commands/DeleteIncomeCommand.java → src/main/java/seedu/budgetbuddy/commands/income/DeleteIncomeCommand.java

@@ -1,5 +1,6 @@
-package seedu.budgetbuddy.commands;
+package seedu.budgetbuddy.commands.income;
 
+import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.transaction.income.IncomeManager;
 
 /**

src/main/java/seedu/budgetbuddy/commands/DisplayIncomeCommand.java → src/main/java/seedu/budgetbuddy/commands/income/DisplayIncomeCommand.java

@@ -1,5 +1,6 @@
-package seedu.budgetbuddy.commands;
+package seedu.budgetbuddy.commands.income;
 
+import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.transaction.income.IncomeManager;
 
 import java.time.YearMonth;
@@ -35,10 +36,9 @@ public static boolean isCommand(String command) {
 
     @Override
     public void execute() {
-        if(month == null) {
+        if (month == null) {
             IncomeManager.listIncomes();
-        }
-        else{
+        } else{
             IncomeManager.displayIncomeWithMonth(month);
         }
     }

src/main/java/seedu/budgetbuddy/commands/ListIncomeCommand.java → src/main/java/seedu/budgetbuddy/commands/income/ListIncomeCommand.java

@@ -1,5 +1,6 @@
-package seedu.budgetbuddy.commands;
+package seedu.budgetbuddy.commands.income;
 
+import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.transaction.income.IncomeManager;
 
 /**

src/main/java/seedu/budgetbuddy/transaction/expense/ExpenseManager.java

@@ -6,6 +6,8 @@
 import java.util.ArrayList;
 
 import java.time.LocalDate;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Manages a list of expenses, providing functionalities to add, delete,
@@ -14,13 +16,15 @@
 public class ExpenseManager {
     private static int numberOfExpenses = 0;
     private static ArrayList<Expense> expenses = new ArrayList<>();
+    private static final Logger LOGGER = Logger.getLogger(ExpenseManager.class.getName());
 
     /**
      * Construct a ExpenseManager of array content incomes
      *
      * @param expenses is the content to be instantiated
      */
     public ExpenseManager(ArrayList<Expense> expenses, int numberOfExpenses) {
+        assert numberOfExpenses >= 0: "numberOfExpenses should be greater than 0";
         ExpenseManager.expenses = expenses;
         ExpenseManager.numberOfExpenses = numberOfExpenses;
     }
@@ -67,6 +71,7 @@ public static void listExpenses() {
             result += counter + ". " + expense.toString() + "\n";
             counter++;
         }
+        LOGGER.log(Level.INFO, "Listing {0} expenses", numberOfExpenses);
         Ui.displayToUser(result);
     }
 

src/main/java/seedu/budgetbuddy/transaction/income/IncomeManager.java

@@ -1,10 +1,13 @@
 package seedu.budgetbuddy.transaction.income;
 
 import seedu.budgetbuddy.Ui;
+import seedu.budgetbuddy.transaction.expense.ExpenseManager;
 
 import java.time.LocalDate;
 import java.time.YearMonth;
 import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Manages a collection of income transactions.
@@ -13,13 +16,14 @@
 public class IncomeManager {
     private static int numberOfIncomes = 0;
     private static ArrayList<Income> incomes = new ArrayList<>();
-
+    private static final Logger LOGGER = Logger.getLogger(ExpenseManager.class.getName());
     /**
      * Construct a IncomeManager of array content incomes
      *
      * @param incomes is the content to be instantiated
      */
     public IncomeManager(ArrayList<Income> incomes, int numberOfIncomes) {
+        assert numberOfIncomes >= 0 : "numberOfIncomes should be greater than 0";
         IncomeManager.incomes = incomes;
         IncomeManager.numberOfIncomes = numberOfIncomes;
     }
@@ -66,6 +70,7 @@ public static void listIncomes() {
             result += counter + ". " + income.toString() + "\n";
             counter++;
         }
+        LOGGER.log(Level.INFO, "Listing {0} expenses", numberOfIncomes);
         Ui.displayToUser(result);
     }
 

src/main/java/seedu/budgetbuddy/validators/AddBudgetValidator.java → src/main/java/seedu/budgetbuddy/validators/budget/AddBudgetValidator.java

@@ -1,6 +1,6 @@
-package seedu.budgetbuddy.validators;
+package seedu.budgetbuddy.validators.budget;
 
-import seedu.budgetbuddy.commands.AddBudgetCommand;
+import seedu.budgetbuddy.commands.budget.AddBudgetCommand;
 import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.exceptions.BudgetBuddyException;
 

src/main/java/seedu/budgetbuddy/validators/DeductBudgetValidator.java → src/main/java/seedu/budgetbuddy/validators/budget/DeductBudgetValidator.java

@@ -1,7 +1,7 @@
-package seedu.budgetbuddy.validators;
+package seedu.budgetbuddy.validators.budget;
 
 import seedu.budgetbuddy.commands.Command;
-import seedu.budgetbuddy.commands.DeductBudgetCommand;
+import seedu.budgetbuddy.commands.budget.DeductBudgetCommand;
 import seedu.budgetbuddy.exceptions.BudgetBuddyException;
 import seedu.budgetbuddy.transaction.budget.BudgetManager;
 

src/main/java/seedu/budgetbuddy/validators/ListBudgetValidator.java → src/main/java/seedu/budgetbuddy/validators/budget/ListBudgetValidator.java

@@ -1,8 +1,8 @@
-package seedu.budgetbuddy.validators;
+package seedu.budgetbuddy.validators.budget;
 
 import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.commands.IncorrectCommand;
-import seedu.budgetbuddy.commands.ListBudgetCommand;
+import seedu.budgetbuddy.commands.budget.ListBudgetCommand;
 
 import java.time.YearMonth;
 

src/main/java/seedu/budgetbuddy/validators/AddExpenseValidator.java → src/main/java/seedu/budgetbuddy/validators/expense/AddExpenseValidator.java

@@ -1,6 +1,6 @@
-package seedu.budgetbuddy.validators;
+package seedu.budgetbuddy.validators.expense;
 
-import seedu.budgetbuddy.commands.AddExpenseCommand;
+import seedu.budgetbuddy.commands.expense.AddExpenseCommand;
 import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.commands.IncorrectCommand;
 import seedu.budgetbuddy.transaction.expense.Category;

src/main/java/seedu/budgetbuddy/validators/DeleteExpenseValidator.java → src/main/java/seedu/budgetbuddy/validators/expense/DeleteExpenseValidator.java

@@ -1,8 +1,9 @@
-package seedu.budgetbuddy.validators;
+package seedu.budgetbuddy.validators.expense;
 
 import seedu.budgetbuddy.commands.Command;
-import seedu.budgetbuddy.commands.DeleteExpenseCommand;
+import seedu.budgetbuddy.commands.expense.DeleteExpenseCommand;
 import seedu.budgetbuddy.commands.IncorrectCommand;
+import seedu.budgetbuddy.validators.IndexValidator;
 
 /**
  * Validates the command for deleting an expense.

src/main/java/seedu/budgetbuddy/validators/DisplayExpenseValidator.java → src/main/java/seedu/budgetbuddy/validators/expense/DisplayExpenseValidator.java

@@ -1,7 +1,7 @@
-package seedu.budgetbuddy.validators;
+package seedu.budgetbuddy.validators.expense;
 
 import seedu.budgetbuddy.commands.Command;
-import seedu.budgetbuddy.commands.DisplayExpenseCommand;
+import seedu.budgetbuddy.commands.expense.DisplayExpenseCommand;
 import seedu.budgetbuddy.commands.IncorrectCommand;
 import seedu.budgetbuddy.transaction.expense.Category;
 import java.time.YearMonth;

src/main/java/seedu/budgetbuddy/validators/SearchExpenseValidator.java → src/main/java/seedu/budgetbuddy/validators/expense/SearchExpenseValidator.java

@@ -1,7 +1,7 @@
-package seedu.budgetbuddy.validators;
+package seedu.budgetbuddy.validators.expense;
 
 import seedu.budgetbuddy.commands.Command;
-import seedu.budgetbuddy.commands.SearchExpenseCommand;
+import seedu.budgetbuddy.commands.expense.SearchExpenseCommand;
 
 public class SearchExpenseValidator {
     /**

src/main/java/seedu/budgetbuddy/validators/AddIncomeValidator.java → src/main/java/seedu/budgetbuddy/validators/income/AddIncomeValidator.java

@@ -1,6 +1,6 @@
-package seedu.budgetbuddy.validators;
+package seedu.budgetbuddy.validators.income;
 
-import seedu.budgetbuddy.commands.AddIncomeCommand;
+import seedu.budgetbuddy.commands.income.AddIncomeCommand;
 import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.commands.IncorrectCommand;
 

src/main/java/seedu/budgetbuddy/validators/DeleteIncomeValidator.java → src/main/java/seedu/budgetbuddy/validators/income/DeleteIncomeValidator.java

@@ -1,8 +1,9 @@
-package seedu.budgetbuddy.validators;
+package seedu.budgetbuddy.validators.income;
 
 import seedu.budgetbuddy.commands.Command;
-import seedu.budgetbuddy.commands.DeleteIncomeCommand;
+import seedu.budgetbuddy.commands.income.DeleteIncomeCommand;
 import seedu.budgetbuddy.commands.IncorrectCommand;
+import seedu.budgetbuddy.validators.IndexValidator;
 
 /**
  * Validates the command for deleting an income.

src/main/java/seedu/budgetbuddy/validators/DisplayIncomeValidator.java → src/main/java/seedu/budgetbuddy/validators/income/DisplayIncomeValidator.java

@@ -1,7 +1,7 @@
-package seedu.budgetbuddy.validators;
+package seedu.budgetbuddy.validators.income;
 
 import seedu.budgetbuddy.commands.Command;
-import seedu.budgetbuddy.commands.DisplayIncomeCommand;
+import seedu.budgetbuddy.commands.income.DisplayIncomeCommand;
 import seedu.budgetbuddy.commands.IncorrectCommand;
 
 import java.time.YearMonth;

src/test/java/seedu/budgetbuddy/validators/AddExpenseValidatorTest.java

@@ -1,10 +1,11 @@
 package seedu.budgetbuddy.validators;
 
 import org.junit.jupiter.api.Test;
-import seedu.budgetbuddy.commands.AddExpenseCommand;
+import seedu.budgetbuddy.commands.expense.AddExpenseCommand;
 import seedu.budgetbuddy.commands.Command;
 import seedu.budgetbuddy.commands.IncorrectCommand;
 import seedu.budgetbuddy.transaction.expense.Category;
+import seedu.budgetbuddy.validators.expense.AddExpenseValidator;
 
 import java.time.LocalDate;
 

src/test/java/seedu/budgetbuddy/validators/DisplayExpenseValidatorTest.java

@@ -1,8 +1,10 @@
 package seedu.budgetbuddy.validators;
 
 import org.junit.jupiter.api.Test;
-import seedu.budgetbuddy.commands.DisplayExpenseCommand;
+import seedu.budgetbuddy.commands.expense.DisplayExpenseCommand;
 import seedu.budgetbuddy.transaction.expense.Category;
+import seedu.budgetbuddy.validators.expense.DisplayExpenseValidator;
+
 import java.time.YearMonth;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;