lesson 17 mark2

Author: jxwatson251

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

@@ -1,24 +1,23 @@
 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 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, Account> accountByNumber = new HashMap<>();
+  private final Map<String, CheckingAccount> accountByNumber = new HashMap<>();
 
   /**
-   * Adds an account to the bank.
+   * Adds a checking account to the bank.
    *
    * @param account The account to add.
    */
-  public void addAccount(Account account) {
+  public void addAccount(CheckingAccount account) {
     accountByNumber.put(account.getAccountNumber(), account);
     account
         .getOwners()
@@ -35,8 +34,9 @@ public void addAccount(Account account) {
    * @return The unique set of accounts owned by the customer.
    */
   public Set<CheckingAccount> findAccountsByCustomerId(UUID customerId) {
-    Customer customer = customerById.get(customerId);
-    return customer != null ? customer.getAccounts() : Set.of();
+    return customerById.containsKey(customerId)
+        ? customerById.get(customerId).getAccounts()
+        : Set.of();
   }
 
   /**
@@ -46,7 +46,7 @@ public Set<CheckingAccount> findAccountsByCustomerId(UUID customerId) {
    * @param amount The amount to deposit.
    */
   public void depositFunds(String accountNumber, double amount) {
-    Account account = getAccountOrThrow(accountNumber);
+    CheckingAccount account = getAccountOrThrow(accountNumber);
     account.deposit(amount);
   }
 
@@ -55,10 +55,9 @@ public void depositFunds(String accountNumber, double amount) {
    *
    * @param accountNumber The account number.
    * @param check The check to deposit.
-   * @throws Exception
    */
-  public void depositFunds(String accountNumber, Check check) throws Exception {
-    Account account = getAccountOrThrow(accountNumber);
+  public void depositFunds(String accountNumber, Check check) {
+    CheckingAccount account = getAccountOrThrow(accountNumber);
     check.depositFunds(account);
   }
 
@@ -67,10 +66,9 @@ public void depositFunds(String accountNumber, Check check) throws Exception {
    *
    * @param accountNumber
    * @param amount
-   * @throws Exception
    */
-  public void withdrawFunds(String accountNumber, double amount) throws Exception {
-    Account account = getAccountOrThrow(accountNumber);
+  public void withdrawFunds(String accountNumber, double amount) {
+    CheckingAccount account = getAccountOrThrow(accountNumber);
     account.withdraw(amount);
   }
 
@@ -80,11 +78,11 @@ public void withdrawFunds(String accountNumber, double amount) throws Exception
    * @param accountNumber The account number.
    * @return The account.
    */
-  private Account getAccountOrThrow(String accountNumber) {
-    Account account = accountByNumber.get(accountNumber);
+  private CheckingAccount getAccountOrThrow(String accountNumber) {
+    CheckingAccount account = accountByNumber.get(accountNumber);
     if (account == null || account.isClosed()) {
       throw new AccountNotFoundException("Account not found");
     }
     return account;
   }
-}
+}

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

@@ -0,0 +1,10 @@
+package com.codedifferently.lesson17.bank;
+
+import java.util.Set;
+
+public class BusinessCheckingSavingsAccount extends CheckingAccount {
+  public BusinessCheckingSavingsAccount(
+      String accountNumber, Set<Customer> owners, double initialBalance) {
+    super(accountNumber, owners, initialBalance);
+  }
+}

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

@@ -43,14 +43,14 @@ public void voidCheck() {
   /**
    * Deposits the check into an account.
    *
-   * @param account2 The account to deposit the check into.
+   * @param toAccount The account to deposit the check into.
    */
-  public void depositFunds(Account account2) {
+  public void depositFunds(CheckingAccount toAccount) {
     if (isVoided) {
       throw new CheckVoidedException("Check is voided");
     }
     account.withdraw(amount);
-    account2.deposit(amount);
+    toAccount.deposit(amount);
     voidCheck();
   }
 
@@ -79,9 +79,4 @@ public String toString() {
         + account.getAccountNumber()
         + '}';
   }
-
-  public double getAmount() {
-    // TODO Auto-generated method stub
-    throw new UnsupportedOperationException("Unimplemented method 'getAmount'");
-  }
 }

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

@@ -1,9 +1,131 @@
 package com.codedifferently.lesson17.bank;
 
+import com.codedifferently.lesson17.bank.exceptions.InsufficientFundsException;
 import java.util.Set;
 
-public class CheckingAccount extends Account {
+/** Represents a checking account. */
+public class CheckingAccount {
+
+  private final Set<Customer> owners;
+  private final String accountNumber;
+  protected double balance;
+  private boolean isActive;
+
+  /**
+   * Creates a new checking account.
+   *
+   * @param accountNumber The account number.
+   * @param owners The owners of the account.
+   * @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{"
+        + "accountNumber='"
+        + accountNumber
+        + '\''
+        + ", balance="
+        + balance
+        + ", isActive="
+        + isActive
+        + '}';
   }
-}
+}