Merge pull request #60 from ChongXern/master

Add sorting by name comparator method for sorting transactions

src/main/java/financeproject/data/data.txt

@@ -1,3 +1,5 @@
-Stocks|400.00|Oct 24 2024 12:00PM|INVESTMENT
-Stocks|400.00|Oct 24 2024 12:00PM|INVESTMENT
-Stocks|400.12|Oct 24 2024 12:00PM|INVESTMENT
+Salary|400.00|May 23 2022 07:00PM|INCOME
+Salara|400.00|May 23 2022 07:00PM|INCOME
+Salarz|400.00|May 23 2022 07:00PM|INCOME
+Rent|-1500.00|Jun 23 2023 06:00PM|RENT
+Rent|-1500.00|Jun 23 2023 06:00PM|RENT

src/main/java/financialtransactions/Transaction.java

@@ -50,4 +50,8 @@ public String toString() {
     public String toSave() {
         return String.format("%s|%.2f|%s|%s\n", name, amount, date.toString(), category);
     }
+
+    protected BaseDate getDate() {
+        return date;
+    }
 }

src/main/java/financialtransactions/TransactionList.java

@@ -1,9 +1,11 @@
 package financialtransactions;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 
 public class TransactionList<T extends Transaction<?>> {
     private ArrayList<T> transactionList;
+    private String transactionsType;
 
     public TransactionList(){
         this.transactionList = new ArrayList<>();
@@ -32,12 +34,12 @@ public boolean addTransaction(T newTransaction){
         return false;
     }
 
-    public boolean removeTransactionIndex (int index) throws Exception{
+    public boolean removeTransactionIndex (int index) {
         transactionList.remove(index);
         return true;
     }
 
-    public boolean editTransactionIndex (int index, T transaction) throws Exception {
+    public boolean editTransactionIndex (int index, T transaction) {
         transactionList.set(index, transaction);
         return true;
     }
@@ -76,4 +78,42 @@ protected void printTransactionsSafeInfo() {
             System.out.println(" " + transaction.getName() + " " + transaction.getCategory());
         }
     }
+
+    public String getTransactionsType() {
+        return transactionsType;
+    }
+
+    public void setTransactionsType(String transactionsType) {
+        if (transactionsType.equals("Mixed")) {
+            return;
+        }
+        if (this.transactionsType == null) {
+            this.transactionsType = transactionsType;
+        } else if (!this.transactionsType.equals(transactionsType)) {
+            this.transactionsType = "Mixed";
+        }
+    }
+
+    public class NameComparator<T extends Transaction<?>> implements Comparator<T> {
+        @Override
+        public int compare(T o1, T o2) {
+            return o2.getName().compareToIgnoreCase(o1.getName());
+        }
+    }
+
+    public class DateComparator<T extends Transaction<?>> implements Comparator<T> {
+        @Override
+        public int compare(T o1, T o2) {
+            return o2.getDate().getDateTime().compareTo(o1.getDate().getDateTime());
+        }
+    }
+
+    public void sortListByName() {
+        this.transactionList.sort(new NameComparator<>());
+    }
+
+    public void sortListByDate() {
+        this.transactionList.sort(new DateComparator<>());
+    }
+
 }

src/main/java/financialtransactions/TransactionManager.java

@@ -14,12 +14,15 @@ public TransactionManager() {
 
     public boolean addTransaction(Transaction<?> transaction) {
         transactionList.addTransaction(transaction);
+        // transactionList.sortListByName();
         if (transaction instanceof Inflow) {
             Inflow inflow = (Inflow) transaction;
+            transactionList.setTransactionsType("Inflow");
             return inflows.addTransaction(inflow);
         }
         if (transaction instanceof Outflow) {
             Outflow outflow = (Outflow) transaction;
+            transactionList.setTransactionsType("Outflow");
             return outflows.addTransaction(outflow);
         }
         System.out.println("Invalid transaction type.");

src/main/java/template/BaseDate.java

@@ -27,7 +27,7 @@ public class BaseDate {
 
     private static final ArrayList<String> dateTimeFormats = dateTimeVary();
 
-    LocalDateTime dateTime = null;
+    private LocalDateTime dateTime = null;
     private final String defaultTime = " 0000";
 
     public BaseDate(String args) {
@@ -76,4 +76,8 @@ public boolean isBefore(BaseDate otherDate) {
         }
         return false;
     }
+
+    public LocalDateTime getDateTime() {
+        return dateTime;
+    }
 }