Safak/OOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix in getTransactionsSorted and getTransactionsByType in PrivateBank.java

Browse Source
This commit is contained in:
Safak
2024-12-09 16:27:48 +01:00
parent 46b0410bc5
commit 39bc86e798
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/bank/PrivateBank.java
View File

@@ -221,7 +221,7 @@ public class PrivateBank implements Bank, JsonSerializer<Transaction>, JsonDeser
// 2 setting as incoming transfer // 2 setting as incoming transfer
else if (transaction instanceof IncomingTransfer) { else if (transaction instanceof IncomingTransfer) {
if (((IncomingTransfer) transaction).getSender().equals("") || ((IncomingTransfer) transaction).getRecipient().equals("")) if (((IncomingTransfer) transaction).getSender().isEmpty() || ((IncomingTransfer) transaction).getRecipient().isEmpty())
throw new TransactionAttributeException("Transfer without sender or recipient"); throw new TransactionAttributeException("Transfer without sender or recipient");
else if (((IncomingTransfer) transaction).getRecipient().equals(account)) else if (((IncomingTransfer) transaction).getRecipient().equals(account))
@@ -232,7 +232,7 @@ public class PrivateBank implements Bank, JsonSerializer<Transaction>, JsonDeser
// 3 setting as outgoing transfer // 3 setting as outgoing transfer
else if (transaction instanceof OutgoingTransfer) { else if (transaction instanceof OutgoingTransfer) {
if (((OutgoingTransfer) transaction).getSender().equals("") || ((OutgoingTransfer) transaction).getRecipient().equals("")) if (((OutgoingTransfer) transaction).getSender().isEmpty() || ((OutgoingTransfer) transaction).getRecipient().isEmpty())
throw new TransactionAttributeException("Transfer without sender or recipient"); throw new TransactionAttributeException("Transfer without sender or recipient");
else if (((OutgoingTransfer) transaction).getSender().equals(account)) else if (((OutgoingTransfer) transaction).getSender().equals(account))
@@ -332,8 +332,16 @@ public class PrivateBank implements Bank, JsonSerializer<Transaction>, JsonDeser
*/ */
@Override @Override
public List<Transaction> getTransactionsSorted(String account, boolean asc) { public List<Transaction> getTransactionsSorted(String account, boolean asc) {
List<Transaction> transactions = this.accountsToTransactions.get(account); List<Transaction> transactions = new ArrayList<>(this.accountsToTransactions.get(account));
transactions.sort(Comparator.comparingDouble(Transaction::calculate));
if (transactions == null || transactions.isEmpty())
return new ArrayList<>();
if (asc)
transactions.sort(Comparator.comparingDouble(Transaction::calculate));
else
transactions.sort(Comparator.comparingDouble(Transaction::calculate).reversed());
return transactions; return transactions;
} }
@@ -346,7 +354,7 @@ public class PrivateBank implements Bank, JsonSerializer<Transaction>, JsonDeser
*/ */
@Override @Override
public List<Transaction> getTransactionsByType(String account, boolean positive) { public List<Transaction> getTransactionsByType(String account, boolean positive) {
List<Transaction> transactions = this.accountsToTransactions.get(account); List<Transaction> transactions = new ArrayList<>(this.accountsToTransactions.get(account));
if (positive) if (positive)
transactions.removeIf(transaction -> transaction.calculate() >= 0); transactions.removeIf(transaction -> transaction.calculate() >= 0);
else else
@@ -359,7 +367,7 @@ public class PrivateBank implements Bank, JsonSerializer<Transaction>, JsonDeser
* *
* @throws IOException if an error occurs while deserializing * @throws IOException if an error occurs while deserializing
*/ */
public void readAccounts() throws IOException, java.io.IOException, AccountAlreadyExistsException, TransactionAlreadyExistException, AccountDoesNotExistException, TransactionAttributeException { public void readAccounts() throws IOException, java.io.IOException, AccountAlreadyExistsException, TransactionAlreadyExistException, TransactionAttributeException {
/* /*
1. JSONs einlesen 1. JSONs einlesen
2. for each Transaction 2. for each Transaction