Merge pull request #75 from Kishen271828/branch-Sorting

Implement sorting of transaction list by time

data/Bob.txt

@@ -0,0 +1,4 @@
+0.00
+Stocks|400.00|Oct 24 2024 12:00PM|INVESTMENT|I
+Groceries|-150.00|Jun 23 2023 06:30PM|SHOPPING|O
+Refund|100.00|Jun 23 2023 05:00PM|REFUND|I

src/main/java/command/AddInflowCommand.java

@@ -16,6 +16,7 @@ public AddInflowCommand(String[] commandParts) {
     }
 
     private void createInflow() throws CategoryNotFoundException {
+        //@@author Kishen271828
         String inflowName = null;
         double inflowAmount = 0;
         String inflowDate = null;
@@ -39,7 +40,9 @@ private void createInflow() throws CategoryNotFoundException {
         inflow = new Inflow(inflowName, inflowAmount, inflowDateTime);
         assert inflowCategory != null;
         inflow.setCategory(Inflow.Category.valueOf(inflowCategory.toUpperCase()));
+        //@@author
     }
+
     public String execute(TransactionManager manager) {
         //@@author Kishen271828
         manager.addTransaction(inflow);

src/main/java/command/AddOutflowCommand.java

@@ -16,6 +16,7 @@ public AddOutflowCommand(String[] commandParts) {
     }
 
     private void createOutflow() throws CategoryNotFoundException {
+        //@@author Kishen271828
         String outflowName = null;
         double outflowAmount = 0.0;
         String outflowDate = null;
@@ -40,6 +41,7 @@ private void createOutflow() throws CategoryNotFoundException {
         outflow = new Outflow(outflowName, outflowAmount, outflowDateTime);
         assert outflowCategory != null;
         outflow.setCategory(Outflow.Category.valueOf(outflowCategory.toUpperCase()));
+        //@@author
     }
 
     public String execute(TransactionManager manager) {

src/main/java/financeproject/Main.java

@@ -16,7 +16,7 @@
 public class Main {
     public static void main(String[] args) throws SecurityException {
         Storage storage = new Storage("./data"); // Storage manager for jar file
-        
+
         UI ui = new UI();
         ui.printMessage("Welcome. Enter your username and password to login.");
 
@@ -25,7 +25,7 @@ public static void main(String[] args) throws SecurityException {
         String response = "";
 
         // Authenticating user
-        BaseUser user = null;
+        BaseUser user;
         InactivityTimer inactivityTimer = new InactivityTimer();
         try {
             ui.printMessage("Username: ");
@@ -41,6 +41,7 @@ public static void main(String[] args) throws SecurityException {
         } else {
             return;
         }
+
         TransactionManager manager = storage.loadFile(user.getUsername());
         ui.printMessage(manager.generateQuickReport());
 

src/main/java/financialtransactions/Transaction.java

@@ -56,4 +56,9 @@ public String toSave() {
     public BaseDate getDate() {
         return date;
     }
+
+    public int compareTo(Transaction<?> otherTransaction) {
+        return this.date.compareTo(otherTransaction.getDate());
+    }
+
 }

src/main/java/financialtransactions/TransactionComparator.java

@@ -0,0 +1,11 @@
+package financialtransactions;
+
+import java.util.Comparator;
+
+public class TransactionComparator implements Comparator<Transaction<?>> {
+    @Override
+    public int compare(Transaction<?> t1, Transaction<?> t2) {
+        // Compare the dates of the transactions
+        return t1.getDate().compareTo(t2.getDate());
+    }
+}

src/main/java/financialtransactions/TransactionList.java

@@ -73,6 +73,7 @@ public String toSave() {
         return baseString.toString();
     }
     //@@author
+
     protected void printTransactionsSafeInfo() {
         int index = 1;
         for (T transaction : transactionList) {
@@ -97,6 +98,11 @@ public void setTransactionsType(String transactionsType) {
         }
     }
 
+    public void sortTransactions() {
+        transactionList.sort(new TransactionComparator());
+    }
+
+
     public class NameComparator<T extends Transaction<?>> implements Comparator<T> {
         @Override
         public int compare(T o1, T o2) {
@@ -126,6 +132,7 @@ public void sortList() {
     public void sortListByDate() {
         this.transactionList.sort(new DateComparator<>());
     }
+
     //@@author chenhowy
     public double totalSpentInPastMonth() {
         double amount = 0;
@@ -148,6 +155,7 @@ public double getTotalSpentInMonth(int month, int year) {
         }
         return amount;
     }
+
     public int getTransactionsAfterToday() {
         int numberOfTransactions = 0;
         LocalDateTime today = LocalDateTime.now();

src/main/java/financialtransactions/TransactionManager.java

@@ -26,7 +26,7 @@ public void setBudget(double budget) {
 
     public void addTransaction(Transaction<?> transaction) {
         transactionList.addTransaction(transaction);
-        // transactionList.sortList();
+        transactionList.sortTransactions();
         if (transaction instanceof Inflow) {
             Inflow inflow = (Inflow) transaction;
             transactionList.setTransactionsType("Inflow");
@@ -76,15 +76,21 @@ public Inflow removeInflow(int index) throws Exception {
         int numOfInflows = inflows.getTransactionListSize();
         Inflow transactionRemoved = (Inflow) inflows.getNthTransaction(numOfInflows - index);
         transactionList.removeTransactionIndex(transactionList.getIndexOfParticularTransaction(transactionRemoved));
+        transactionList.sortTransactions();
+
         inflows.removeTransactionIndex(numOfInflows - index);
+        inflows.sortTransactions();
         return transactionRemoved;
     }
 
     public Outflow removeOutflow(int index) throws Exception {
         int numOfOutflows = outflows.getTransactionListSize();
         Outflow transactionRemoved = (Outflow) outflows.getNthTransaction(numOfOutflows - index);
         transactionList.removeTransactionIndex(transactionList.getIndexOfParticularTransaction(transactionRemoved));
+        transactionList.sortTransactions();
+
         outflows.removeTransactionIndex(numOfOutflows - index);
+        outflows.sortTransactions();
         return transactionRemoved;
     }
 
@@ -96,20 +102,28 @@ public Reminder removeReminder(int index) throws Exception {
         return transactionRemoved;
     }
 
-    public boolean editInflow(int index, Transaction<?> updatedTransaction) throws Exception {
+    public Inflow editInflow(int index, Transaction<?> updatedTransaction) throws Exception {
         int numOfInflows = inflows.getTransactionListSize();
-        Transaction<?> transactionEdited = inflows.getNthTransaction(numOfInflows - index);
+        Inflow transactionEdited = (Inflow) inflows.getNthTransaction(numOfInflows - index);
         transactionList.editTransactionIndex(transactionList.getIndexOfParticularTransaction(transactionEdited),
                 updatedTransaction);
-        return inflows.editTransactionIndex(numOfInflows - index, (Inflow) updatedTransaction);
+        transactionList.sortTransactions();
+
+        inflows.editTransactionIndex(numOfInflows - index, (Inflow) updatedTransaction);
+        inflows.sortTransactions();
+        return (Inflow) transactionEdited;
     }
 
-    public boolean editOutflow(int index, Transaction<?> updatedTransaction) throws Exception {
+    public Outflow editOutflow(int index, Transaction<?> updatedTransaction) throws Exception {
         int numOfOutflows = outflows.getTransactionListSize();
         Transaction<?> transactionEdited = outflows.getNthTransaction(numOfOutflows - index);
         transactionList.editTransactionIndex(transactionList.getIndexOfParticularTransaction(transactionEdited),
                 updatedTransaction);
-        return outflows.editTransactionIndex(numOfOutflows - index, (Outflow) updatedTransaction);
+        transactionList.sortTransactions();
+
+        outflows.editTransactionIndex(numOfOutflows - index, (Outflow) updatedTransaction);
+        outflows.sortTransactions();
+        return (Outflow) transactionEdited;
     }
 
     public boolean editReminder(int index, Transaction<?> updatedTransaction) throws Exception {

src/main/java/template/BaseDate.java

@@ -80,4 +80,9 @@ public boolean isBefore(BaseDate otherDate) {
     public LocalDateTime getDateTime() {
         return dateTime;
     }
+
+    public int compareTo(BaseDate otherDate) {
+        return this.dateTime.compareTo(otherDate.dateTime);
+    }
+
 }

src/test/java/parser/ParserTest.java

@@ -31,8 +31,6 @@ public void addOutflow_success() throws Exception {
 
     @Test
     public void sampleTest() throws Exception{
-        UI ui = new UI();
-        Parser parser = new Parser(ui);
         String assert1 = "add-inflow n/Salary a/400.00 d/23/05/2022 t/1900 c/income";
         String assert2 = "add-outflow n/Rent a/1500.00 d/23/06/2023 t/1800 c/rent\n";
         assertInstanceOf(AddInflowCommand.class, parser.parseCommand(assert1));