fix: adjusted so SavingsAccount can withdraw and reverting Check constructor back to only take CheckingAccount

Author: mercedes-mathews

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

@@ -1,5 +1,6 @@
 package com.codedifferently.lesson17.bank;
 
+import com.codedifferently.lesson17.bank.exceptions.InsufficientFundsException;
 import java.util.Set;
 
 public abstract class BankAccount {
@@ -55,7 +56,24 @@ public void deposit(double amount) throws IllegalStateException {
     balance += amount;
   }
 
-  public abstract void withdraw(double amount) throws Exception;
+  /**
+   * Withdraws funds from the account.
+   *
+   * @param amount
+   * @throws InsufficientFundsException
+   */
+  public void withdraw(double amount) throws InsufficientFundsException {
+    if (isClosed()) {
+      throw new IllegalStateException("Cannot withdraw from a closed account");
+    }
+    if (amount <= 0) {
+      throw new IllegalStateException("Withdrawal amount must be positive");
+    }
+    if (balance < amount) {
+      throw new InsufficientFundsException("Account does not have enough funds for withdrawal");
+    }
+    balance -= amount;
+  }
 
   /**
    * Gets the balance of the account.

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

@@ -17,10 +17,7 @@ public class Check {
    * @param amount The amount of the check.
    * @param account The account the check is drawn on.
    */
-  public Check(String checkNumber, double amount, BankAccount account) {
-    if (account instanceof SavingsAccount) {
-      throw new IllegalArgumentException("Cannot write a check from a savings account");
-    }
+  public Check(String checkNumber, double amount, CheckingAccount account) {
     if (amount < 0) {
       throw new IllegalArgumentException("Check amount must be positive");
     }

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

@@ -1,6 +1,5 @@
 package com.codedifferently.lesson17.bank;
 
-import com.codedifferently.lesson17.bank.exceptions.InsufficientFundsException;
 import java.util.Set;
 
 /** Represents a checking account. */
@@ -16,23 +15,4 @@ public class CheckingAccount extends BankAccount {
   public CheckingAccount(String accountNumber, Set<Customer> owners, double initialBalance) {
     super(accountNumber, owners, initialBalance);
   }
-
-  /**
-   * Withdraws funds from the account.
-   *
-   * @param amount
-   * @throws InsufficientFundsException
-   */
-  public void withdraw(double amount) throws InsufficientFundsException {
-    if (isClosed()) {
-      throw new IllegalStateException("Cannot withdraw from a closed account");
-    }
-    if (amount <= 0) {
-      throw new IllegalStateException("Withdrawal amount must be positive");
-    }
-    if (balance < amount) {
-      throw new InsufficientFundsException("Account does not have enough funds for withdrawal");
-    }
-    balance -= amount;
-  }
 }

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

@@ -1,6 +1,5 @@
 package com.codedifferently.lesson17.bank;
 
-import com.codedifferently.lesson17.bank.exceptions.InsufficientFundsException;
 import java.util.Set;
 
 /** Represents a savings account. */
@@ -16,14 +15,4 @@ public class SavingsAccount extends BankAccount {
   public SavingsAccount(String accountNumber, Set<Customer> owners, double initialBalance) {
     super(accountNumber, owners, initialBalance);
   }
-
-  /**
-   * Withdraws funds from the account.
-   *
-   * @param amount
-   * @throws InsufficientFundsException
-   */
-  public void withdraw(double amount) {
-    throw new UnsupportedOperationException("Withdrawals are not allowed from savings accounts");
-  }
 }

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

@@ -15,10 +15,10 @@
 class BankAtmTest {
 
   private BankAtm classUnderTest;
-  private BankAccount checkingAccount1;
-  private BankAccount checkingAccount2;
-  private BankAccount savingsAccount1;
-  private BankAccount savingsAccount2;
+  private CheckingAccount checkingAccount1;
+  private CheckingAccount checkingAccount2;
+  private SavingsAccount savingsAccount1;
+  private SavingsAccount savingsAccount2;
   private Customer customer1;
   private Customer customer2;
 
@@ -49,8 +49,8 @@ void setUp() {
   void testAddAccount() {
     // Arrange
     Customer customer3 = new Customer(UUID.randomUUID(), "Alice Johnson", false);
-    BankAccount checkingAccount3 = new CheckingAccount("555555555", Set.of(customer3), 300.0);
-    BankAccount savingsAccount3 = new SavingsAccount("666666666", Set.of(customer3), 300.0);
+    CheckingAccount checkingAccount3 = new CheckingAccount("555555555", Set.of(customer3), 300.0);
+    SavingsAccount savingsAccount3 = new SavingsAccount("666666666", Set.of(customer3), 300.0);
     customer3.addAccount(checkingAccount3);
     customer3.addAccount(savingsAccount3);
 
@@ -124,9 +124,6 @@ void testDepositFunds_Check() throws Exception {
     // Assert
     assertThat(checkingAccount1.getBalance()).isEqualTo(0);
     assertThat(checkingAccount2.getBalance()).isEqualTo(300.0);
-    assertThatThrownBy(() -> new Check("88888", 100.0, savingsAccount1))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessage("Cannot write a check from a savings account");
   }
 
   @Test
@@ -144,9 +141,11 @@ void testDepositFunds_DoesntDepositCheckTwice() throws Exception {
   void testWithdrawFunds() throws Exception {
     // Act
     classUnderTest.withdrawFunds(checkingAccount2.getAccountNumber(), 50.0);
+    classUnderTest.withdrawFunds(savingsAccount2.getAccountNumber(), 50.0);
 
     // Assert
     assertThat(checkingAccount2.getBalance()).isEqualTo(150.0);
+    assertThat(savingsAccount2.getBalance()).isEqualTo(150.0);
   }
 
   @Test