lesson 17 homework mark1

Author: jxwatson251

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

@@ -1,19 +1,20 @@
 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<>();
 
   /**
-   * Adds a checking or savings account to the bank.
+   * Adds an account to the bank.
    *
    * @param account The account to add.
    */
@@ -27,26 +28,15 @@ public void addAccount(Account account) {
             });
   }
 
-  public void addAccount(SavingsAccount account) {
-    accountByNumber.put(account.getAccountNumber(), account);
-    account
-        .getOwners()
-        .forEach(
-            owner -> {
-              customerById.put(owner.getId(), owner);
-            });
-  }
-
   /**
    * Finds all accounts owned by a customer.
    *
    * @param customerId The ID of the customer.
    * @return The unique set of accounts owned by the customer.
    */
   public Set<CheckingAccount> findAccountsByCustomerId(UUID customerId) {
-    return customerById.containsKey(customerId)
-        ? customerById.get(customerId).getAccounts()
-        : Set.of();
+    Customer customer = customerById.get(customerId);
+    return customer != null ? customer.getAccounts() : Set.of();
   }
 
   /**
@@ -65,8 +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) {
+  public void depositFunds(String accountNumber, Check check) throws Exception {
     Account account = getAccountOrThrow(accountNumber);
     check.depositFunds(account);
   }
@@ -76,8 +67,9 @@ public void depositFunds(String accountNumber, Check check) {
    *
    * @param accountNumber
    * @param amount
+   * @throws Exception
    */
-  public void withdrawFunds(String accountNumber, double amount) {
+  public void withdrawFunds(String accountNumber, double amount) throws Exception {
     Account account = getAccountOrThrow(accountNumber);
     account.withdraw(amount);
   }
@@ -95,4 +87,4 @@ private Account getAccountOrThrow(String accountNumber) {
     }
     return account;
   }
-}
+}

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

@@ -1,131 +1,10 @@
 package com.codedifferently.lesson17.bank;
 
-import com.codedifferently.lesson17.bank.exceptions.InsufficientFundsException;
 import java.util.Set;
 
-/** Represents a savings account. */
-public class SavingsAccount {
-
-  private final Set<Customer> owners;
-  private final String accountNumber;
-  private double balance;
-  private boolean isActive;
-
-  /**
-   * Creates a new savings account.
-   *
-   * @param accountNumber The account number.
-   * @param owners The owners of the account.
-   * @param initialBalance The initial balance of the account.
-   */
+public class SavingsAccount extends Account {
   public SavingsAccount(String accountNumber, Set<Customer> owners, double 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 SavingsAccount other) {
-      return accountNumber.equals(other.accountNumber);
-    }
-    return false;
-  }
-
-  @Override
-  public String toString() {
-    return "SavingsAccount{"
-        + "accountNumber='"
-        + accountNumber
-        + '\''
-        + ", balance="
-        + balance
-        + ", isActive="
-        + isActive
-        + '}';
+    super(accountNumber, owners, initialBalance);
   }
-}
+  
+}