fix:lesson_17

Author: “Tezz03”

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

@@ -1,29 +1,24 @@
 package com.codedifferently.lesson17.bank;
 
+import com.codedifferently.lesson17.bank.exceptions.AccountNotFoundException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import com.codedifferently.lesson17.bank.exceptions.AccountNotFoundException;
-
 /** Represents a bank ATM. */
 public class BankAtm {
 
   private final Map<UUID, Customer> customerById = new HashMap<>();
-  private final Map<String, CheckingAccount> accountByNumber = new HashMap<>();
-  private final Map<String, BusinessAccount> accountByType = new HashMap<>();
+  private final Map<String, BankAccount> accountByNumber = new HashMap<>();
 
   /**
-   * Adds a checking account to the bank.
+   * Adds an account to the bank.
    *
    * @param account The account to add.
    */
-  public void addAccount(CheckingAccount account) {
-    if (account == null) {
-      throw new IllegalArgumentException("Account cannot be null");
-    }
+  public void addAccount(BankAccount account) {
     accountByNumber.put(account.getAccountNumber(), account);
     account
         .getOwners()
@@ -39,7 +34,7 @@ public void addAccount(CheckingAccount account) {
    * @param customerId The ID of the customer.
    * @return The unique set of accounts owned by the customer.
    */
-  public Set<Account> findAccountsByCustomerId(UUID customerId) {
+  public Set<BankAccount> findAccountsByCustomerId(UUID customerId) {
     return customerById.containsKey(customerId)
         ? customerById.get(customerId).getAccounts().stream().collect(Collectors.toSet())
         : Set.of();
@@ -52,24 +47,18 @@ public Set<Account> findAccountsByCustomerId(UUID customerId) {
    * @param amount The amount to deposit.
    */
   public void depositFunds(String accountNumber, double amount) {
-    Account account = getAccountOrThrow(accountNumber);
-
-    if (account instanceof CheckingAccount) {
-        ((CheckingAccount) account).deposit(amount);
-    } else if (account instanceof BusinessAccount) {
-        ((BusinessAccount) account).deposit(amount);
-    } else {
-        throw new IllegalArgumentException("Unsupported account type");
-    }
+    BankAccount account = getAccountOrThrow(accountNumber);
+    account.deposit(amount);
+  }
 
   /**
    * Deposits funds into an account using a check.
    *
    * @param accountNumber The account number.
    * @param check The check to deposit.
    */
-  public void depositFunds(String accountNumber, Check check) {
-    CheckingAccount account = getAccountOrThrow(accountNumber);
+  public void depositFunds(String accountNumber, Check check) throws Exception {
+    BankAccount account = getAccountOrThrow(accountNumber);
     check.depositFunds(account);
   }
 
@@ -79,8 +68,8 @@ public void depositFunds(String accountNumber, Check check) {
    * @param accountNumber
    * @param amount
    */
-  public void withdrawFunds(String accountNumber, double amount) {
-    CheckingAccount account = getAccountOrThrow(accountNumber);
+  public void withdrawFunds(String accountNumber, double amount) throws Exception {
+    BankAccount account = getAccountOrThrow(accountNumber);
     account.withdraw(amount);
   }
 
@@ -90,8 +79,8 @@ public void withdrawFunds(String accountNumber, double amount) {
    * @param accountNumber The account number.
    * @return The account.
    */
-  private CheckingAccount getAccountOrThrow(String accountNumber) {
-    CheckingAccount account = accountByNumber.get(accountNumber);
+  private BankAccount getAccountOrThrow(String accountNumber) {
+    BankAccount account = accountByNumber.get(accountNumber);
     if (account == null || account.isClosed()) {
       throw new AccountNotFoundException("Account not found");
     }

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

@@ -0,0 +1,23 @@
+package com.codedifferently.lesson17.bank;
+
+import com.codedifferently.lesson17.bank.exceptions.InvalidBusinessAccountException;
+import java.util.Set;
+
+/**
+ * Creates a business account.
+ *
+ * @param accountNumber The account number.
+ * @param owners The owners of the account.
+ * @param initialBalance The initial balance of the account.
+ */
+public class BusinessCheckingAccount extends CheckingAccount {
+  public BusinessCheckingAccount(
+      String accountNumber, Set<Customer> owners, double initialBalance) {
+    super(accountNumber, owners, initialBalance);
+
+    boolean hasBusinessOwner = owners.stream().anyMatch(customer -> customer.isBusiness());
+    if (!hasBusinessOwner) {
+      throw new InvalidBusinessAccountException("At least one owner must be a business.");
+    }
+  }
+}

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

@@ -2,34 +2,27 @@
 
 import com.codedifferently.lesson17.bank.exceptions.CheckVoidedException;
 
-/** Represents a check. */
 public class Check {
 
   private final String checkNumber;
   private final double amount;
   private final CheckingAccount account;
   private boolean isVoided = false;
-  private final SavingsAccount savings;
 
   /**
    * Creates a new check.
    *
    * @param checkNumber The check number.
    * @param amount The amount of the check.
-   * @param account The account the check is drawn on. Because account is represents checking it could also represent savings.so if 
-   * we call saving account saving we should be able to throw the exception on the check.
+   * @param account The account the check is drawn on.
    */
-  public Check(String checkNumber, double amount, CheckingAccount account, SavingsAccount savings) {
-    if (checkNumber == null || checkNumber.isEmpty()) {
-      throw new IllegalArgumentException("Check number cannot be null or empty");
-    }
-    if (amount < 0 ) {
+  public Check(String checkNumber, double amount, CheckingAccount account) {
+    if (amount < 0) {
       throw new IllegalArgumentException("Check amount must be positive");
     }
     this.checkNumber = checkNumber;
     this.amount = amount;
     this.account = account;
-    this.savings = null;
   }
 
   /**
@@ -50,8 +43,9 @@ public void voidCheck() {
    * Deposits the check into an account.
    *
    * @param toAccount The account to deposit the check into.
+   * @throws Exception
    */
-  public void depositFunds(CheckingAccount toAccount) {
+  public void depositFunds(BankAccount toAccount) throws Exception {
     if (isVoided) {
       throw new CheckVoidedException("Check is voided");
     }

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

@@ -2,10 +2,8 @@
 
 import java.util.Set;
 
-import com.codedifferently.lesson17.bank.exceptions.InsufficientFundsException;
-
 /** Represents a checking account. */
-public class CheckingAccount {
+public class CheckingAccount extends BankAccount {
 
   private final Set<Customer> owners;
   private final String accountNumber;
@@ -20,103 +18,13 @@ public class CheckingAccount {
    * @param initialBalance The initial balance of the account.
    */
   public CheckingAccount(String accountNumber, Set<Customer> owners, double 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;
-  }
-
-  /**
-   * Deposits funds into the account.
-   *
-   * @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;
-  }
-
-  /**
-   * 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.
-   *
-   * @return The balance of the account.
-   */
-  public double getBalance() {
-    return balance;
-  }
-
-  /** Closes the account. */
-  public void closeAccount() throws IllegalStateException {
-    if (balance > 0) {
-      throw new IllegalStateException("Cannot close account with a positive balance");
-    }
-    isActive = false;
-  }
-
-  /**
-   * Checks if the account is closed.
-   *
-   * @return True if the account is closed, otherwise false.
-   */
-  public boolean isClosed() {
-    return !isActive;
-  }
-
-  @Override
-  public int hashCode() {
-    return accountNumber.hashCode();
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (obj instanceof CheckingAccount other) {
-      return accountNumber.equals(other.accountNumber);
-    }
-    return false;
-  }
-
   @Override
   public String toString() {
     return "CheckingAccount{"

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

@@ -7,19 +7,25 @@
 /** Represents a customer of the bank. */
 public class Customer {
 
+  static boolean isBusinessStatic() {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
   private final UUID id;
   private final String name;
-  private final Set<CheckingAccount> accounts = new HashSet<>();
+  private final Set<BankAccount> accounts = new HashSet<>();
+  private final boolean isBusiness;
 
   /**
    * Creates a new customer.
    *
    * @param id The ID of the customer.
    * @param name The name of the customer.
    */
-  public Customer(UUID id, String name) {
+  public Customer(UUID id, String name, boolean isBusiness) {
     this.id = id;
     this.name = name;
+    this.isBusiness = isBusiness;
   }
 
   /**
@@ -41,11 +47,20 @@ public String getName() {
   }
 
   /**
-   * Adds a checking account to the customer.
+   * Adds a checking account to the customer. Checks if this is a business
    *
-   * @param account The account to add.
+   * @return True if this is a business, otherwise false.
    */
-  public void addAccount(CheckingAccount account) {
+  public boolean isBusiness() {
+    return isBusiness;
+  }
+
+  /**
+   * Adds an account to the customer.
+   *
+   * @param checkingAccount2 The account to add.
+   */
+  public void addAccount(BankAccount account) {
     accounts.add(account);
   }
 
@@ -54,7 +69,7 @@ public void addAccount(CheckingAccount account) {
    *
    * @return The unique set of accounts owned by the customer.
    */
-  public Set<CheckingAccount> getAccounts() {
+  public Set<BankAccount> getAccounts() {
     return accounts;
   }
 
@@ -63,13 +78,13 @@ public int hashCode() {
     return id.hashCode();
   }
 
-  @Override
+/*@Override
   public boolean equals(Object obj) {
     if (obj instanceof Customer other) {
       return id.equals(other.id);
     }
     return false;
-  }
+  } */
 
   @Override
   public String toString() {