Skip to content

feat: implements SavingsAccount & BusinessCheckingAccount class #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
package com.codedifferently.lesson17.bank;

import com.codedifferently.lesson17.bank.exceptions.InsufficientFundsException;
import java.util.Set;
import lombok.Getter;
import lombok.Setter;

/** Abstract base class for all bank accounts. */
@Getter
@Setter
public abstract class Account {
private final Set<Customer> owners;
private final String accountNumber;
private double balance;
private boolean isActive;

/**
* Creates a new account.
*
* @param accountNumber The account number.
* @param owners The owners of the account.
* @param initalBalance The inital balance of the account.
*/
public Account(String accountNumber, Set<Customer> owners, double initalBalance) {
this.accountNumber = accountNumber;
this.owners = owners;
this.balance = initalBalance;
this.isActive = true;
}

/**
* 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;
}

/** 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.getAccountNumber());
}
return false;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
public class BankAtm {

private final Map<UUID, Customer> customerById = new HashMap<>();
private final Map<String, CheckingAccount> accountByNumber = new HashMap<>();
private final Map<String, Account> accountByNumber = new HashMap<>();

/**
* Adds a checking account to the bank.
*
* @param account The account to add.
*/
public void addAccount(CheckingAccount account) {
public void addAccount(Account account) {
accountByNumber.put(account.getAccountNumber(), account);
account
.getOwners()
Expand All @@ -33,7 +33,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<CheckingAccount> findAccountsByCustomerId(UUID customerId) {
public Set<Account> findAccountsByCustomerId(UUID customerId) {
return customerById.containsKey(customerId)
? customerById.get(customerId).getAccounts()
: Set.of();
Expand All @@ -46,7 +46,7 @@ public Set<CheckingAccount> findAccountsByCustomerId(UUID customerId) {
* @param amount The amount to deposit.
*/
public void depositFunds(String accountNumber, double amount) {
CheckingAccount account = getAccountOrThrow(accountNumber);
Account account = getAccountOrThrow(accountNumber);
account.deposit(amount);
}

Expand All @@ -57,8 +57,13 @@ public void depositFunds(String accountNumber, double amount) {
* @param check The check to deposit.
*/
public void depositFunds(String accountNumber, Check check) {
CheckingAccount account = getAccountOrThrow(accountNumber);
check.depositFunds(account);
Account account = getAccountOrThrow(accountNumber);

if (account instanceof CheckingAccount checkingAccount) {
check.depositFunds(checkingAccount);
} else if (account instanceof SavingsAccount) {
throw new IllegalStateException("Savings Accounts can't accept checks");
}
}

/**
Expand All @@ -68,7 +73,7 @@ public void depositFunds(String accountNumber, Check check) {
* @param amount
*/
public void withdrawFunds(String accountNumber, double amount) {
CheckingAccount account = getAccountOrThrow(accountNumber);
Account account = getAccountOrThrow(accountNumber);
account.withdraw(amount);
}

Expand All @@ -78,8 +83,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 Account getAccountOrThrow(String accountNumber) {
Account account = accountByNumber.get(accountNumber);
if (account == null || account.isClosed()) {
throw new AccountNotFoundException("Account not found");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package com.codedifferently.lesson17.bank;

import java.util.Set;

/** Represents a business checking account */
public class BusinessCheckingAccount extends CheckingAccount {

/**
* Creates a new business checking account
*
* @param accountNumber The accounnt 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);
}

/**
* Checks if at least one owner is a business.
*
* @param owners The owers of the account.
* @throws IllegalArgumentEception If no business owner is found.
*/
private void validateBusinessOwner(Set<Customer> owners) {
boolean hasBusinessOwner = owners.stream().anyMatch(Customer::isBusiness);
if (!hasBusinessOwner) {
throw new IllegalArgumentException(
"Business Checking Account must have at least one business owner");
}
}

@Override
public String toString() {
return "BusinessCheckingAccount{"
+ "accountNumber='"
+ getAccountNumber()
+ '\''
+ ", balance="
+ getBalance()
+ ", isActive="
+ isActive()
+ '}';
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void voidCheck() {
*
* @param toAccount The account to deposit the check into.
*/
public void depositFunds(CheckingAccount toAccount) {
public void depositFunds(Account toAccount) {
if (isVoided) {
throw new CheckVoidedException("Check is voided");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
package com.codedifferently.lesson17.bank;

import com.codedifferently.lesson17.bank.exceptions.InsufficientFundsException;
import java.util.Set;

/** Represents a checking account. */
public class CheckingAccount {

private final Set<Customer> owners;
private final String accountNumber;
private double balance;
private boolean isActive;
public class CheckingAccount extends Account {

/**
* Creates a new checking account.
Expand All @@ -19,113 +13,19 @@ public class CheckingAccount {
* @param initialBalance The initial balance of the account.
*/
public CheckingAccount(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 CheckingAccount other) {
return accountNumber.equals(other.accountNumber);
}
return false;
super(accountNumber, owners, initialBalance);
}

@Override
public String toString() {
return "CheckingAccount{"
+ "accountNumber='"
+ accountNumber
+ getAccountNumber()
+ '\''
+ ", balance="
+ balance
+ getBalance()
+ ", isActive="
+ isActive
+ isActive()
+ '}';
}
}
Loading