Test script

.gitignore

@@ -1,6 +1,9 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
+target/
+
+
 # User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml

README.md

@@ -1,10 +1,21 @@
 # SoftwareEngineeringPractice
-## grading
-
-To Do | correct
----|---
-at least 8 commits|
-isEmailValid|
-withdraw|
-isamountValid|
-constructor & withdraw fix|
+
+Link to state diagram: https://drive.google.com/file/d/1BPTHJmOLGr9hiQ0BJnvLTYXEDLRx6saK/view?usp=sharing
+
+link to Ioan's sequence diagram: https://drive.google.com/file/d/1fHwd0fRkoscI03Zu2G8p7B5D6bBiBh87/view?usp=sharing
+link to Aidan's sequence diagram: https://drive.google.com/file/d/1L447NcwgO0GbktDt5HXLOZCDhwc7hFZX/view?usp=sharing
+
+* UML Diagram - https://drive.google.com/file/d/1BKs9DEbUAkv-ynNGjp099HZ6vRylucr6/view?usp=sharing
+* Use Case Diagram - https://drive.google.com/file/d/1OTOZ-MegXgHVpB8rYiUERVfmFXZhzAlF/view?usp=sharing
+* freeze account sequence diagram - https://drive.google.com/file/d/19AFoU-Of_jHAxNgIwXVeigCMnlGSpC1D/view?usp=sharing
+* unfreeze account sequence diagram - https://drive.google.com/file/d/1AA96lVdDmQhyHeB5tIYJtLMJNSpWDMh1/view?usp=sharing
+
+
+Plan for Friday:
+Update the class diagram to better include the user class.
+Update the use case diagram to include confirm credentials and check balances. As well as clarify "request report"
+Change our code to better implement the user. Change the code to work again with both the collection of bankaccount and user.
+
+Aidan - Code review notes:
+Class diagram - savings & checkings should inherit, transaction should be a composition to BankAccount
+Code - tests for multiple suspicious transactions, timestamps - multiple rapid transactions

pom.xml

@@ -10,7 +10,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.10</java.version>
+        <java.version>1.13</java.version>
 
         <junit.version>4.12</junit.version>
         <junit.jupiter.version>5.0.0</junit.jupiter.version>

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

@@ -0,0 +1,151 @@
+package edu.ithaca.dragon.bank;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+public class ATM implements BasicAPI {
+    CentralBank bank;
+
+    public ATM(CentralBank bank) {
+        this.bank = bank;
+    }
+
+    public boolean confirmCredentials(String username, String password) {
+
+        Iterator<User> itr = this.bank.users.iterator();
+        while (itr.hasNext()) {
+            User current = itr.next();
+            if (current.getUsername().equals(username)) {
+                if (current.getPassword().equals(password)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public User getUser(String username, String password) {
+        Iterator<User> itr = this.bank.users.iterator();
+        while (itr.hasNext()) {
+            User current = itr.next();
+            if (current.getUsername().equals(username)) {
+                if (current.getPassword().equals(password)) {
+                    return current;
+                }
+            }
+        }
+        return null;
+    }
+
+    public double checkBalance(String acctId) {
+        Iterator<BankAccount> itr = this.bank.accounts.iterator();
+        while (itr.hasNext()) {
+            BankAccount current = itr.next();
+            if (current.getAcctId().equals(acctId)) {
+                return current.getBalance();
+            }
+        }
+        throw new IllegalArgumentException("invalid account id");
+    }
+
+
+    public void withdraw(String acctId, double amount) throws InsufficientFundsException, IllegalArgumentException {
+        Iterator<BankAccount> itr = this.bank.accounts.iterator();
+        while (itr.hasNext()) {
+            BankAccount current = itr.next();
+            if (current.getAcctId().equals(acctId)) {
+                if (!current.isAmountValid(amount)) {
+                    throw new IllegalArgumentException("Invalid Amount");
+                }
+
+                if (current.getBalance() < amount) {
+                    throw new InsufficientFundsException("Not enough funds");
+                }
+                if (current.isAmountValid(amount)) {
+                    double balance = current.getBalance();
+                    balance -= amount;
+                    current.setBalance(balance);
+                    return;
+                }
+            }
+        }
+        throw new IllegalArgumentException("invalid account id");
+
+    }
+
+    public void deposit(String acctId, double amount) {
+        Iterator<BankAccount> itr = this.bank.accounts.iterator();
+        while (itr.hasNext()) {
+            BankAccount current = itr.next();
+            if (current.getAcctId() == acctId) {
+                if (current.isAmountValid(amount)) {
+                    double balance = current.getBalance();
+                    balance += amount;
+                    current.setBalance(balance);
+                    return;
+                }
+                if (!current.isAmountValid(amount)) {
+                    throw new IllegalArgumentException("Invalid Amount");
+                }
+
+            }
+        }
+        throw new IllegalArgumentException("invalid account id");
+
+    }
+
+    public void transfer(String acctIdToWithdrawFrom, String acctIdToDepositTo, double amount) throws InsufficientFundsException {
+        int count = 0;
+        Iterator<BankAccount> itr = this.bank.accounts.iterator();
+        while (itr.hasNext()) {
+            BankAccount current = itr.next();
+            if (current.getAcctId().equals(acctIdToWithdrawFrom)) {
+                if (!current.isAmountValid(amount)) {
+                    throw new IllegalArgumentException("Invalid Amount");
+                }
+                if (current.getBalance() < amount) {
+                    throw new InsufficientFundsException("Not enough funds");
+                }
+                if (current.isAmountValid(amount)) {
+                    double balance = current.getBalance();
+                    balance -= amount;
+                    current.setBalance(balance);
+                    count += 1;
+                }
+            }
+
+            if (current.getAcctId().equals(acctIdToDepositTo)) {
+                if (!current.isAmountValid(amount)) {
+                    throw new IllegalArgumentException("Invalid Amount");
+                }
+
+                if (current.isAmountValid(amount)) {
+                    double balance = current.getBalance();
+                    balance += amount;
+                    current.setBalance(balance);
+                    count += 1;
+                }
+            }
+        }
+        if (count == 2) {
+            return;
+        } else {
+            throw new IllegalArgumentException("invalid account id");
+        }
+
+    }
+
+    public ArrayList transactionHistory(String acctId) {
+        Iterator<BankAccount> itr = this.bank.accounts.iterator();
+        while (itr.hasNext()) {
+            BankAccount current = itr.next();
+            if (current.getAcctId().equals(acctId)) {
+                return current.getTransactionHistory();
+            }
+        }
+        throw new IllegalArgumentException("Invalid account id");
+    }
+}
+