Deposit transfer

.gitignore

@@ -2,11 +2,15 @@
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff
+target/
+.idea/
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
+.idea/misc.xml
+.idea/SoftwareEngineeringPractice.iml
 
 # Generated files
 .idea/**/contentModel.xml
@@ -93,4 +97,6 @@ Icon
 .AppleDesktop
 Network Trash Folder
 Temporary Items
-.apdisk
+.apdisk
+
+SoftwareEngineeringPracticeBank.iml

SoftwareEngineeringPractice.iml

@@ -1,2 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-runner:1.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-launcher:1.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-suite-api:1.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.vintage:junit-vintage-engine:4.12.0" level="project" />
+  </component>
+</module>

src/main/java/edu/ithaca/dragon/bank/AdminAPI.java

@@ -0,0 +1,15 @@
+package edu.ithaca.dragon.bank;
+
+import java.util.Collection;
+
+public interface AdminAPI {
+
+    public double calcTotalAssets();
+
+    public Collection<String> findAcctIdsWithSuspiciousActivity();
+
+    public void freezeAccount(String acctId);
+
+    public void unfreezeAcct(String acctId);
+
+}

src/main/java/edu/ithaca/dragon/bank/AdvancedAPI.java

@@ -0,0 +1,10 @@
+package edu.ithaca.dragon.bank;
+
+//API to be used by Teller systems
+public interface AdvancedAPI extends BasicAPI {
+
+
+    public void createAccount(String acctId, String email, String password, double startingBalance);
+
+    public void closeAccount(String acctId);
+}

src/main/java/edu/ithaca/dragon/bank/BankAccount.java

@@ -1,17 +1,34 @@
 package edu.ithaca.dragon.bank;
 
