feat:changes

Author: Boyce007

lesson_17/bank/bank_app/src/main/java/com/codedifferently/lesson17/bank/Account.java

@@ -5,20 +5,18 @@
 
 package com.codedifferently.lesson17.bank;
 
-import java.util.Set;
-
 import com.codedifferently.lesson17.bank.exceptions.InsufficientFundsException;
+import java.util.Set;
 
 /**
- *
  * @author vscode
  */
 public abstract class Account {
 
-    protected final Set<Customer> owners;
-    protected final String accountNumber;
-    protected double balance;
-    protected boolean isActive;
+  protected final Set<Customer> owners;
+  protected final String accountNumber;
+  protected double balance;
+  protected boolean isActive;
 
   /**
    * Creates a new checking account.
@@ -137,5 +135,4 @@ public String toString() {
         + isActive
         + '}';
   }
-
 }

lesson_17/bank/bank_app/src/main/java/com/codedifferently/lesson17/bank/BankAtm.java

@@ -47,12 +47,11 @@ public Set<CheckingAccount> findAccountsByCustomerId(UUID customerId) {
    * @param accountNumber The account number.
    * @param amount The amount to deposit.
    */
-  public String depositFunds(String accountNumber, double amount) {
+  public void depositFunds(String accountNumber, double amount) {
     CheckingAccount account = getAccountOrThrow(accountNumber);
     account.deposit(amount);
     atmLog.addLog(
         new AuditLogInfo(TranscationType.DEPOSIT, amount, account.getBalance(), accountNumber));
-    return atmLog.showLog();
   }
 
   /**
@@ -61,12 +60,12 @@ public String depositFunds(String accountNumber, double amount) {
    * @param accountNumber The account number.
    * @param check The check to deposit.
    */
-  public void depositFunds(String accountNumber, Check check) {
+  public void depositFunds(String accountNumber, FundTransfer fundTransfer) {
     CheckingAccount account = getAccountOrThrow(accountNumber);
-    check.depositFunds(account);
+    fundTransfer.depositFunds(account);
     atmLog.addLog(
         new AuditLogInfo(
-            TranscationType.DEPOSIT, check.amount, account.getBalance(), accountNumber));
+            TranscationType.DEPOSIT, fundTransfer.amount, account.getBalance(), accountNumber));
   }
 
   /**
@@ -75,12 +74,11 @@ public void depositFunds(String accountNumber, Check check) {
    * @param accountNumber
    * @param amount
    */
-  public String withdrawFunds(String accountNumber, double amount) {
+  public void withdrawFunds(String accountNumber, double amount) {
     CheckingAccount account = getAccountOrThrow(accountNumber);
     account.withdraw(amount);
     atmLog.addLog(
         new AuditLogInfo(TranscationType.WITHDRAWAL, -amount, account.getBalance(), accountNumber));
-    return atmLog.showLog();
   }
 
   /**

lesson_17/bank/bank_app/src/main/java/com/codedifferently/lesson17/bank/CheckingAccount.java

@@ -1,13 +1,10 @@
 package com.codedifferently.lesson17.bank;
 
-import com.codedifferently.lesson17.bank.exceptions.InsufficientFundsException;
 import java.util.Set;
 
 /** Represents a checking account. */
 public class CheckingAccount extends Account {
 
- 
-
   /**
    * Creates a new checking account.
    *
@@ -24,4 +21,4 @@ public CheckingAccount(String accountNumber, Set<Customer> owners, double initia
    *
    * @return The account number.
    */
-}
+}

lesson_17/bank/bank_app/src/main/java/com/codedifferently/lesson17/bank/MoneyOrder.java

@@ -14,7 +14,11 @@ public class MoneyOrder extends FundTransfer {
 
   public MoneyOrder(
       String moneyOrderID, double amount, CheckingAccount account, CheckingAccount toAccount) {
-      super(moneyOrderID, amount, account);
-      depositFunds(toAccount);
+    super(moneyOrderID, amount, account);
+    this.toAccount = toAccount;
+    depositFunds(toAccount);
   }
+
+
+  
 }

lesson_17/bank/bank_app/src/test/java/com/codedifferently/lesson17/bank/BankAtmTest.java

@@ -78,6 +78,7 @@ void testDepositFunds_Check() {
     assertThat(account2.getBalance()).isEqualTo(300.0);
   }
 
+
   @Test
   void testDepositFunds_DoesntDepositCheckTwice() {
     Check check = new Check("987654321", 100.0, account1);
@@ -107,26 +108,4 @@ void testWithdrawFunds_AccountNotFound() {
         .isThrownBy(() -> classUnderTest.withdrawFunds(nonExistingAccountNumber, 50.0))
         .withMessage("Account not found");
   }
-
-  @Test
-  void testDepositFunds_auditLogIsCorrect() {
-    // When
-    String actual = classUnderTest.depositFunds("123456789", 50);
-    String expected = "123456789 DEPOSIT 50.0 150.0";
-    assertThat(actual.equals(expected));
-  }
-
-  @Test
-  void testDepositFunds_auditLogIsCorrectWithMultipleDebitsAndCredits() {
-
-    Check check = new Check("987654321", 100.0, account1);
-    // When
-    classUnderTest.depositFunds("123456789", 50);
-    classUnderTest.depositFunds("987654321", 150);
-    classUnderTest.depositFunds("123456789", check);
-    String actual = classUnderTest.withdrawFunds("123456789", 35.0);
-    String expected =
-        "123456789 DEPOSIT 50.0 150.0 \n 987654321 DEPOSIT 150.0 350.0 \n 123456789 DEPOSIT 100.0 450.0 \n 123456789 WITHDRAWAL -35.0 415";
-    assertThat(actual.equals(expected));
-  }
 }

lesson_17/bank/bank_app/src/test/java/com/codedifferently/lesson17/bank/MoneyOrderTest.java

@@ -46,7 +46,4 @@ void testConstructor_CantCreateMoneyOrderWithNegativeAmount() {
         .isThrownBy(() -> new MoneyOrder("123456789", -50.0, account1, account2))
         .withMessage("Cannot transfer negative amount");
   }
-
-  
-
 }