feat: adds BusinessCheckingAccount and BankAccount classes, update tests and methods for account handling

Author: enyabuti

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

@@ -1,29 +1,59 @@
 package com.codedifferently.lesson17.bank;
 
-import java.util.Set;
-
 import com.codedifferently.lesson17.bank.exceptions.InsufficientFundsException;
+import java.util.Set;
 
-/** Base class for all bank accounts. */
+/**
+ * Checks if the account is closed
+ *
+ * @returns true if the account is closed, otherwise false
+ */
 public abstract class BankAccount {
   private String accountNumber;
-  private double balance;
+  protected double balance;
   private Set<Customer> owners;
+  private boolean isClosed;
 
   public BankAccount(String accountNumber, Set<Customer> owners, double initialBalance) {
     this.accountNumber = accountNumber;
     this.owners = owners;
     this.balance = initialBalance;
   }
-    /**
-     * Gets the account number.
-     *
-     * @return The account number.
-     */
 
+  public boolean isActive() {
+    return isClosed;
+  }
+
+  /**
+   * Gets the owners of the account.
+   *
+   * @return The owners of the account.
+   */
+  public Set<Customer> getOwners() {
+    return owners;
+  }
+
+  /**
+   * Gets the account number.
+   *
+   * @return The account number.
+   */
+  public String getAccountNumber() {
+    return accountNumber;
+  }
+
+  /**
+   * Withdraws funds from the account.
+   *
+   * @param amount
+   * @throws InsufficientFundsException
+   */
   public void withdraw(double amount) throws InsufficientFundsException {
-    if (amount > balance) {
-      throw new InsufficientFundsException("Insufficient funds");
+    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;
   }
@@ -34,13 +64,10 @@ public void withdraw(double amount) throws InsufficientFundsException {
    * @param amount The amount to deposit.
    */
   public void deposit(double amount) throws IllegalStateException {
-    if (isClosed()) {
-          throw new IllegalStateException("Cannot deposit to a closed account");
-        }
-        if (amount <= 0) {
-          throw new IllegalArgumentException("Deposit amount must be positive");
-        }
-        balance += amount;
-      }
-      protected abstract boolean isClosed();
+
+    if (amount <= 0) {
+      throw new IllegalArgumentException("Deposit amount must be positive");
+    }
+    balance += amount;
+  }
 }

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

@@ -49,7 +49,7 @@ public void addAccount(SavingsAccount account) {
    * @param customerId The ID of the customer.
    * @return The unique set of accounts owned by the customer.
    */
-  public Set<CheckingAccount> findAccountsByCustomerId(UUID customerId) {
+  public Set<BankAccount> findAccountsByCustomerId(UUID customerId) {
     return customerById.containsKey(customerId)
         ? customerById.get(customerId).getAccounts()
         : Set.of();

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

@@ -3,14 +3,17 @@
 import java.util.Set;
 
 /** Represents a business checking account. */
-public class BusinessCheckingAccount extends CheckingAccount {
+public class BusinessCheckingAccount extends BankAccount {
+
+  /**
+   * Creates a new business checking account.
+   *
+   * @param accountNumber The account number.
+   * @param owners The owners of the account.
+   * @param initialBalance The initial balance of the account.
+   */
   public BusinessCheckingAccount(
       String accountNumber, Set<Customer> owners, double initialBalance) {
     super(accountNumber, owners, initialBalance);
   }
-  /**
-   * Gets the account number.
-   *
-   * @return The account number.
-   */
 }

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

@@ -79,4 +79,8 @@ public String toString() {
         + account.getAccountNumber()
         + '}';
   }
+
+  public Object getAmount() {
+    throw new UnsupportedOperationException("Unimplemented method 'getAmount'");
+  }
 }

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

@@ -1,13 +1,11 @@
 package com.codedifferently.lesson17.bank;
 
-import java.util.Set;
-
 import com.codedifferently.lesson17.bank.exceptions.InsufficientFundsException;
+import java.util.Set;
 
 /** Represents a checking account. */
 public class CheckingAccount extends BankAccount {
 
-  private final Set<Customer> owners;
   private final String accountNumber;
   private double balance;
   private boolean isActive;
@@ -20,50 +18,10 @@ public class CheckingAccount extends BankAccount {
    * @param initialBalance The initial balance of the account.
    */
   public CheckingAccount(String accountNumber, Set<Customer> owners, double initialBalance) {
-    super(accountNumber, owners, initialBalance); 
+    super(accountNumber, owners, initialBalance);
     this.accountNumber = accountNumber;
-    this.owners = owners;
     this.balance = initialBalance;
-    isActive = true;
-  }
-
-  /**
-   * Gets the account number.
-   *
-   * @return The account number.
-   */
-  public String getAccountNumber() {
-    return accountNumber;
-  }
-
-  /**
-   * Gets the owners of the account.
-   *
-   * @return The owners of the account.
-   */
-  public Set<Customer> getOwners() {
-    return owners;
-  }
-
-  
-
-  /**
-   * 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;
+    this.isActive = true;
   }
 
   /**
@@ -92,6 +50,18 @@ public boolean isClosed() {
     return !isActive;
   }
 
+  @Override
+  public void withdraw(double amount) throws InsufficientFundsException {
+    super.withdraw(amount);
+    balance -= amount;
+  }
+
+  @Override
+  public void deposit(double amount) {
+    super.deposit(amount);
+    balance += amount;
+  }
+
   @Override
   public int hashCode() {
     return accountNumber.hashCode();

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

@@ -9,7 +9,7 @@ public class Customer {
 
   private final UUID id;
   private final String name;
-  private final Set<CheckingAccount> accounts = new HashSet<>();
+  private final Set<BankAccount> accounts = new HashSet<>();
 
   /**
    * Creates a new customer.
@@ -43,19 +43,24 @@ public String getName() {
   /**
    * Adds a checking account to the customer.
    *
-   * @param account The account to add.
+   * @param account3 The account to add.
    */
-  public void addAccount(CheckingAccount account) {
-    accounts.add(account);
+  public void addAccount(CheckingAccount account3) {
+    accounts.add(account3);
   }
 
   /**
    * Gets the accounts owned by the customer.
    *
    * @return The unique set of accounts owned by the customer.
    */
-  public Set<CheckingAccount> getAccounts() {
-    return accounts;
+  public Set<BankAccount> getAccounts() {
+    return new HashSet<>(accounts);
+  }
+
+  /** check if is business account */
+  public boolean isBusinessAccount() {
+    return accounts.stream().anyMatch(BusinessCheckingAccount.class::isInstance);
   }
 
   @Override
@@ -65,10 +70,14 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    if (obj instanceof Customer other) {
-      return id.equals(other.id);
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
     }
-    return false;
+    Customer other = (Customer) obj;
+    return id.equals(other.id) && name.equals(other.name);
   }
 
   @Override

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

@@ -1,37 +1,25 @@
 package com.codedifferently.lesson17.bank;
 
 import java.util.Set;
-import java.util.UUID;
 
-/** Represents a savings account. */
+/** Represents a savings account that doesn't allow checks. */
 public class SavingsAccount extends BankAccount {
+  private boolean isActive = true;
 
   public SavingsAccount(String accountNumber, Set<Customer> owners, double initialBalance) {
     super(accountNumber, owners, initialBalance);
   }
 
-  /**
-   * Gets the account number.
-   *
-   * @return The account number.
-   */
-  public void depositFunds(Check check) {
-    throw new UnsupportedOperationException("Cannot withdraw from savings account.");
-  }
-
-  public String getAccountNumber() {
-    // TODO Auto-generated method stub
-    throw new UnsupportedOperationException("Unimplemented method 'getAccountNumber'");
+  protected boolean isClosed() {
+    throw new IllegalStateException("Cannot check if account is closed");
   }
 
-  public Map<UUID getOwners() {
-    // TODO Auto-generated method stub
-    throw new UnsupportedOperationException("Unimplemented method 'getOwners'");
+  @Override
+  public boolean isActive() {
+    return true;
   }
 
-  @Override
-  protected boolean isClosed() {
-    // TODO Auto-generated method stub
-    throw new UnsupportedOperationException("Unimplemented method 'isClosed'");
+  public void closeAccount() {
+    throw new IllegalStateException("Cannot close account with a positive balance");
   }
 }

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

@@ -0,0 +1,48 @@
+package com.codedifferently.lesson17.bank;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+import org.junit.jupiter.api.Test;
+
+public class BankAccountTest {
+  @Test
+  void testIsActive() {
+    // Arrange
+    Set<Customer> owners = new HashSet<>();
+    owners.add(new Customer(UUID.randomUUID(), "John Doe"));
+    BankAccount account = new CheckingAccount("123456789", owners, 100.0);
+    // Act
+    boolean isActive = account.isActive();
+    // Assert
+    assertThat(!isActive).isTrue();
+  }
+
+  @Test
+  void testGetOwners() {
+    // Act
+    Set<Customer> owners = new HashSet<>();
+    owners.add(new Customer(UUID.randomUUID(), "John Doe"));
+    BankAccount account = new CheckingAccount("123456789", owners, 100.0);
+    // Assert
+    assertEquals(owners, account.getOwners());
+  }
+
+  @Test
+  void testWithdrawFunds() {
+    // Arrange
+    double initialBalance = 100.0;
+    double withdrawAmount = 50.0;
+    double expectedBalance = initialBalance - withdrawAmount;
+
+    // Act
+    BankAccount account = new CheckingAccount("123456789", null, initialBalance);
+    account.withdraw(withdrawAmount);
+
+    // Assert
+    assertThat(account.balance).isEqualTo(expectedBalance);
+  }
+}

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

@@ -43,14 +43,14 @@ void testAddAccount() {
     classUnderTest.addAccount(account3);
 
     // Assert
-    Set<CheckingAccount> accounts = classUnderTest.findAccountsByCustomerId(customer3.getId());
+    Set<BankAccount> accounts = classUnderTest.findAccountsByCustomerId(customer3.getId());
     assertThat(accounts).containsOnly(account3);
   }
 
   @Test
   void testFindAccountsByCustomerId() {
     // Act
-    Set<CheckingAccount> accounts = classUnderTest.findAccountsByCustomerId(customer1.getId());
+    Set<BankAccount> accounts = classUnderTest.findAccountsByCustomerId(customer1.getId());
 
     // Assert
     assertThat(accounts).containsOnly(account1, account2);

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

@@ -0,0 +1,3 @@
+package com.codedifferently.lesson17.bank;
+
+public class BusinessCheckingAccountTest {}