Skip to content
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

Formicary: My-Bank (Pamela) #338

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>20</maven.compiler.source>
<maven.compiler.target>20</maven.compiler.target>
</properties>

<dependencies>
Expand All @@ -20,5 +22,22 @@
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.9</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
73 changes: 0 additions & 73 deletions src/main/java/com/abc/Account.java

This file was deleted.

46 changes: 0 additions & 46 deletions src/main/java/com/abc/Bank.java

This file was deleted.

78 changes: 0 additions & 78 deletions src/main/java/com/abc/Customer.java

This file was deleted.

16 changes: 0 additions & 16 deletions src/main/java/com/abc/Transaction.java

This file was deleted.

49 changes: 49 additions & 0 deletions src/main/java/com/mybank/Accounts/Account.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package com.mybank.Accounts;

import com.mybank.Transaction;
import com.mybank.Utlities.AccountType;
import com.mybank.Utlities.TransactionType;

import java.util.ArrayList;
import java.util.List;

public abstract class Account {
private final AccountType accountType;
public List<Transaction> transactions;

public Account(AccountType accountType) {
this.accountType = accountType;
this.transactions = new ArrayList<>();
}

public abstract double interestEarned();

public void deposit(double amount) {
if (amount <= 0) {
throw new IllegalArgumentException("amount must be greater than zero");
} else {
transactions.add(new Transaction(amount, TransactionType.DEPOSIT));
}
}

public void withdraw(double amount) {
if (amount <= 0) {
throw new IllegalArgumentException("amount must be greater than zero");
} else if (amount > sumTransactions()) {
throw new IllegalArgumentException("Amount exceeds Account balance");
} else {
transactions.add(new Transaction(-amount, TransactionType.WITHDRAWAL));
}
}

public double sumTransactions() {
double amount = 0.0;
for (Transaction transaction : transactions)
amount += transaction.amount;
return amount;
}

public AccountType getAccountType() {
return accountType;
}
}
15 changes: 15 additions & 0 deletions src/main/java/com/mybank/Accounts/CheckingAccount.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.mybank.Accounts;

import com.mybank.Utlities.AccountType;

public class CheckingAccount extends Account {
public CheckingAccount() {
super(AccountType.CHECKING);
}

@Override
public double interestEarned() {
double amount = sumTransactions();
return amount * 0.001;
}
}
25 changes: 25 additions & 0 deletions src/main/java/com/mybank/Accounts/MaxiSavingsAccount.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.mybank.Accounts;

import com.mybank.Transaction;
import com.mybank.Utlities.AccountType;
import com.mybank.Utlities.DateProvider;
import com.mybank.Utlities.TransactionType;

public class MaxiSavingsAccount extends Account {
public MaxiSavingsAccount() {
super(AccountType.MAXI_SAVINGS);
}

@Override
public double interestEarned() {
double amount = sumTransactions();
for (Transaction transaction : transactions) {
if (transaction.getTransactionDate().isAfter(DateProvider.getInstance().tenDays())
&& transaction.getTransactionType().equals(TransactionType.WITHDRAWAL)) {
return amount * 0.001;
}
}
return amount * 0.05;
}

}
19 changes: 19 additions & 0 deletions src/main/java/com/mybank/Accounts/SavingsAccount.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.mybank.Accounts;

import com.mybank.Utlities.AccountType;

public class SavingsAccount extends Account {
public SavingsAccount() {
super(AccountType.SAVINGS);
}

@Override
public double interestEarned() {
double amount = sumTransactions();
if (amount <= 1000)
return amount * 0.001;
else
return (amount - 1000) * 0.002;
}

}
Loading