Project complete - see readme for use notes

.gitignore

@@ -1,6 +1,7 @@
 .idea/*
 *.iml
 target/
+data/
 .project
 .classpath
 .settings

ATMUML.uml

@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Diagram>
+  <ID>JAVA</ID>
+  <OriginalElement />
+  <nodes>
+    <node x="847.0818888888887" y="651.0">Account</node>
+    <node x="36.5" y="959.0">Savings</node>
+    <node x="657.4999999999999" y="1447.5">User</node>
+    <node x="565.5624999999999" y="1093.0">Storeable</node>
+    <node x="1098.8318888888887" y="982.5">Checking</node>
+    <node x="167.4999999999999" y="1426.0">Console</node>
+    <node x="297.6443888888887" y="1193.0">Transaction</node>
+    <node x="636.2643888888888" y="1862.0">ATM</node>
+    <node x="769.2643888888888" y="2953.0">Main</node>
+    <node x="888.75" y="0.0">DB</node>
+    <node x="904.8318888888887" y="948.0">Investment</node>
+  </nodes>
+  <notes />
+  <edges>
+    <edge source="User" target="Storeable">
+      <point x="118.0" y="-146.5" />
+      <point x="952.4999999999999" y="1406.0" />
+      <point x="897.3668333333331" y="1406.0" />
+      <point x="897.3668333333331" y="1168.0" />
+      <point x="708.0624999999999" y="1168.0" />
+      <point x="47.5" y="25.0" />
+    </edge>
+    <edge source="ATM" target="Savings">
+      <point x="-171.20000000000005" y="-520.5" />
+      <point x="679.0643888888887" y="1832.0" />
+      <point x="85.80433333333315" y="1832.0" />
+      <point x="85.80433333333315" y="1073.0" />
+      <point x="69.33333333333337" y="1073.0" />
+      <point x="-65.66666666666663" y="36.5" />
+    </edge>
+    <edge source="Account" target="Storeable">
+      <point x="-22.444444444444457" y="113.5" />
+      <point x="925.6374444444443" y="928.0" />
+      <point x="647.0624999999999" y="928.0" />
+      <point x="647.0624999999999" y="1073.0" />
+      <point x="660.5624999999999" y="1073.0" />
+      <point x="0.0" y="-25.0" />
+    </edge>
+    <edge source="Account" target="DB">
+      <point x="5.6843418860808015E-14" y="-113.5" />
+      <point x="948.0818888888888" y="631.0" />
+      <point x="1002.375" y="631.0" />
+      <point x="-37.875" y="300.5" />
+    </edge>
+    <edge source="Storeable" target="Savings">
+      <point x="-76.0" y="-25.0" />
+      <point x="584.5624999999999" y="1073.0" />
+      <point x="200.66666666666663" y="1073.0" />
+      <point x="65.66666666666663" y="36.5" />
+    </edge>
+    <edge source="Main" target="ATM">
+      <point x="40.5" y="-25.0" />
+      <point x="890.7643888888888" y="2928.0" />
+      <point x="957.2643888888888" y="2928.0" />
+      <point x="107.0" y="520.5" />
+    </edge>
+    <edge source="Transaction" target="Storeable">
+      <point x="0.0" y="-91.5" />
+      <point x="392.6443888888887" y="1168.0" />
+      <point x="613.0624999999999" y="1168.0" />
+      <point x="-47.5" y="25.0" />
+    </edge>
+    <edge source="Console" target="Transaction">
+      <point x="0.0" y="-168.0" />
+      <point x="402.4999999999999" y="1406.0" />
+      <point x="392.6443888888887" y="1406.0" />
+      <point x="0.0" y="91.5" />
+    </edge>
+    <edge source="ATM" target="Transaction">
+      <point x="-85.60000000000002" y="-520.5" />
+      <point x="764.6643888888888" y="1802.0" />
+      <point x="157.0" y="1802.0" />
+      <point x="157.0" y="1406.0" />
+      <point x="354.6443888888887" y="1406.0" />
+      <point x="-38.0" y="91.5" />
+    </edge>
+    <edge source="Investment" target="Storeable">
+      <point x="-21.625" y="47.5" />
+      <point x="969.7068888888887" y="1073.0" />
+      <point x="736.5624999999999" y="1073.0" />
+      <point x="76.0" y="-25.0" />
+    </edge>
+    <edge source="ATM" target="Investment">
+      <point x="57.06666666666672" y="-520.5" />
+      <point x="907.3310555555555" y="1792.0" />
+      <point x="1021.9999999999999" y="1792.0" />
+      <point x="1021.9999999999999" y="1073.0" />
+      <point x="1012.9568888888887" y="1073.0" />
+      <point x="21.625" y="47.5" />
+    </edge>
+    <edge source="ATM" target="Console">
+      <point x="-57.066666666666606" y="-520.5" />
+      <point x="793.1977222222222" y="1792.0" />
+      <point x="402.4999999999999" y="1792.0" />
+      <point x="0.0" y="168.0" />
+    </edge>
+    <edge source="ATM" target="Checking">
+      <point x="142.66666666666674" y="-520.5" />
+      <point x="992.9310555555555" y="1822.0" />
+      <point x="1149.8318888888887" y="1822.0" />
+      <point x="0.0" y="13.0" />
+    </edge>
+    <edge source="Savings" target="Account">
+      <point x="-49.249999999999886" y="-36.5" />
+      <point x="85.75000000000011" y="898.0" />
+      <point x="858.304111111111" y="898.0" />
+      <point x="-89.77777777777777" y="113.5" />
+    </edge>
+    <edge source="ATM" target="User">
+      <point x="28.533333333333303" y="-520.5" />
+      <point x="878.7977222222221" y="1782.0" />
+      <point x="952.4999999999999" y="1782.0" />
+      <point x="118.0" y="146.5" />
+    </edge>
+    <edge source="Storeable" target="Account">
+      <point x="-38.0" y="-25.0" />
+      <point x="622.5624999999999" y="1073.0" />
+      <point x="636.0624999999999" y="1073.0" />
+      <point x="636.0624999999999" y="918.0" />
+      <point x="903.1929999999999" y="918.0" />
+      <point x="-44.88888888888886" y="113.5" />
+    </edge>
+    <edge source="ATM" target="Account">
+      <point x="114.13333333333344" y="-520.5" />
+      <point x="964.3977222222222" y="1812.0" />
+      <point x="1088.3318888888887" y="1812.0" />
+      <point x="1088.3318888888887" y="918.0" />
+      <point x="992.9707777777776" y="918.0" />
+      <point x="44.88888888888886" y="113.5" />
+    </edge>
+    <edge source="ATM" target="DB">
+      <point x="171.20000000000002" y="-520.5" />
+      <point x="1021.4643888888888" y="1832.0" />
+      <point x="1211.3318888888887" y="1832.0" />
+      <point x="1211.3318888888887" y="631.0" />
+      <point x="1078.125" y="631.0" />
+      <point x="37.875" y="300.5" />
+    </edge>
+    <edge source="Checking" target="Account">
+      <point x="25.5" y="-13.0" />
+      <point x="1175.3318888888887" y="898.0" />
+      <point x="1037.8596666666665" y="898.0" />
+      <point x="89.77777777777777" y="113.5" />
+    </edge>
+    <edge source="Investment" target="Account">
+      <point x="43.25" y="-47.5" />
+      <point x="1034.5818888888887" y="928.0" />
+      <point x="970.5263333333332" y="928.0" />
+      <point x="22.444444444444457" y="113.5" />
+    </edge>
+    <edge source="User" target="Transaction">
+      <point x="0.0" y="-146.5" />
+      <point x="834.4999999999999" y="1396.0" />
+      <point x="468.6443888888887" y="1396.0" />
+      <point x="76.0" y="91.5" />
+    </edge>
+    <edge source="Storeable" target="Investment">
+      <point x="38.0" y="-25.0" />
+      <point x="698.5624999999999" y="1063.0" />
+      <point x="926.4568888888887" y="1063.0" />
+      <point x="-64.875" y="47.5" />
+    </edge>
+  </edges>
+  <settings layout="Hierarchic Group" zoom="1.0" x="389.0" y="1298.0" />
+  <SelectedNodes>
+    <node>Main</node>
+  </SelectedNodes>
+  <Categories>
+    <Category>Fields</Category>
+    <Category>Methods</Category>
+  </Categories>
+  <SCOPE>All</SCOPE>
+  <VISIBILITY>private</VISIBILITY>
+</Diagram>
+

README.md

@@ -1,5 +1,17 @@
 # Access Control Lab - Bank Account 
 The original lab can be found [here](https://gist.github.com/DavidGinzberg/5ccd3191eed52b04c4c3541fa2b2cbf7)
+## Notes for Use
+- The DB class defines database objects and a number of attendant methods to delete, search, modify, and add rows in the database
+- Information is stored in csv files in the /data folder. An example data set is included and will be run when you run `main()`. Any changes to accounts, users, or additional transactions will be saved there. These files are in the `.gitignore`, so any changes you make locally wouldn't overwrite them
+- One example user, for convenience of entry during testing, has card number 1 and password 1234
+- There are a couple of test database files (`test.db` and `testbad.csv` which are used in certain tests. Other tests create and destory temporary database files
+- Every time a user logs in, interest is earned on savings accounts and investments get returns, based on random chance and risk tolerance defined when creating the account
+- Interest rates go up and down by random amounts with a probability of 20%
+- Overdraft policies allow blocking such requests, allowing them, or attempting automatic transfer from another account
+- All of those changes are recorded as transactions
+- When closing an account, there is an option to transfer to another account, if the closing account isn't empty
+- Frozen accounts can't be viewed or modified, and don't earn interest/returns
+
 ## Description
 
 This lab focuses on implementing a simulated bank account and practicing using access control features of the Java language. By the end of this lab students should feel comfortable setting class members to be private or public, creating accessor and mutator functions for fields as needed, and using those methods to access the underlying fields.
@@ -28,13 +40,13 @@ Accounts must have:
 
 Code that uses the Account class should not be able to change the properties of an account directly; this should be something handled by methods provided by the account class. The methods should enforce the following behavior:
 
-- Account type and account number must be set during account creation (in the constructor) and cannot be changed afterward.
+- accounts.Account type and account number must be set during account creation (in the constructor) and cannot be changed afterward.
 - Balance inquiries are allowed at any time except while an account is under an OFAC freeze
 - The balance can be changed with a credit (add money) or debit (remove money)
   - Balance changes can only occur on `Open` accounts.
   - The `debit` and `credit` methods should return an approval status indicating whether the transaction was approved.
   - Accounts can transfer funds to or from another account with the same account holder -- Neither account's balance should fall below zero as a result of a transfer.
-- Account holder's name must be set during account creation. It can be changed later (but not on closed accounts)
+- accounts.Account holder's name must be set during account creation. It can be changed later (but not on closed accounts)
 - Accounts with overdraft prevention enabled cannot over-draw (a debit that is greater than the account balance will be declined and the balance will not change)
 - Accounts, once closed, cannot be reopened (frozen accounts can be unfrozen).
   - No changes to the balance of an account can take place while it is closed or frozen

data/accounts.csv

@@ -0,0 +1,6 @@
+"350","275","3810.0","Checking","ON","OPEN"
+"33","275","5556.84","Savings","0.24","OPEN"
+"2","275","88609.38","Investment","0.06","OPEN"
+"998","275","320.0","Checking","ON","CLOSED"
+"9198","275","30020.0","Checking","ON","OFAC"
+

data/test.csv

@@ -0,0 +1,4 @@
+"Item 1","Item 2","Item 3","Item 4"
+"Item 1b","Item 2b","Item 3b","Item 4b"
+"Item 1c","Item 2c","Item 3c","Item 4c"
+"Item 1d","Item 2d","Item 3d","Item 4d"

data/testBad.csv

@@ -0,0 +1,4 @@
+"Item 1","Item 2","Item 3","Item 4"
+"Item 1b","Item 2b","Item 3b","Item 4b"
+"Item 1c","Item 2c","Item 3c"
+"Item 1d","Item 2d","Item 3d","Item 4d"

data/transactions.csv

@@ -0,0 +1,23 @@
+"credit","172","2000.00","Sun Nov 10 11:53:50 EST 2019","Opened account"
+"debit","172","-1000.00","Sun Nov 10 11:54:02 EST 2019","Transfer to account 350"
+"credit","350","1000.00","Sun Nov 10 11:54:02 EST 2019","Transfer from account 172"
+"debit","172","-1000.00","Sun Nov 10 11:54:21 EST 2019","Transfer to account 350"
+"credit","350","1000.00","Sun Nov 10 11:54:21 EST 2019","Transfer from account 172"
+"debit","172","0.00","Sun Nov 10 11:54:21 EST 2019","Account Closed"
+"credit","33","5690.19","Sun Nov 10 11:56:40 EST 2019","Interest rate changed to 00.23"
+"credit","33","13.09","Sun Nov 10 11:56:40 EST 2019","Interest earned"
+"debit","2","-1175.84","Sun Nov 10 11:56:40 EST 2019","Investment returns"
+"credit","165","1000.00","Sun Nov 10 11:56:48 EST 2019","Opened account"
+"credit","33","13.12","Sun Nov 10 12:00:39 EST 2019","Interest earned"
+"credit","2","3000.22","Sun Nov 10 12:00:39 EST 2019","Investment returns"
+"debit","165","-1000.00","Sun Nov 10 12:00:53 EST 2019","Transfer to account 350"
+"credit","350","1000.00","Sun Nov 10 12:00:53 EST 2019","Transfer from account 165"
+"debit","165","0.00","Sun Nov 10 12:00:53 EST 2019","Account Closed"
+"credit","206","1000.00","Sun Nov 10 22:02:32 EST 2019","Opened account"
+"credit","33","5729.55","Sun Nov 10 22:54:34 EST 2019","Interest rate changed to 00.24"
+"credit","33","13.75","Sun Nov 10 22:54:34 EST 2019","Interest earned"
+"debit","2","-419.17","Sun Nov 10 22:54:34 EST 2019","Investment returns"
+"debit","33","-100.00","Sun Nov 10 22:56:04 EST 2019","ATM deposit"
+"credit","33","13.54","Sun Nov 10 22:56:43 EST 2019","Interest earned"
+"credit","2","2532.37","Sun Nov 10 22:56:43 EST 2019","Investment returns"
+"debit","33","-100.00","Sun Nov 10 22:56:49 EST 2019","ATM withdrawal"

data/users.csv

@@ -0,0 +1,6 @@
+"719","john","jimmy","90486264","blorp"
+"606","jones","jim","84170304","jimmy"
+"275","peasy","easy","1","1234"
+"827","davis","john","16690334","12345"
+"828","john","big","83500714","69"
+"829","jay","john","68428999","2345"

pom.xml

@@ -5,8 +5,35 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.zipcoder</groupId>
-    <artifactId>AccessControlLab-Bank Account</artifactId>
+    <artifactId>project-2-atm</artifactId>
     <version>1.0-SNAPSHOT</version>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>pl.pragmatists</groupId>
+            <artifactId>JUnitParams</artifactId>
+            <version>1.1.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.opencsv</groupId>
+            <artifactId>opencsv</artifactId>
+            <version>4.5</version>
+        </dependency>
+    </dependencies>
 
 </project>