+import java.util.regex.Pattern;
+
 public class BankAccount {
 
     private String email;
     private double balance;
+    private String password;
+    private String acctId;
+
+
+
+    public BankAccount(String email, double startingBalance) {
+        this("", email, "", startingBalance);
+    }
 
     /**
      * @throws IllegalArgumentException if email is invalid
      */
-    public BankAccount(String email, double startingBalance){
+    public BankAccount(String acctId, String email, String password, double startingBalance){
         if (isEmailValid(email)){
-            this.email = email;
-            this.balance = startingBalance;
+            if(isAmountValid(startingBalance)){
+                this.acctId = acctId;
+                this.email = email;
+                this.balance = startingBalance;
+                this.password = password;
+            }
+            else{
+                throw new IllegalArgumentException("starting Balance of " + startingBalance + "is an invalid amount to add");
+            }
         }
         else {
             throw new IllegalArgumentException("Email address: " + email + " is invalid, cannot create account");
@@ -28,19 +45,67 @@ public String getEmail(){
 
     /**
      * @post reduces the balance by amount if amount is non-negative and smaller than balance
+     * throws InsufficientFundsException if the amount is larger than the balance
+     * If balance is negative or has more than 2 decimal places, throws IllegalArgumentException
      */
-    public void withdraw (double amount)  {
-        balance -= amount;
+    public void withdraw (double amount) throws InsufficientFundsException, IllegalArgumentException  {
+        if(!isAmountValid(amount)){
+            throw new IllegalArgumentException("Amount must have 2 decimal places and must be positive ");
+        }
+        if (balance >= amount && amount >= 0) {
+            balance -= amount;
+        }
+        else{
+            throw new InsufficientFundsException("Amount requested is more than in your account by " + (amount - balance));
+        }
 
     }
 
-
-    public static boolean isEmailValid(String email){
-        if (email.indexOf('@') == -1){
-            return false;
+    /**
+     * @post adds to the balance by amount if amount is non-negative and has 2 or less decimal places
+     * @throws IllegalArgumentException if amount is negative or has more than 2 decimal places
+     */
+    public void deposit(double amount) throws IllegalArgumentException{
+        if(!isAmountValid(amount)){
+            throw new IllegalArgumentException("Amount must have 2 or less decimal places and must be positive");
         }
-        else {
-            return true;
+        balance += amount;
+    }
+
+    /**
+     * @post transfers funds from one bank account to the one passed in, as long as amount is non-negative and has 2 or less decimal places
+     * @throws IllegalArgumentException if amount is negative or has more than 2 decimal places, or if bankAccount to transfer to is the current one
+     * @throws InsufficientFundsException if amount is larger than current bank account balance
+     */
+    public void transfer(double amount, BankAccount toTransfer) throws InsufficientFundsException, IllegalArgumentException{
+            if(!isAmountValid(amount) || toTransfer == this){
+                throw new IllegalArgumentException("Amount must be positive, have 2 decimals or less, and transfer to a new bank account");
+            }
+            this.withdraw(amount);
+            toTransfer.deposit(amount);
+    }
+
+    /**
+     * @post checks to see if a double is a valid input to be withdrawn
+     * Returns false if double has more than 2 decimal places, or is negative
+     */
+    public static boolean isAmountValid(double amount){
+        double positiveRoundOff = Math.abs(Math.round(amount * 100.0) / 100.0);
+        if(amount != positiveRoundOff){
+
+            String doubleCheck = Double.toString(Math.abs(amount));
+            int integerPlaces = doubleCheck.indexOf('.');
+            int decimalPlaces = doubleCheck.length() - integerPlaces - 1;
+            return (decimalPlaces <= 2 || doubleCheck.indexOf('E') != -1) && !(amount < 0);
         }
+        return true;
+    }
+
+    public static boolean isEmailValid(String email){
+        return email.matches("(\\w)+((_|\\.|-)+\\w+)*@(\\w)+((-)?\\w+)*\\.\\w{2,}$");
+    }
+
+    public String getPassword() {
+        return password;
     }
 }

src/main/java/edu/ithaca/dragon/bank/BasicAPI.java

@@ -0,0 +1,20 @@
+package edu.ithaca.dragon.bank;
+
+//API to be used by ATMs
+public interface BasicAPI {
+
+    boolean confirmCredentials(String acctId, String password);
+
+    double checkBalance(String acctId);
+
+    void withdraw(String acctId, double amount) throws InsufficientFundsException;
+
+    void deposit(String acctId, double amount);
+
+    void transfer(String acctIdToWithdrawFrom, String acctIdToDepositTo, double amount) throws InsufficientFundsException;
+
+    String transactionHistory(String acctId);
+
+
+
+}

src/main/java/edu/ithaca/dragon/bank/CentralBank.java

@@ -0,0 +1,119 @@
+package edu.ithaca.dragon.bank;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+public class CentralBank implements AdvancedAPI, AdminAPI {
+
+    //----------------- BasicAPI methods -------------------------//
+
+
+    public Map<String, BankAccount>accountMap = new HashMap<>();
+
+
+
+
+
+    public boolean confirmCredentials(String acctId, String password){
+
+        if(accountMap.containsKey(acctId)){
+            return accountMap.get(acctId).getPassword().equals(password);
+        }
+
+
+
+        return false;
+    }
+
+
+    public double checkBalance(String acctId) throws IllegalArgumentException {
+        if(!accountMap.containsKey(acctId)){
+            throw new IllegalArgumentException("Account does not exist with name: " + acctId);
+        }
+        return accountMap.get(acctId).getBalance();
+    }
+
+    public void withdraw(String acctId, double amount) throws InsufficientFundsException, IllegalArgumentException {
+        if(!accountMap.containsKey(acctId)){
+            throw new IllegalArgumentException("Account does not exist with name: " + acctId);
+        }
+
+        accountMap.get(acctId).withdraw(amount);
+    }
+
+
+    public void deposit(String acctId, double amount) throws IllegalArgumentException {
+        if(!accountMap.containsKey(acctId)){
+            throw new IllegalArgumentException("Account does not exist with ID" + acctId);
+        }
+
+        accountMap.get(acctId).deposit(amount);
+
+
+    }
+
+    public void transfer(String acctIdToWithdrawFrom, String acctIdToDepositTo, double amount) throws IllegalArgumentException, InsufficientFundsException {
+        if(!accountMap.containsKey(acctIdToWithdrawFrom) || !accountMap.containsKey(acctIdToDepositTo) || acctIdToWithdrawFrom.equals(acctIdToDepositTo)){
+            throw new IllegalArgumentException("Account does not exist with IDs given");
+
+        }
+
+        if(accountMap.get(acctIdToWithdrawFrom).getBalance() < amount){
+            throw new InsufficientFundsException("Account does not have enough money");
+        }
+
+
+        accountMap.get(acctIdToWithdrawFrom).withdraw(amount);
+        accountMap.get(acctIdToDepositTo).deposit(amount);
+
+
+
+    }
+
+    public String transactionHistory(String acctId) {
+        return null;
+    }
+
+
+    //----------------- AdvancedAPI methods -------------------------//
+
+
+    public void createAccount(String acctId, String email, String password, double startingBalance) {
+        BankAccount account = new BankAccount(acctId, email, password, startingBalance);
+        accountMap.put(acctId, account);
+
+    }
+
+
+
+
+    public void closeAccount(String acctId) {
+        accountMap.remove(acctId);
+
+
+
+
+
+    }
+
+
+    //------------------ AdminAPI methods -------------------------//
+
+    public double calcTotalAssets() {
+        return 0;
+    }
+
+    public Collection<String> findAcctIdsWithSuspiciousActivity() {
+        return null;
+    }
+
+    public void freezeAccount(String acctId) {
+
+    }
+
+    public void unfreezeAcct(String acctId) {
+
+    }
+
+}

src/main/java/edu/ithaca/dragon/bank/CheckingAccount.java

@@ -0,0 +1,10 @@
+package edu.ithaca.dragon.bank;
+
+public class CheckingAccount extends BankAccount {
+    /**
+     * @throws IllegalArgumentException if email is invalid
+     */
+    public CheckingAccount(String email, double startingBalance) {
+        super(email, startingBalance);
+    }
+}