From 5f206a7ad137ddf578a29cc5b0731d43f4e3fc7c Mon Sep 17 00:00:00 2001 From: blessed0886 <32852653+blessed0886@users.noreply.github.com> Date: Mon, 23 Oct 2017 16:55:07 -0400 Subject: [PATCH 1/7] Added ATM Log --- ATM Log | 1 + 1 file changed, 1 insertion(+) create mode 100644 ATM Log diff --git a/ATM Log b/ATM Log new file mode 100644 index 0000000..4b91f01 --- /dev/null +++ b/ATM Log @@ -0,0 +1 @@ +UzV2zq1wL0osyPDNT0nNUTV2VTV2LsrPL4GwciucU3NyVI0MMlNUjV1UjYwMgFjVyA2HrCFY1qAgsSg1rwSLBiADYTaQg2Y1AA== \ No newline at end of file From 92d6c3c24fb6748eeac41519582664e8a1bdb0e2 Mon Sep 17 00:00:00 2001 From: donald f Date: Tue, 24 Oct 2017 11:13:36 -0400 Subject: [PATCH 2/7] i have no clue what I am doing :-( --- pom.xml | 12 + src/main/java/t/ATMFunctions/ATM.java | 76 ++++++ src/main/java/t/ATMFunctions/Console.java | 18 ++ src/main/java/{ => t/ATMFunctions}/Main.java | 5 +- src/main/java/t/Accounts/Accounts.java | 229 +++++++++++++++++++ src/main/java/t/Accounts/Checking.java | 9 + src/main/java/t/Accounts/Investment.java | 9 + src/main/java/t/Accounts/Saving.java | 9 + src/main/java/t/Tests/ATMTest.java | 5 + src/main/java/t/User/User.java | 25 ++ src/main/java/t/User/UserFactory.java | 17 ++ src/main/java/t/User/UserWarehouse.java | 11 + 12 files changed, 424 insertions(+), 1 deletion(-) create mode 100644 src/main/java/t/ATMFunctions/ATM.java create mode 100644 src/main/java/t/ATMFunctions/Console.java rename src/main/java/{ => t/ATMFunctions}/Main.java (55%) create mode 100644 src/main/java/t/Accounts/Accounts.java create mode 100644 src/main/java/t/Accounts/Checking.java create mode 100644 src/main/java/t/Accounts/Investment.java create mode 100644 src/main/java/t/Accounts/Saving.java create mode 100644 src/main/java/t/Tests/ATMTest.java create mode 100644 src/main/java/t/User/User.java create mode 100644 src/main/java/t/User/UserFactory.java create mode 100644 src/main/java/t/User/UserWarehouse.java diff --git a/pom.xml b/pom.xml index 9901415..965ff30 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,18 @@ io.zipcoder project-2-atm 1.0-SNAPSHOT + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.7 + 1.7 + + + + \ No newline at end of file diff --git a/src/main/java/t/ATMFunctions/ATM.java b/src/main/java/t/ATMFunctions/ATM.java new file mode 100644 index 0000000..797f9bc --- /dev/null +++ b/src/main/java/t/ATMFunctions/ATM.java @@ -0,0 +1,76 @@ +package t.ATMFunctions; + +import t.Accounts.Console; + +public class ATM { + + public void start() { + + System.out.println("Welcome to Zip Code Wilmington Federal Credit Union.\n"); + int userInput = Console.getIntInput("If you have an account please input '1' if you do not have an account please input '2'."); + boolean terminator = false; + + while(terminator!=false) { + switch (userInput) { + case 1: + //call login method + break; + case 2: + //call create new user method from user factory + break; + default: + System.out.println("Please enter a correct response.\n"); + userInput = Console.getIntInput("If you have an account please input '1' if you do not have an account please input '2'."); + continue; + } + terminator = false; + } + + + + + + + + + + + /*System.out.println("Welcome to the ATM Machine.\n"); + System.out.println("From here you have several options."); + printOptions(); + String userInput = Terminal.getStringInput("Enter the command that you would like to execute."); + switch (userInput) { + case "WITHDRAW": + Withdraw withdraw = new Withdraw(); + break; + + case "DEPOSIT": + break; + + case "TRANSFER": + break; + + case "OPEN NEW ACCOUNT": + break; + + case "CLOSER ACCOUNT": + break; + + case "PRINT TRANSACTION HISTORY": + break; + + case "CHECK BALANCE": + break; + + default: + System.out.println("Please enter an appropriate command."); + break; + } + } + + private void printOptions() { + System.out.println("WITHDRAW\nDEPOSIT\nTRANSFER\nOPEN NEW ACCOUNT\nCLOSE ACCOUNT\nPRINT TRANSACTION HISTORY\nCHECK BALANCE\n");*/ + + + } +} diff --git a/src/main/java/t/ATMFunctions/Console.java b/src/main/java/t/ATMFunctions/Console.java new file mode 100644 index 0000000..3e70c8f --- /dev/null +++ b/src/main/java/t/ATMFunctions/Console.java @@ -0,0 +1,18 @@ +package t.ATMFunctions; + +import java.util.Scanner; + +public class Console { + public static String getStringInput(String promptUser) { + Scanner string = new Scanner(System.in); + System.out.println(promptUser); + String userInput = string.nextLine(); + return userInput;} + + public static int getIntInput(String askUser) { + Scanner integer = new Scanner(System.in); + System.out.println(askUser); + int Input = integer.nextInt(); + return Input; + } +} diff --git a/src/main/java/Main.java b/src/main/java/t/ATMFunctions/Main.java similarity index 55% rename from src/main/java/Main.java rename to src/main/java/t/ATMFunctions/Main.java index 05e41a9..b037b65 100644 --- a/src/main/java/Main.java +++ b/src/main/java/t/ATMFunctions/Main.java @@ -1,9 +1,12 @@ +package t.ATMFunctions; + /** * Created by iyasuwatts on 10/17/17. */ public class Main { public static void main(String[] args){ - + ATM atmTransaction = new ATM(); + atmTransaction.start(); } } diff --git a/src/main/java/t/Accounts/Accounts.java b/src/main/java/t/Accounts/Accounts.java new file mode 100644 index 0000000..4a74972 --- /dev/null +++ b/src/main/java/t/Accounts/Accounts.java @@ -0,0 +1,229 @@ +package t.Accounts; + +import t.ATMFunctions.Console; + + +public abstract class Accounts { + + private String createAccount() { + + int userInput = Console.getIntInput("Please input what type of account you'd like to create.\n" + + "Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); + + boolean terminator = false; + + while (terminator = true) { + switch (userInput) { + case 1: + //create a checking account + break; + case 2: + //create a savings account + break; + case 3: + //create an investment account + default: + System.out.println("Please enter a correct response.\n"); + userInput = Console.getIntInput("Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); + continue; + } + terminator = false; + } + return ""; //what type of account they created + } + + private String deleteAccount() { + int userInput = Console.getIntInput("Please input what type of account you'd like to delete.\n" + + "Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); + + boolean terminator = false; + + while (terminator = true) { + switch (userInput) { + case 1: + //delete a checking account + break; + case 2: + //delete a savings account + break; + case 3: + //delete an investment account + default: + System.out.println("Please enter a correct response.\n"); + userInput = Console.getIntInput("Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); + continue; + } + terminator = false; + } + return "";//what account they just delete + } + + private String viewAccount() { + int userInput = Console.getIntInput("Please input what type of account you'd like to view.\n" + + "Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); + + boolean terminator = false; + + while (terminator = true) { + switch (userInput) { + case 1: + //view a checking account + break; + case 2: + //view a savings account + break; + case 3: + //view an investment account + default: + System.out.println("Please enter a correct response.\n"); + userInput = Console.getIntInput("Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); + continue; + } + terminator = false; + } + return "";//the info for the account they chose to view + } + + private void transferBetweenAccounts() { + int userInput = Console.getIntInput("Please input which accounts that you'd like to transfer money between.\n" + + "Please indicate what account you'd like to transfer FROM by\n" + + " entering '1' for checking account, entering '2' for savings account and entering'3' for an investment account."); + + boolean terminator = false; + + while (terminator = true) { + switch (userInput) { + case 1: + //view checking account balance + break; + case 2: + //view savings account balance + break; + case 3: + //view investment account balance + default: + System.out.println("Please enter a correct response.\n"); + userInput = Console.getIntInput("Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); + continue; + } + terminator = false; + } + + userInput += Console.getIntInput("Please indicate what account you'd like to transfer TO by\n" + + " entering '1' for checking account, entering '2' for savings account and entering'3' for an investment account."); + + while (terminator = true) { + switch (userInput) { + case 1: + //view checking account balance + break; + case 2: + //view savings account balance + break; + case 3: + //view investment account balance + default: + System.out.println("Please enter a correct response.\n"); + userInput = Console.getIntInput("Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); + continue; + } + terminator = false; + + //call view method to show user account information for both accounts + + int amountToTransfer = Console.getIntInput("How much money would you like to transfer between accounts?"); + + //transfer the desired amount between specified accounts + + } + } + private String depositMoney(){ + + int userInput = Console.getIntInput("Please indicate which account you'd like to deposit money into.\n" + + "Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); + + boolean terminator = false; + + while (terminator = true) { + switch (userInput) { + case 1: + //view checking account balance + break; + case 2: + //view savings account nalance + break; + case 3: + //view investment account balance + default: + System.out.println("Please enter a correct response.\n"); + userInput = Console.getIntInput("Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); + continue; + } + terminator = false; + + int amountToDeposit = Console.getIntInput("How much money would you like to deposit?"); + + //call method to deposit indicated amount into indicated account + } + return "";//new account balance + } + + private String withDrawMoney(){ + + int userInput = Console.getIntInput("Please indicate which account you'd like to withdraw money from.\n" + + "Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); + + boolean terminator = false; + + while (terminator = true) { + switch (userInput) { + case 1: + //view checking account balance + break; + case 2: + //view savings account nalance + break; + case 3: + //view investment account balance + default: + System.out.println("Please enter a correct response.\n"); + userInput = Console.getIntInput("Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); + continue; + } + terminator = false; + + int amountToDeposit = Console.getIntInput("How much money would you like to withdraw?\n" + + "All withdraw requests must be in $20 and no more than $600."); + + //call method to withdraw indicated amount from indicated account + } + return "";//new account balance + } + + private void interestedAccrued() { + + int userInput = Console.getIntInput("Please indicate which account you'd like to view accrued interest.\n" + + "Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); + + boolean terminator = false; + + while (terminator = true) { + switch (userInput) { + case 1: + //view checking account interest + break; + case 2: + //view savings account interest + break; + case 3: + //view investment account insterest + default: + System.out.println("Please enter a correct response.\n"); + userInput = Console.getIntInput("Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); + continue; + } + terminator = false; + + } + } +} \ No newline at end of file diff --git a/src/main/java/t/Accounts/Checking.java b/src/main/java/t/Accounts/Checking.java new file mode 100644 index 0000000..7bc6456 --- /dev/null +++ b/src/main/java/t/Accounts/Checking.java @@ -0,0 +1,9 @@ +package t.Accounts; + +import t.Accounts.Accounts; + +public class Checking extends Accounts { + + + +} diff --git a/src/main/java/t/Accounts/Investment.java b/src/main/java/t/Accounts/Investment.java new file mode 100644 index 0000000..940f2c9 --- /dev/null +++ b/src/main/java/t/Accounts/Investment.java @@ -0,0 +1,9 @@ +package t.Accounts; + +import t.Accounts.Accounts; + +public class Investment extends Accounts { + + + +} diff --git a/src/main/java/t/Accounts/Saving.java b/src/main/java/t/Accounts/Saving.java new file mode 100644 index 0000000..bc6c26a --- /dev/null +++ b/src/main/java/t/Accounts/Saving.java @@ -0,0 +1,9 @@ +package t.Accounts; + +import t.Accounts.Accounts; + +public class Saving extends Accounts { + + + +} diff --git a/src/main/java/t/Tests/ATMTest.java b/src/main/java/t/Tests/ATMTest.java new file mode 100644 index 0000000..2dcdcd7 --- /dev/null +++ b/src/main/java/t/Tests/ATMTest.java @@ -0,0 +1,5 @@ +package t.Tests; + + +public class ATMTest { +} diff --git a/src/main/java/t/User/User.java b/src/main/java/t/User/User.java new file mode 100644 index 0000000..e1030b3 --- /dev/null +++ b/src/main/java/t/User/User.java @@ -0,0 +1,25 @@ +package t.User; + +public class User { + private String name; + private Integer accountNumber; + private String password; + + public User(String name, int accountNumber, String password) { + this.name = name; + this.accountNumber = accountNumber; + this.password = password; + } + + public String getName() { + return name; + } + + public int getAge() { + return this.accountNumber; + } + + public String isFemale() { + return password; + } +} diff --git a/src/main/java/t/User/UserFactory.java b/src/main/java/t/User/UserFactory.java new file mode 100644 index 0000000..fe4b7f4 --- /dev/null +++ b/src/main/java/t/User/UserFactory.java @@ -0,0 +1,17 @@ +package t.User; + +public class UserFactory { + + + /* public static User createUser() { + String name = Terminal.getStringInput("Please enter your first and last name: "); + String password = Terminal.getStringInput("Please create a password using no more then 10 digits: "); + + User newUser = new User(); + //UserWarehouse.addUser(newUser); + + + return newUser; + } +*/ +} diff --git a/src/main/java/t/User/UserWarehouse.java b/src/main/java/t/User/UserWarehouse.java new file mode 100644 index 0000000..21b1ca7 --- /dev/null +++ b/src/main/java/t/User/UserWarehouse.java @@ -0,0 +1,11 @@ +package t.User; + +public class UserWarehouse { + + public static void addUser(){ + + //store users information + + } + +} From 4a9b31cab06e07f76f395b2e2ee5077e8738aed2 Mon Sep 17 00:00:00 2001 From: blessed0886 <32852653+blessed0886@users.noreply.github.com> Date: Tue, 24 Oct 2017 13:51:09 -0400 Subject: [PATCH 3/7] Update ATM Log --- ATM Log | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ATM Log b/ATM Log index 4b91f01..352be0e 100644 --- a/ATM Log +++ b/ATM Log @@ -1 +1 @@ -UzV2zq1wL0osyPDNT0nNUTV2VTV2LsrPL4GwciucU3NyVI0MMlNUjV1UjYwMgFjVyA2HrCFY1qAgsSg1rwSLBiADYTaQg2Y1AA== \ No newline at end of file +7Vrfb6M4EP5reNwTP0Kae2yy29uVWu3pcqd7dsABXwEj2ynp/vU3BhsIpglJSNQHqkjF47GN55tvZgxY3ird/8FQHr/QECeWa4d7y/tqua4z82z4JyXvlWRhO5UgYiRUSo1gTX5hJVTjoh0JMT9QFJQmguSHwoBmGQ7EgQwxRotDtS1NDlfNUYQNwTpAiSn9l4QiVrvw7Ub+HZMo1is7turZoOA1YnSXqfUs19uWf1V3ivRcSp/HKKRFS+R9s7wVo1RUV+l+hRNpW222atzTB731fTOciSED3GrAG0p2auuPf7+oWxPv2hxFTARe5yiQ7QIgt7xlLNIEWg5cIp5XIGzJHsPESzUpZgLvP7wxp94uuBGmKRbsHVTUAG+hLFQ09p8rUdwyvZYhhXhUz9TsGi7UxvuN4BtGsNx5Agssd3ARyYvHQBCacS2HGesuLQvJmxYVRMQhQ0VLvdXbMyDEOeVEDNYPYhy8lu6WoAxQGTyOYSRA3c5wIY0WBOCqw5cFmuNy+LkDO+vuOGb3umfBUMa3cj17g0WBcXbBJFq0YV1Jd2iHOWUokJwoiXKKRwmJMrhO8LaZ7CoWOZoedRw2SOX4PaxyxqDV/DStfm7+g8gxlFb/lG5jk0xgtkVnuP1jBTc/B2+USnSyDc/Ltj1AtJKsJFl042XW6O32i/zI3jAXKT7HagqfJxQIKl3lUzPkCCOcPkY4IzDi99OMUDb80fi4vUoQH0qRCIs6vgJR8t2HMe6TwKDT/YBA5fbA4o+AimMGqiZg2Hy3kYWmxAAq0q7ZeEFSSMHQWm5pJtaqp22kAEssQSANRKDGfFQdguZlKidJ+Ize6U5uiQsoIHVrGVNGfsG0SBseuplQ5TLE17bGWo4EsQ1Shjno/Kmt73REL2h/oPiMuFCCgCYJyjnZ1NtIEYtItqRC0FQp6U0/kSRZ0YSy0ha60B3FH+aL0/7QVw469mwEh3gwHOKL5GEd3jtOANsUJTiMvmJtkIxWXtGykRJ12NPvFhzIB2s9lzpfZ43kL7VZKaIwdpuU54eYhCGUNgApFUigCj8JVk6JdGS4UX8JP7DZyv7Nt3y48RW0naYNP6nOxAoqXSibSAkVBucoMB/O8/nReKurglNAar2rcDTjrcRR588JxYtR9N37odhzRv1SZshWgTJBeTGUD4s7QukZUHZrxmH51b46cfa4wafMpeOXWr7bSa2e6QCzW6VWd9ZL5oOyNUMpnih9DOCKR2fl2D5ER6G0+fBMAlo/tFGY1g9cJlgvhrUv6d4MVvNM1AdrDqeigrJwwvUKXPsy8M1wNY82rbMuTBdTE8wpCY+ehLvnW0+fOU+WYfZiBC9YHGf3FK2HsPrh7CR8s7q6/6Brvq6Z8LwYz3seeT3HwNNy5VP64y+zJnQvRveep2Cd2w1067fAdgqQmIfhCdDhgNan1bsg+hFfmw8BJkivh9Qb+BJgFEjNp44VpBBt2U4mVSJ3Knc3YXoFpv4dyyTPDLyyTHojhx+WTHBeDufidlUSNJvv4sq+1seH3rf/AQ== \ No newline at end of file From 57fd4819bd855d03809c5c25e19b2c6971256bfc Mon Sep 17 00:00:00 2001 From: donald f Date: Wed, 25 Oct 2017 01:08:37 -0400 Subject: [PATCH 4/7] I'm trying to make it better --- pom.xml | 13 +++- .../RoughCopy/ATMFunctions/ATM.java | 33 ++++++++ .../RoughCopy}/ATMFunctions/Console.java | 2 +- .../RoughCopy/ATMFunctions/Main.java | 21 +++++ .../RoughCopy/ATMProjectTest/ATMTest.java | 23 ++++++ .../ATMProjectTest/CheckingTest.java | 4 + .../ATMProjectTest/InvestmentTest.java | 4 + .../RoughCopy/ATMProjectTest/MainTest.java | 4 + .../RoughCopy/ATMProjectTest/SavingTest.java | 4 + .../ATMProjectTest/UserFactoryTest.java | 4 + .../RoughCopy/ATMProjectTest/UserTest.java | 4 + .../ATMProjectTest/UserWarehouseTest.java | 4 + .../RoughCopy/Accounts/Account2.java | 32 ++++++++ .../RoughCopy}/Accounts/Accounts.java | 22 ++++-- .../RoughCopy/Accounts/Checking.java | 7 ++ .../RoughCopy/Accounts/Investment.java | 7 ++ .../atmproject/RoughCopy/Accounts/Saving.java | 7 ++ .../atmproject/RoughCopy}/User/User.java | 14 ++-- .../RoughCopy/User/UserFactory.java | 25 ++++++ .../RoughCopy/User/UserWarehouse.java | 24 ++++++ .../bettercopy/ATMFunctions/ATM.java | 13 ++++ .../bettercopy/ATMFunctions/Console.java | 27 +++++++ .../bettercopy}/ATMFunctions/Main.java | 7 +- .../bettercopy/ATMFunctions/PromptUser.java | 21 +++++ .../bettercopy/AccountFunctions/Account.java | 48 ++++++++++++ .../bettercopy/UserFunctions/User.java | 35 +++++++++ .../bettercopy/UserFunctions/UserFactory.java | 11 +++ .../UserFunctions/UserWarehouse.java | 5 ++ src/main/java/t/ATMFunctions/ATM.java | 76 ------------------- src/main/java/t/Accounts/Checking.java | 9 --- src/main/java/t/Accounts/Investment.java | 9 --- src/main/java/t/Accounts/Saving.java | 9 --- src/main/java/t/Tests/ATMTest.java | 5 -- src/main/java/t/User/UserFactory.java | 17 ----- src/main/java/t/User/UserWarehouse.java | 11 --- 35 files changed, 407 insertions(+), 154 deletions(-) create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/ATMFunctions/ATM.java rename src/main/java/{t => fountain/donald/atmproject/RoughCopy}/ATMFunctions/Console.java (89%) create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/ATMFunctions/Main.java create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/ATMTest.java create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/CheckingTest.java create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/InvestmentTest.java create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/MainTest.java create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/SavingTest.java create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/UserFactoryTest.java create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/UserTest.java create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/UserWarehouseTest.java create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Account2.java rename src/main/java/{t => fountain/donald/atmproject/RoughCopy}/Accounts/Accounts.java (92%) create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Checking.java create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Investment.java create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Saving.java rename src/main/java/{t => fountain/donald/atmproject/RoughCopy}/User/User.java (52%) create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/User/UserFactory.java create mode 100644 src/main/java/fountain/donald/atmproject/RoughCopy/User/UserWarehouse.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/ATM.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/Console.java rename src/main/java/{t => foutain/donald/atmproject/bettercopy}/ATMFunctions/Main.java (50%) create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/PromptUser.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Account.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/User.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserFactory.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserWarehouse.java delete mode 100644 src/main/java/t/ATMFunctions/ATM.java delete mode 100644 src/main/java/t/Accounts/Checking.java delete mode 100644 src/main/java/t/Accounts/Investment.java delete mode 100644 src/main/java/t/Accounts/Saving.java delete mode 100644 src/main/java/t/Tests/ATMTest.java delete mode 100644 src/main/java/t/User/UserFactory.java delete mode 100644 src/main/java/t/User/UserWarehouse.java diff --git a/pom.xml b/pom.xml index 965ff30..7ba8c0f 100644 --- a/pom.xml +++ b/pom.xml @@ -13,12 +13,21 @@ org.apache.maven.plugins maven-compiler-plugin - 1.7 - 1.7 + 1.8 + 1.8 + + + + junit + junit + 4.12 + + + \ No newline at end of file diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/ATMFunctions/ATM.java b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMFunctions/ATM.java new file mode 100644 index 0000000..ca06bfd --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMFunctions/ATM.java @@ -0,0 +1,33 @@ +package fountain.donald.atmproject.RoughCopy.ATMFunctions; + + +public class ATM { + + /*public void bullShit(){ + String userInput = Console.getStringInput("Ask for password"); + } + + public void start(String bullShit) { + + System.out.println("Welcome to Zip Code Wilmington Federal Credit Union.\n"); + int userInput = Console.getIntInput("If you have an account please input '1' if you do not have an account please input '2'."); + + boolean terminator = false; + + while(terminator == false) { + switch (bullShit) { + case 1: + Accounts.userLogin(); + terminator = true; + break; + case 2: + UserFactory.createUser(); + terminator = true; + break; + default: + System.out.println("Please enter a correct response.\n"); + userInput = Console.getIntInput("If you have an account please input '1' if you do not have an account please input '2'."); + } + } + }*/ +} diff --git a/src/main/java/t/ATMFunctions/Console.java b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMFunctions/Console.java similarity index 89% rename from src/main/java/t/ATMFunctions/Console.java rename to src/main/java/fountain/donald/atmproject/RoughCopy/ATMFunctions/Console.java index 3e70c8f..674d3a0 100644 --- a/src/main/java/t/ATMFunctions/Console.java +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMFunctions/Console.java @@ -1,4 +1,4 @@ -package t.ATMFunctions; +package fountain.donald.atmproject.RoughCopy.ATMFunctions; import java.util.Scanner; diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/ATMFunctions/Main.java b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMFunctions/Main.java new file mode 100644 index 0000000..f8b6f49 --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMFunctions/Main.java @@ -0,0 +1,21 @@ +package fountain.donald.atmproject.RoughCopy.ATMFunctions; + +import fountain.donald.atmproject.RoughCopy.Accounts.Account2; + +/** + * Created by iyasuwatts on 10/17/17. + */ +public class Main { + + public static void main(String[] args){ + + // ATM atmTransaction = new ATM(); + // atmTransaction.start(); + Console console=new Console(); + Account2 donaldsAccount = new Account2(100.00); + donaldsAccount.withdrawMoney((double)(console.getIntInput("Enter withdrawal amount"))); + System.out.println("The new balance is: " + donaldsAccount.getAccountBalance()); + + + } +} diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/ATMTest.java b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/ATMTest.java new file mode 100644 index 0000000..92e272a --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/ATMTest.java @@ -0,0 +1,23 @@ +package fountain.donald.atmproject.RoughCopy.ATMProjectTest; + + +import fountain.donald.atmproject.RoughCopy.ATMFunctions.ATM; +import org.junit.Test; + +public class ATMTest { + + @Test + public void startTest(){ + //Given: + ATM atm = new ATM(); + String output = "Welcome to Zip Code Wilmington Federal Credit Union.\n" + + "If you have an account please input '1' if you do not have an account please input '2'.\n" + + ""; + + + //Expected: + + + //Actual: + } +} diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/CheckingTest.java b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/CheckingTest.java new file mode 100644 index 0000000..556fcfc --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/CheckingTest.java @@ -0,0 +1,4 @@ +package fountain.donald.atmproject.RoughCopy.ATMProjectTest; + +public class CheckingTest { +} diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/InvestmentTest.java b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/InvestmentTest.java new file mode 100644 index 0000000..601108f --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/InvestmentTest.java @@ -0,0 +1,4 @@ +package fountain.donald.atmproject.RoughCopy.ATMProjectTest; + +public class InvestmentTest { +} diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/MainTest.java b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/MainTest.java new file mode 100644 index 0000000..9c50b84 --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/MainTest.java @@ -0,0 +1,4 @@ +package fountain.donald.atmproject.RoughCopy.ATMProjectTest; + +public class MainTest { +} diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/SavingTest.java b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/SavingTest.java new file mode 100644 index 0000000..97eece1 --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/SavingTest.java @@ -0,0 +1,4 @@ +package fountain.donald.atmproject.RoughCopy.ATMProjectTest; + +public class SavingTest { +} diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/UserFactoryTest.java b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/UserFactoryTest.java new file mode 100644 index 0000000..8a5f092 --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/UserFactoryTest.java @@ -0,0 +1,4 @@ +package fountain.donald.atmproject.RoughCopy.ATMProjectTest; + +public class UserFactoryTest { +} diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/UserTest.java b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/UserTest.java new file mode 100644 index 0000000..b75df9e --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/UserTest.java @@ -0,0 +1,4 @@ +package fountain.donald.atmproject.RoughCopy.ATMProjectTest; + +public class UserTest { +} diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/UserWarehouseTest.java b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/UserWarehouseTest.java new file mode 100644 index 0000000..216c74c --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/UserWarehouseTest.java @@ -0,0 +1,4 @@ +package fountain.donald.atmproject.RoughCopy.ATMProjectTest; + +public class UserWarehouseTest { +} diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Account2.java b/src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Account2.java new file mode 100644 index 0000000..c6afb96 --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Account2.java @@ -0,0 +1,32 @@ +package fountain.donald.atmproject.RoughCopy.Accounts; + +import java.util.ArrayList; + +public class Account2 +{ + + private int accountNumber; + + private double accountBalance; + + private String typeOfAccount; + + private ArrayList transactionHistory; + + public Account2(double initialBalance) + { + this.accountBalance=initialBalance; + } + + public double getAccountBalance(){ + + return this.accountBalance; + } + + public double withdrawMoney(double withdrawAmount){ + + this.accountBalance -= withdrawAmount; + + return accountBalance; + } +} diff --git a/src/main/java/t/Accounts/Accounts.java b/src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Accounts.java similarity index 92% rename from src/main/java/t/Accounts/Accounts.java rename to src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Accounts.java index 4a74972..1c87dfc 100644 --- a/src/main/java/t/Accounts/Accounts.java +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Accounts.java @@ -1,14 +1,17 @@ -package t.Accounts; +package fountain.donald.atmproject.RoughCopy.Accounts; -import t.ATMFunctions.Console; +import fountain.donald.atmproject.RoughCopy.ATMFunctions.Console; +import fountain.donald.atmproject.RoughCopy.User.UserWarehouse; public abstract class Accounts { - private String createAccount() { - int userInput = Console.getIntInput("Please input what type of account you'd like to create.\n" + - "Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); + + private String createAccount(int userInput) { + + //userInput = Console.getIntInput("Please input what type of account you'd like to create.\n" + + //"Please enter '1' for checking account, enter '2' for savings account and enter'3' for an investment account."); boolean terminator = false; @@ -226,4 +229,13 @@ private void interestedAccrued() { } } + public static void userLogin(){ + + String userInput = Console.getStringInput("Please enter your first and last name, account number, and password"); + + if(UserWarehouse.getUsers().equals(userInput)){ + //get user accounts + } + + } } \ No newline at end of file diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Checking.java b/src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Checking.java new file mode 100644 index 0000000..cbf6355 --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Checking.java @@ -0,0 +1,7 @@ +package fountain.donald.atmproject.RoughCopy.Accounts; + +public class Checking extends Accounts { + + + +} diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Investment.java b/src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Investment.java new file mode 100644 index 0000000..dc80079 --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Investment.java @@ -0,0 +1,7 @@ +package fountain.donald.atmproject.RoughCopy.Accounts; + +public class Investment extends Accounts { + + + +} diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Saving.java b/src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Saving.java new file mode 100644 index 0000000..aa71370 --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/Accounts/Saving.java @@ -0,0 +1,7 @@ +package fountain.donald.atmproject.RoughCopy.Accounts; + +public class Saving extends Accounts { + + + +} diff --git a/src/main/java/t/User/User.java b/src/main/java/fountain/donald/atmproject/RoughCopy/User/User.java similarity index 52% rename from src/main/java/t/User/User.java rename to src/main/java/fountain/donald/atmproject/RoughCopy/User/User.java index e1030b3..af9b7ce 100644 --- a/src/main/java/t/User/User.java +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/User/User.java @@ -1,9 +1,9 @@ -package t.User; +package fountain.donald.atmproject.RoughCopy.User; public class User { - private String name; - private Integer accountNumber; - private String password; + public static String name; + public static Integer accountNumber; + public static String password; public User(String name, int accountNumber, String password) { this.name = name; @@ -15,11 +15,11 @@ public String getName() { return name; } - public int getAge() { - return this.accountNumber; + public int getAccountNumber() { + return accountNumber; } - public String isFemale() { + public String getPassword() { return password; } } diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/User/UserFactory.java b/src/main/java/fountain/donald/atmproject/RoughCopy/User/UserFactory.java new file mode 100644 index 0000000..61f447f --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/User/UserFactory.java @@ -0,0 +1,25 @@ +package fountain.donald.atmproject.RoughCopy.User; + +import fountain.donald.atmproject.RoughCopy.ATMFunctions.Console; + +import java.util.Random; + +public class UserFactory extends User { + + public UserFactory(String name, int accountNumber, String password) { + super(name, accountNumber, password); + } + + public static User createUser(String bullShit){ + String name = Console.getStringInput("Please enter your first and last name: "); + String password = Console.getStringInput("Please create a password using no more then 10 digits: "); + Random rnd = new Random(); + int accountNumber = 100000 + rnd.nextInt(900000);; + System.out.println("Your account number is: " + accountNumber); + + User newUser = new User(name, accountNumber, password); + + + return newUser; + } +} diff --git a/src/main/java/fountain/donald/atmproject/RoughCopy/User/UserWarehouse.java b/src/main/java/fountain/donald/atmproject/RoughCopy/User/UserWarehouse.java new file mode 100644 index 0000000..04645e1 --- /dev/null +++ b/src/main/java/fountain/donald/atmproject/RoughCopy/User/UserWarehouse.java @@ -0,0 +1,24 @@ +package fountain.donald.atmproject.RoughCopy.User; + +import java.util.ArrayList; + +public class UserWarehouse extends User { + + public UserWarehouse(String name, int accountNumber, String password) { + super(name, accountNumber, password); + } + + private static ArrayList users = new ArrayList(); + + public ArrayList setUser(User newUser) { + + users.add(newUser); + return users; + + } + + public static ArrayList getUsers() { + return users; + } +} + diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/ATM.java b/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/ATM.java new file mode 100644 index 0000000..9d2e12d --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/ATM.java @@ -0,0 +1,13 @@ +package foutain.donald.atmproject.bettercopy.ATMFunctions; + +public class ATM { + + public int startATM(){ + int userInput = PromptUser.userStartATM(); + return userInput; + } + + public static void userOption(){ + System.out.println("User Options are: "); + } +} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/Console.java b/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/Console.java new file mode 100644 index 0000000..7fe5490 --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/Console.java @@ -0,0 +1,27 @@ +package foutain.donald.atmproject.bettercopy.ATMFunctions; + +import java.util.Scanner; + +public class Console { + + public static String getStringInput(String askForString){ + Scanner string = new Scanner(System.in); + System.out.println(askForString); + String userInput = string.nextLine(); + return userInput; + } + + public static int getIntInput(String askForInt){ + Scanner integer = new Scanner(System.in); + System.out.println(askForInt); + int userInput = integer.nextInt(); + return userInput; + } + + public static double getDoubleInput(String askForDouble){ + Scanner dub = new Scanner(System.in); + System.out.println(askForDouble); + double userInput = dub.nextDouble(); + return userInput; + } +} diff --git a/src/main/java/t/ATMFunctions/Main.java b/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/Main.java similarity index 50% rename from src/main/java/t/ATMFunctions/Main.java rename to src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/Main.java index b037b65..d73e08f 100644 --- a/src/main/java/t/ATMFunctions/Main.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/Main.java @@ -1,4 +1,4 @@ -package t.ATMFunctions; +package foutain.donald.atmproject.bettercopy.ATMFunctions; /** * Created by iyasuwatts on 10/17/17. @@ -6,7 +6,8 @@ public class Main { public static void main(String[] args){ - ATM atmTransaction = new ATM(); - atmTransaction.start(); + ATM newATM = new ATM(); + newATM.startATM(); + } } diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/PromptUser.java b/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/PromptUser.java new file mode 100644 index 0000000..8ab5e3c --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/PromptUser.java @@ -0,0 +1,21 @@ +package foutain.donald.atmproject.bettercopy.ATMFunctions; + +public class PromptUser { + + public static int userStartATM(){ + int userInput = Console.getIntInput("Hello, welcome to Zip Code Federal credit Union.\n" + + "If you are a new user please input '1'.\n" + + "If you would like to login to an existing account please enter '2'."); + return userInput; + } + + public static String getUserName(){ + String userInfo = Console.getStringInput("Please enter your first and last name."); + return userInfo; + } + + public static String getUserPassWord(){ + String userInfo = Console.getStringInput("Please enter your password."); + return userInfo; + } +} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Account.java b/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Account.java new file mode 100644 index 0000000..1f30619 --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Account.java @@ -0,0 +1,48 @@ +package foutain.donald.atmproject.bettercopy.AccountFunctions; + +import java.util.ArrayList; + +public class Account { + + private int accountNumber; + + private double accountBalance; + + private String typeOfAccount; + + private ArrayList transactionHistory; + + public double getAccountBalance(){ + + return this.accountBalance; + } + + public double withdrawMoney(int withdrawAmount){ + + this.accountBalance -= withdrawAmount; + + return accountBalance; + } + + public String closeAccount(){ + + return "Your account has been closed"; + } + + public double depositMoney(int depositAmount){ + + this.accountBalance += depositAmount; + + return accountBalance; + } + + public ArrayList printTransactionHistory(ArrayList transactionHistory){ + + return this.transactionHistory; + } + + public String openAccountType(){ + + return typeOfAccount; + } +} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/User.java b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/User.java new file mode 100644 index 0000000..968ebe8 --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/User.java @@ -0,0 +1,35 @@ +package foutain.donald.atmproject.bettercopy.UserFunctions; + +import java.util.Random; + +public class User { + + private String userName; + + private String userPassword; + + private int accountNumber; + + + public void setUserInfo(String userPassword, String userName){ + Random rnd = new Random(); + int accountNumber = 100000 + rnd.nextInt(900000); + this.accountNumber = accountNumber; + this.userPassword = userPassword; + this.userName = userName; + System.out.println("This is your account number. Please me make sure to write it down!\n" + accountNumber); + + } + + public int getAccountNumber() { + return accountNumber; + } + + public String getUserName() { + return userName; + } + + public String getUserPassword() { + return userPassword; + } +} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserFactory.java b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserFactory.java new file mode 100644 index 0000000..4331da1 --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserFactory.java @@ -0,0 +1,11 @@ +package foutain.donald.atmproject.bettercopy.UserFunctions; +import Fountain.Donald.ATMProject.ATMFunctions.PromptUser; + +public class UserFactory { + + + public void createNewUser(){ + User newUser = new User(); + newUser.setUserInfo(PromptUser.getUserPassWord(), PromptUser.getUserName()); + } +} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserWarehouse.java b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserWarehouse.java new file mode 100644 index 0000000..9b43783 --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserWarehouse.java @@ -0,0 +1,5 @@ +package foutain.donald.atmproject.bettercopy.UserFunctions; + +public class UserWarehouse { + +} diff --git a/src/main/java/t/ATMFunctions/ATM.java b/src/main/java/t/ATMFunctions/ATM.java deleted file mode 100644 index 797f9bc..0000000 --- a/src/main/java/t/ATMFunctions/ATM.java +++ /dev/null @@ -1,76 +0,0 @@ -package t.ATMFunctions; - -import t.Accounts.Console; - -public class ATM { - - public void start() { - - System.out.println("Welcome to Zip Code Wilmington Federal Credit Union.\n"); - int userInput = Console.getIntInput("If you have an account please input '1' if you do not have an account please input '2'."); - boolean terminator = false; - - while(terminator!=false) { - switch (userInput) { - case 1: - //call login method - break; - case 2: - //call create new user method from user factory - break; - default: - System.out.println("Please enter a correct response.\n"); - userInput = Console.getIntInput("If you have an account please input '1' if you do not have an account please input '2'."); - continue; - } - terminator = false; - } - - - - - - - - - - - /*System.out.println("Welcome to the ATM Machine.\n"); - System.out.println("From here you have several options."); - printOptions(); - String userInput = Terminal.getStringInput("Enter the command that you would like to execute."); - switch (userInput) { - case "WITHDRAW": - Withdraw withdraw = new Withdraw(); - break; - - case "DEPOSIT": - break; - - case "TRANSFER": - break; - - case "OPEN NEW ACCOUNT": - break; - - case "CLOSER ACCOUNT": - break; - - case "PRINT TRANSACTION HISTORY": - break; - - case "CHECK BALANCE": - break; - - default: - System.out.println("Please enter an appropriate command."); - break; - } - } - - private void printOptions() { - System.out.println("WITHDRAW\nDEPOSIT\nTRANSFER\nOPEN NEW ACCOUNT\nCLOSE ACCOUNT\nPRINT TRANSACTION HISTORY\nCHECK BALANCE\n");*/ - - - } -} diff --git a/src/main/java/t/Accounts/Checking.java b/src/main/java/t/Accounts/Checking.java deleted file mode 100644 index 7bc6456..0000000 --- a/src/main/java/t/Accounts/Checking.java +++ /dev/null @@ -1,9 +0,0 @@ -package t.Accounts; - -import t.Accounts.Accounts; - -public class Checking extends Accounts { - - - -} diff --git a/src/main/java/t/Accounts/Investment.java b/src/main/java/t/Accounts/Investment.java deleted file mode 100644 index 940f2c9..0000000 --- a/src/main/java/t/Accounts/Investment.java +++ /dev/null @@ -1,9 +0,0 @@ -package t.Accounts; - -import t.Accounts.Accounts; - -public class Investment extends Accounts { - - - -} diff --git a/src/main/java/t/Accounts/Saving.java b/src/main/java/t/Accounts/Saving.java deleted file mode 100644 index bc6c26a..0000000 --- a/src/main/java/t/Accounts/Saving.java +++ /dev/null @@ -1,9 +0,0 @@ -package t.Accounts; - -import t.Accounts.Accounts; - -public class Saving extends Accounts { - - - -} diff --git a/src/main/java/t/Tests/ATMTest.java b/src/main/java/t/Tests/ATMTest.java deleted file mode 100644 index 2dcdcd7..0000000 --- a/src/main/java/t/Tests/ATMTest.java +++ /dev/null @@ -1,5 +0,0 @@ -package t.Tests; - - -public class ATMTest { -} diff --git a/src/main/java/t/User/UserFactory.java b/src/main/java/t/User/UserFactory.java deleted file mode 100644 index fe4b7f4..0000000 --- a/src/main/java/t/User/UserFactory.java +++ /dev/null @@ -1,17 +0,0 @@ -package t.User; - -public class UserFactory { - - - /* public static User createUser() { - String name = Terminal.getStringInput("Please enter your first and last name: "); - String password = Terminal.getStringInput("Please create a password using no more then 10 digits: "); - - User newUser = new User(); - //UserWarehouse.addUser(newUser); - - - return newUser; - } -*/ -} diff --git a/src/main/java/t/User/UserWarehouse.java b/src/main/java/t/User/UserWarehouse.java deleted file mode 100644 index 21b1ca7..0000000 --- a/src/main/java/t/User/UserWarehouse.java +++ /dev/null @@ -1,11 +0,0 @@ -package t.User; - -public class UserWarehouse { - - public static void addUser(){ - - //store users information - - } - -} From fbdedaf905741fde475cd92e51829a7edb2b6f1a Mon Sep 17 00:00:00 2001 From: blessed0886 <32852653+blessed0886@users.noreply.github.com> Date: Wed, 25 Oct 2017 08:50:39 -0400 Subject: [PATCH 5/7] Update ATM Log --- ATM Log | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ATM Log b/ATM Log index 352be0e..167fa48 100644 --- a/ATM Log +++ b/ATM Log @@ -1 +1 @@ -7Vrfb6M4EP5reNwTP0Kae2yy29uVWu3pcqd7dsABXwEj2ynp/vU3BhsIpglJSNQHqkjF47GN55tvZgxY3ird/8FQHr/QECeWa4d7y/tqua4z82z4JyXvlWRhO5UgYiRUSo1gTX5hJVTjoh0JMT9QFJQmguSHwoBmGQ7EgQwxRotDtS1NDlfNUYQNwTpAiSn9l4QiVrvw7Ub+HZMo1is7turZoOA1YnSXqfUs19uWf1V3ivRcSp/HKKRFS+R9s7wVo1RUV+l+hRNpW222atzTB731fTOciSED3GrAG0p2auuPf7+oWxPv2hxFTARe5yiQ7QIgt7xlLNIEWg5cIp5XIGzJHsPESzUpZgLvP7wxp94uuBGmKRbsHVTUAG+hLFQ09p8rUdwyvZYhhXhUz9TsGi7UxvuN4BtGsNx5Agssd3ARyYvHQBCacS2HGesuLQvJmxYVRMQhQ0VLvdXbMyDEOeVEDNYPYhy8lu6WoAxQGTyOYSRA3c5wIY0WBOCqw5cFmuNy+LkDO+vuOGb3umfBUMa3cj17g0WBcXbBJFq0YV1Jd2iHOWUokJwoiXKKRwmJMrhO8LaZ7CoWOZoedRw2SOX4PaxyxqDV/DStfm7+g8gxlFb/lG5jk0xgtkVnuP1jBTc/B2+USnSyDc/Ltj1AtJKsJFl042XW6O32i/zI3jAXKT7HagqfJxQIKl3lUzPkCCOcPkY4IzDi99OMUDb80fi4vUoQH0qRCIs6vgJR8t2HMe6TwKDT/YBA5fbA4o+AimMGqiZg2Hy3kYWmxAAq0q7ZeEFSSMHQWm5pJtaqp22kAEssQSANRKDGfFQdguZlKidJ+Ize6U5uiQsoIHVrGVNGfsG0SBseuplQ5TLE17bGWo4EsQ1Shjno/Kmt73REL2h/oPiMuFCCgCYJyjnZ1NtIEYtItqRC0FQp6U0/kSRZ0YSy0ha60B3FH+aL0/7QVw469mwEh3gwHOKL5GEd3jtOANsUJTiMvmJtkIxWXtGykRJ12NPvFhzIB2s9lzpfZ43kL7VZKaIwdpuU54eYhCGUNgApFUigCj8JVk6JdGS4UX8JP7DZyv7Nt3y48RW0naYNP6nOxAoqXSibSAkVBucoMB/O8/nReKurglNAar2rcDTjrcRR588JxYtR9N37odhzRv1SZshWgTJBeTGUD4s7QukZUHZrxmH51b46cfa4wafMpeOXWr7bSa2e6QCzW6VWd9ZL5oOyNUMpnih9DOCKR2fl2D5ER6G0+fBMAlo/tFGY1g9cJlgvhrUv6d4MVvNM1AdrDqeigrJwwvUKXPsy8M1wNY82rbMuTBdTE8wpCY+ehLvnW0+fOU+WYfZiBC9YHGf3FK2HsPrh7CR8s7q6/6Brvq6Z8LwYz3seeT3HwNNy5VP64y+zJnQvRveep2Cd2w1067fAdgqQmIfhCdDhgNan1bsg+hFfmw8BJkivh9Qb+BJgFEjNp44VpBBt2U4mVSJ3Knc3YXoFpv4dyyTPDLyyTHojhx+WTHBeDufidlUSNJvv4sq+1seH3rf/AQ== \ No newline at end of file +7ZpLc6M4EIB/DcfZAmMc5xh7JrNTldROrXdrzzLIoA0gSgjjzK/fFki8JCfEr82BlKuCWi/Un1rdDVjuOjl8ZyiLnmmAY2tmBwfL/WrNZs7cteGfkLzWkqXt1IKQkUA2agUb8gtLoewXFiTAea8hpzTmJOsLfZqm2Oc9GWKMlv1mOxr3Z81QiDXBxkexLv2HBDySq/DsVv47JmGkZnZsWbNF/kvIaJHK+ayZu6v+6uoEqbFk+zxCAS07Iveb5a4Zpby+Sg5rHAvdKrXV/R6P1Db3zXDKx3SY1R32KC7k0h/+epa3xl+VOsqIcLzJkC/KJSC33FXEkxhKDlyiPKsh7MgBw8Ar/S7kje0x4/jQEcm7+o5pgjl7hSay1l1KDZWt/hdSFHVUr2RIEg+bkdpVw4VcuFkJnqYEa7aIYYJVARehuHjwOaFpruQwYlOlZAHZK1FJeBQwVHaad2oNHQKc0Zzw0e39CPsv1XaLUQpURvdjGHFobqe4FErzfdiq46cFM8dV9492HMxb5Jjd6p45Q2m+E/PZW8xLjNMTBlGiLRtKhl0HllMdBcImKkN5z45iEqZwHeNdO9hZVuQo82jOYc2oHM9gVc4lzGrxvln9sf0XTo6xZvV3tW1sknLMdugD2/6hxp1/hDdKBJ10m2dV2R4hWgurJGl45Wk2aH/9SX6ke5zzBH9Ea5LPI/I5FVvlU1vIGxbhmCzCuYBF3L9vEVKHP9o9bq9jlI81kRDz5nwFQ8mKo2fc58Jg5DAzcPAugMHRT6b2hLDzYisiS6F0CEGHespLkoDPhdJqR1O+kTVdrfhYwAOBWD6BoPJBVnCaVb6bxMETeqWFWFLOIWJUpVVEGfkFwyKlaahmXMbHcKB2W2xETxDbIGU4hzY/FQFnIHpGh17DJ5RzKfBpHKMsJ9tmGQliIUlXlHOayEZq0Y8kjtc0pqzShYpsL+Kp5vO+pzJuCFMA6NjzC+yIO21HfBGW1xzog10Ai+IVHUZfsNJISutt0VGSFA3sxbwvcjA3mOupavN13kr+lIsVIgp9d3GVMUQkCCCYAaaUI45qgIJWRonYyXCj3gp+oLO1/ZtneXDjayg7bRl+ojnja4htIVAiFT4Mu6PE+RHLXowmq0guxoFU7c7iqJ+wgqPymBPFkyl6s9tRNGSlXyqf2AlJJpQno7xb3hClq6EcRonjHKx9tuc0bINP6UyvnwUafev8Wr51Njdacy9STVGCJ5tuCDdWc5aTNRG9iE3rz8sE0OY5jWTaPGOZsJ6M1eR1r4ZVz4pMWDPIi0rKgonrGVxNLvhqXPXcppPtwnAR1WFOXvjiXniY4Tbld+Mwe3mBXbB827qn01qz6rvRhP+HTNfwLFHw1N/QTDxP5nnLnNd1NJ7WTDyYf/v91UT3ZLq3TIPVUa/RbV782gkg0bPhCeh4oE22ehOix+y1ffc/IT0fqTs2RroEUv2xY40UTltWCKdKxErF6iamZzD1bhgmufrBK8KkPel/SzLhPB3n8oZR0lx/nKzBw2nwID4BhFL1Epf4Vu/ldd0BB9oXgIPcTl9xZ4Wmj2aUjOEYcbLvD29atZzhpwDayRPvj+SJaoicFszHslerO20gb5BwuveDgSA3DzHXBqogNMs2cYFi+4li3bz9DtT99h8= \ No newline at end of file From 0ef808985ab532fc8deff560dfcb3384a1d15b36 Mon Sep 17 00:00:00 2001 From: donald f Date: Wed, 25 Oct 2017 14:51:57 -0400 Subject: [PATCH 6/7] it's not going to be pretty but I've refactored and refactored and now have some test --- .../bettercopy/ATMFunctions/ATM.java | 21 ++++-- .../bettercopy/ATMFunctions/Main.java | 13 ---- .../bettercopy/ATMFunctions/PromptUser.java | 11 +++ .../bettercopy/AccountFunctions/Account.java | 51 ++++++++++++-- .../bettercopy/AccountFunctions/Checking.java | 4 ++ .../AccountFunctions/Investments.java | 4 ++ .../bettercopy/AccountFunctions/Saving.java | 4 ++ .../donald/atmproject/bettercopy/Main.java | 15 ++++ .../bettercopy/Tests/AccountTests.java | 70 +++++++++++++++++++ .../bettercopy/Tests/CheckingTest.java | 4 ++ .../bettercopy/Tests/InvestmentTests.java | 4 ++ .../bettercopy/Tests/UserFactoryTests.java | 13 ++++ .../bettercopy/Tests/UserTests.java | 54 ++++++++++++++ .../bettercopy/Tests/UserWarehouseTests.java | 7 ++ .../bettercopy/UserFunctions/User.java | 29 +++++--- .../bettercopy/UserFunctions/UserFactory.java | 20 +++++- .../UserFunctions/UserWarehouse.java | 6 ++ 17 files changed, 290 insertions(+), 40 deletions(-) delete mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/Main.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Checking.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Investments.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Saving.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/Main.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/Tests/AccountTests.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/Tests/CheckingTest.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/Tests/InvestmentTests.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserFactoryTests.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserTests.java create mode 100644 src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserWarehouseTests.java diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/ATM.java b/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/ATM.java index 9d2e12d..e6ad089 100644 --- a/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/ATM.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/ATM.java @@ -1,13 +1,22 @@ package foutain.donald.atmproject.bettercopy.ATMFunctions; +import foutain.donald.atmproject.bettercopy.UserFunctions.UserFactory; +import foutain.donald.atmproject.bettercopy.UserFunctions.UserWarehouse; + public class ATM { - public int startATM(){ - int userInput = PromptUser.userStartATM(); - return userInput; + public void startATM(int userInput){ + userInput = PromptUser.userStartATM(); + boolean terminator = true; + while(terminator == true){ + if("1".equals(userInput)){ + // UserFactory.createNewUser(); + } else if("2".equals(userInput)){ + UserWarehouse.userLogin(); + } else { + PromptUser.correctResponse(); + } + } } - public static void userOption(){ - System.out.println("User Options are: "); - } } diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/Main.java b/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/Main.java deleted file mode 100644 index d73e08f..0000000 --- a/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/Main.java +++ /dev/null @@ -1,13 +0,0 @@ -package foutain.donald.atmproject.bettercopy.ATMFunctions; - -/** - * Created by iyasuwatts on 10/17/17. - */ -public class Main { - - public static void main(String[] args){ - ATM newATM = new ATM(); - newATM.startATM(); - - } -} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/PromptUser.java b/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/PromptUser.java index 8ab5e3c..54e9abe 100644 --- a/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/PromptUser.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/PromptUser.java @@ -18,4 +18,15 @@ public static String getUserPassWord(){ String userInfo = Console.getStringInput("Please enter your password."); return userInfo; } + + public static int getUserAccountType(){ + int userInfo = Console.getIntInput("Account type options\n"+ + "1: Checking\n2: Savings\n 3: Investments"); + return userInfo; + } + + public static int correctResponse(){ + int userInfo = Console.getIntInput("Please reread the above directions and answer appropriately."); + return userInfo; + } } diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Account.java b/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Account.java index 1f30619..b0d7a0f 100644 --- a/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Account.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Account.java @@ -12,28 +12,65 @@ public class Account { private ArrayList transactionHistory; - public double getAccountBalance(){ + //Getter and Setter for TypeOfAccount - return this.accountBalance; + public String getTypeOfAccount() { + return typeOfAccount; } - public double withdrawMoney(int withdrawAmount){ + public void setTypeOfAccount(String typeOfAccount) { + this.typeOfAccount = typeOfAccount; + } - this.accountBalance -= withdrawAmount; + //Getter and Setter for AccountNumber + + public int getAccountNumber() { + return accountNumber; + } + + public void setAccountNumber(int accountNumber) { + this.accountNumber = accountNumber; + } + + //Getter and Setter for AccountBalance + public double getAccountBalance() { return accountBalance; } + public void setAccountBalance(double accountBalance) { + this.accountBalance = accountBalance; + } + + //Getter and Setter for TransactionHistory + + public ArrayList getTransactionHistory() { + return transactionHistory; + } + + public void setTransactionHistory(ArrayList transactionHistory) { + this.transactionHistory = transactionHistory; + } + + //Methods for Accounts + + public String withdrawMoney(double withdrawAmount){ + + this.accountBalance -= withdrawAmount; + + return "Your new account balance is: " + accountBalance; + } + public String closeAccount(){ return "Your account has been closed"; } - public double depositMoney(int depositAmount){ + public String depositMoney(double depositAmount){ this.accountBalance += depositAmount; - return accountBalance; + return "Your new account balance is: " + accountBalance; } public ArrayList printTransactionHistory(ArrayList transactionHistory){ @@ -43,6 +80,6 @@ public ArrayList printTransactionHistory(ArrayList transactionH public String openAccountType(){ - return typeOfAccount; + return "You have just opened a " + typeOfAccount; } } diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Checking.java b/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Checking.java new file mode 100644 index 0000000..39162bd --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Checking.java @@ -0,0 +1,4 @@ +package foutain.donald.atmproject.bettercopy.AccountFunctions; + +public class Checking { +} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Investments.java b/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Investments.java new file mode 100644 index 0000000..6accd7c --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Investments.java @@ -0,0 +1,4 @@ +package foutain.donald.atmproject.bettercopy.AccountFunctions; + +public class Investments { +} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Saving.java b/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Saving.java new file mode 100644 index 0000000..9d632a2 --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Saving.java @@ -0,0 +1,4 @@ +package foutain.donald.atmproject.bettercopy.AccountFunctions; + +public class Saving { +} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/Main.java b/src/main/java/foutain/donald/atmproject/bettercopy/Main.java new file mode 100644 index 0000000..5dccf71 --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/Main.java @@ -0,0 +1,15 @@ +package foutain.donald.atmproject.bettercopy; + +import foutain.donald.atmproject.bettercopy.ATMFunctions.ATM; + +/** + * Created by iyasuwatts on 10/17/17. + */ +public class Main { + + public static void main(String[] args){ + //ATM newATM = new ATM(); + //newATM.startATM(); + + } +} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/Tests/AccountTests.java b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/AccountTests.java new file mode 100644 index 0000000..62de552 --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/AccountTests.java @@ -0,0 +1,70 @@ +package foutain.donald.atmproject.bettercopy.Tests; + +import foutain.donald.atmproject.bettercopy.AccountFunctions.Account; +import org.junit.Assert; +import org.junit.Test; + +public class AccountTests { + + @Test + public void getTypeOfAccountTest(){ + Account newAccount = new Account(); + String expected = "Checking"; + + String typeOfAccount = "Checking"; + newAccount.setTypeOfAccount(typeOfAccount); + String actual = newAccount.getTypeOfAccount(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void getAccountNumber(){ + Account newAccount = new Account(); + int expected = 10000; + + int accountNumber = 10000; + newAccount.setAccountNumber(accountNumber); + int actual = newAccount.getAccountNumber(); + + Assert.assertEquals(expected, accountNumber); + } + + @Test + public void getAccountBalance(){ + Account newAccount = new Account(); + double expected = 100.55; + + double accountBalance = 100.55; + newAccount.setAccountBalance(accountBalance); + double actual = newAccount.getAccountBalance(); + + Assert.assertEquals(expected, actual, 0); + } + + @Test + public void withDrawMoneyTest(){ + Account newAccount = new Account(); + String expected = "Your new account balance is: 200.0"; + + double accountBalance = 260; + double withDrawAmount = 60; + newAccount.setAccountBalance(accountBalance); + String actual = newAccount.withdrawMoney(withDrawAmount); + + Assert.assertEquals(expected,actual); + } + + @Test + public void depositMoneyTest(){ + Account newAccount = new Account(); + String expected = "Your new account balance is: 260.0"; + + double accountBalance = 200; + double depositAmount = 60; + newAccount.setAccountBalance(accountBalance); + String actual = newAccount.depositMoney(depositAmount); + + Assert.assertEquals(expected,actual); + } +} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/Tests/CheckingTest.java b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/CheckingTest.java new file mode 100644 index 0000000..d2c3ffe --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/CheckingTest.java @@ -0,0 +1,4 @@ +package foutain.donald.atmproject.bettercopy.Tests; + +public class CheckingTest { +} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/Tests/InvestmentTests.java b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/InvestmentTests.java new file mode 100644 index 0000000..91e864d --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/InvestmentTests.java @@ -0,0 +1,4 @@ +package foutain.donald.atmproject.bettercopy.Tests; + +public class InvestmentTests { +} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserFactoryTests.java b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserFactoryTests.java new file mode 100644 index 0000000..de791e3 --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserFactoryTests.java @@ -0,0 +1,13 @@ +package foutain.donald.atmproject.bettercopy.Tests; + +import foutain.donald.atmproject.bettercopy.UserFunctions.UserFactory; +import org.junit.Test; + +public class UserFactoryTests { + + @Test + public void createNewUserTest(){ + UserFactory newUser = new UserFactory(); + + } +} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserTests.java b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserTests.java new file mode 100644 index 0000000..ac000d9 --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserTests.java @@ -0,0 +1,54 @@ +package foutain.donald.atmproject.bettercopy.Tests; + +import foutain.donald.atmproject.bettercopy.UserFunctions.User; +import org.junit.Assert; +import org.junit.Test; + +public class UserTests { + + @Test + public void randomAccountGeneratorTest(){ + User newUser = new User(); + int expected = 0; + + int actual = newUser.randomAccountGenerator(); + + Assert.assertNotEquals(expected, actual); + } + + @Test + public void getAccountNumberTest(){ + int expected = 0; + User newUser = new User(); + + int newAccountNUmber = 10000; + newUser.setAccountNumber(newAccountNUmber); + int actual = newUser.getAccountNumber(); + + Assert.assertNotEquals(expected,actual); + } + + @Test + public void getUserName(){ + User newUser = new User(); + String expected = "Donald Fountain"; + + String userName = "Donald Fountain"; + newUser.setUserName(userName); + String actual = newUser.getUserName(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void getUserPassword(){ + User newUser = new User(); + String expected = "Password"; + + String password = "Password"; + newUser.setUserPassword(password); + String actual = newUser.getUserPassword(); + + Assert.assertEquals(expected, actual); + } +} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserWarehouseTests.java b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserWarehouseTests.java new file mode 100644 index 0000000..4726bbc --- /dev/null +++ b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserWarehouseTests.java @@ -0,0 +1,7 @@ +package foutain.donald.atmproject.bettercopy.Tests; + +import org.junit.Test; + +public class UserWarehouseTests { + +} diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/User.java b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/User.java index 968ebe8..bcdaa14 100644 --- a/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/User.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/User.java @@ -4,32 +4,39 @@ public class User { - private String userName; - private String userPassword; private int accountNumber; + private String userName; + + - public void setUserInfo(String userPassword, String userName){ + public int randomAccountGenerator() { Random rnd = new Random(); int accountNumber = 100000 + rnd.nextInt(900000); - this.accountNumber = accountNumber; - this.userPassword = userPassword; - this.userName = userName; - System.out.println("This is your account number. Please me make sure to write it down!\n" + accountNumber); - + return accountNumber; } public int getAccountNumber() { return accountNumber; } - public String getUserName() { - return userName; - } + public String getUserName() { return userName; } public String getUserPassword() { return userPassword; } + + public void setUserName(String userName) { + this.userName = userName; + } + + public void setAccountNumber(int accountNumber) { + this.accountNumber = accountNumber; + } + + public void setUserPassword(String userPassword) { + this.userPassword = userPassword; + } } diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserFactory.java b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserFactory.java index 4331da1..7be85c9 100644 --- a/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserFactory.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserFactory.java @@ -1,11 +1,25 @@ package foutain.donald.atmproject.bettercopy.UserFunctions; -import Fountain.Donald.ATMProject.ATMFunctions.PromptUser; +import foutain.donald.atmproject.bettercopy.ATMFunctions.PromptUser; + +import java.util.ArrayList; + public class UserFactory { + /* private ArrayList userNames(ArrayList userName){ + + - public void createNewUser(){ + return users; + } + + + public static String createNewUser(){ User newUser = new User(); - newUser.setUserInfo(PromptUser.getUserPassWord(), PromptUser.getUserName()); + newUser.setUserInfo(PromptUser.getUserName(), PromptUser.getUserPassWord()); + String userInfo = + return } + +*/ } diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserWarehouse.java b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserWarehouse.java index 9b43783..ecd86ca 100644 --- a/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserWarehouse.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserWarehouse.java @@ -2,4 +2,10 @@ public class UserWarehouse { + public void UserWarehouse(){ + + } + + public static void userLogin() { + } } From 7a047f3fe0e21cef1b1d943ee288927a6d87eb70 Mon Sep 17 00:00:00 2001 From: donald f Date: Wed, 25 Oct 2017 19:32:05 -0400 Subject: [PATCH 7/7] this is my final verison for the day --- .../bettercopy/ATMFunctions/ATM.java | 4 +-- .../donald/atmproject/bettercopy/Main.java | 10 ++++-- .../bettercopy/Tests/AccountTests.java | 10 ++---- .../bettercopy/Tests/UserFactoryTests.java | 32 ++++++++++++++++++- .../bettercopy/Tests/UserTests.java | 11 ++----- .../bettercopy/Tests/UserWarehouseTests.java | 8 +++++ .../bettercopy/UserFunctions/User.java | 7 ++-- .../bettercopy/UserFunctions/UserFactory.java | 23 ++++++------- .../UserFunctions/UserWarehouse.java | 20 ++++++++++-- 9 files changed, 89 insertions(+), 36 deletions(-) diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/ATM.java b/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/ATM.java index e6ad089..c29baf3 100644 --- a/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/ATM.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/ATM.java @@ -5,8 +5,8 @@ public class ATM { - public void startATM(int userInput){ - userInput = PromptUser.userStartATM(); + public void startATM(){ + int userInput = PromptUser.userStartATM(); boolean terminator = true; while(terminator == true){ if("1".equals(userInput)){ diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/Main.java b/src/main/java/foutain/donald/atmproject/bettercopy/Main.java index 5dccf71..b62814e 100644 --- a/src/main/java/foutain/donald/atmproject/bettercopy/Main.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/Main.java @@ -1,6 +1,9 @@ package foutain.donald.atmproject.bettercopy; import foutain.donald.atmproject.bettercopy.ATMFunctions.ATM; +import foutain.donald.atmproject.bettercopy.UserFunctions.User; +import foutain.donald.atmproject.bettercopy.UserFunctions.UserFactory; +import foutain.donald.atmproject.bettercopy.UserFunctions.UserWarehouse; /** * Created by iyasuwatts on 10/17/17. @@ -8,8 +11,11 @@ public class Main { public static void main(String[] args){ - //ATM newATM = new ATM(); - //newATM.startATM(); + ATM newATM = new ATM(); + newATM.startATM(); + UserWarehouse warehouse = new UserWarehouse(); + User Logan = UserFactory.createNewUser("Logan", "Password"); + warehouse.addUserToList(Logan); } } diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/Tests/AccountTests.java b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/AccountTests.java index 62de552..9ed9435 100644 --- a/src/main/java/foutain/donald/atmproject/bettercopy/Tests/AccountTests.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/AccountTests.java @@ -6,13 +6,13 @@ public class AccountTests { + Account newAccount = new Account(); + @Test public void getTypeOfAccountTest(){ - Account newAccount = new Account(); String expected = "Checking"; - String typeOfAccount = "Checking"; - newAccount.setTypeOfAccount(typeOfAccount); + newAccount.setTypeOfAccount(expected); String actual = newAccount.getTypeOfAccount(); Assert.assertEquals(expected, actual); @@ -20,7 +20,6 @@ public void getTypeOfAccountTest(){ @Test public void getAccountNumber(){ - Account newAccount = new Account(); int expected = 10000; int accountNumber = 10000; @@ -32,7 +31,6 @@ public void getAccountNumber(){ @Test public void getAccountBalance(){ - Account newAccount = new Account(); double expected = 100.55; double accountBalance = 100.55; @@ -44,7 +42,6 @@ public void getAccountBalance(){ @Test public void withDrawMoneyTest(){ - Account newAccount = new Account(); String expected = "Your new account balance is: 200.0"; double accountBalance = 260; @@ -57,7 +54,6 @@ public void withDrawMoneyTest(){ @Test public void depositMoneyTest(){ - Account newAccount = new Account(); String expected = "Your new account balance is: 260.0"; double accountBalance = 200; diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserFactoryTests.java b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserFactoryTests.java index de791e3..1ef6ee6 100644 --- a/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserFactoryTests.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserFactoryTests.java @@ -1,13 +1,43 @@ package foutain.donald.atmproject.bettercopy.Tests; +import foutain.donald.atmproject.bettercopy.UserFunctions.User; import foutain.donald.atmproject.bettercopy.UserFunctions.UserFactory; +import org.junit.Assert; import org.junit.Test; public class UserFactoryTests { - @Test + /*@Test public void createNewUserTest(){ + //Given: UserFactory newUser = new UserFactory(); + String expected = "Donald Fountain" + "Password"; + + //When; + String password = "Password"; + String userName = "Donald Fountain"; + User expectedInput = newUser.createNewUser(userName, password); + String outPut = expectedInput.getUserName() + expectedInput.getUserPassword(); + + //Then: + Assert.assertEquals(expected, outPut); + } +*/ + @Test + public void createNewUserTestLeon(){ + //Given: + UserFactory userCreator = new UserFactory(); + String expectedUsername = "Donald Fountain"; + String expectedPassword = "Password"; + + // : When + User expectedUser = userCreator.createNewUser(expectedUsername, expectedPassword); + String actualUsername = expectedUser.getUserName(); + String actualPassword = expectedUser.getUserPassword(); + + // : Then + Assert.assertEquals(expectedPassword, actualPassword); + Assert.assertEquals(expectedUsername, actualUsername); } } diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserTests.java b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserTests.java index ac000d9..4e156e1 100644 --- a/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserTests.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserTests.java @@ -5,10 +5,10 @@ import org.junit.Test; public class UserTests { + User newUser = new User(); @Test public void randomAccountGeneratorTest(){ - User newUser = new User(); int expected = 0; int actual = newUser.randomAccountGenerator(); @@ -19,7 +19,6 @@ public void randomAccountGeneratorTest(){ @Test public void getAccountNumberTest(){ int expected = 0; - User newUser = new User(); int newAccountNUmber = 10000; newUser.setAccountNumber(newAccountNUmber); @@ -30,11 +29,9 @@ public void getAccountNumberTest(){ @Test public void getUserName(){ - User newUser = new User(); String expected = "Donald Fountain"; - String userName = "Donald Fountain"; - newUser.setUserName(userName); + newUser.setUserName(expected); String actual = newUser.getUserName(); Assert.assertEquals(expected, actual); @@ -42,11 +39,9 @@ public void getUserName(){ @Test public void getUserPassword(){ - User newUser = new User(); String expected = "Password"; - String password = "Password"; - newUser.setUserPassword(password); + newUser.setUserPassword(expected); String actual = newUser.getUserPassword(); Assert.assertEquals(expected, actual); diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserWarehouseTests.java b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserWarehouseTests.java index 4726bbc..dfa3087 100644 --- a/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserWarehouseTests.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/Tests/UserWarehouseTests.java @@ -1,7 +1,15 @@ package foutain.donald.atmproject.bettercopy.Tests; +import foutain.donald.atmproject.bettercopy.UserFunctions.User; +import foutain.donald.atmproject.bettercopy.UserFunctions.UserWarehouse; +import org.junit.Assert; import org.junit.Test; +import java.util.ArrayList; + public class UserWarehouseTests { + @Test + public void addUserToListTest(){ + } } diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/User.java b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/User.java index bcdaa14..48bb2e3 100644 --- a/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/User.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/User.java @@ -10,7 +10,7 @@ public class User { private String userName; - + //Random account number generator public int randomAccountGenerator() { Random rnd = new Random(); @@ -18,6 +18,8 @@ public int randomAccountGenerator() { return accountNumber; } + //Getters and Setters + public int getAccountNumber() { return accountNumber; } @@ -36,7 +38,6 @@ public void setAccountNumber(int accountNumber) { this.accountNumber = accountNumber; } - public void setUserPassword(String userPassword) { - this.userPassword = userPassword; + public void setUserPassword(String userPassword) { this.userPassword = userPassword; } } diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserFactory.java b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserFactory.java index 7be85c9..784469e 100644 --- a/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserFactory.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserFactory.java @@ -1,25 +1,26 @@ package foutain.donald.atmproject.bettercopy.UserFunctions; -import foutain.donald.atmproject.bettercopy.ATMFunctions.PromptUser; import java.util.ArrayList; public class UserFactory { - /* private ArrayList userNames(ArrayList userName){ - - return users; + public static User createNewUser(String userName, String userPassword){ + User newUser = new User(); + newUser.setUserName(userName); + newUser.setUserPassword(userPassword); + return newUser; } + private static ArrayList users; - public static String createNewUser(){ - User newUser = new User(); - newUser.setUserInfo(PromptUser.getUserName(), PromptUser.getUserPassWord()); - String userInfo = - return + public void addUserToList(User user){ + this.users.add(user); } -*/ -} + public UserFactory(){ + users = new ArrayList<>(); + } + } diff --git a/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserWarehouse.java b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserWarehouse.java index ecd86ca..8ce3101 100644 --- a/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserWarehouse.java +++ b/src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserWarehouse.java @@ -1,11 +1,27 @@ package foutain.donald.atmproject.bettercopy.UserFunctions; +import java.util.ArrayList; + public class UserWarehouse { - public void UserWarehouse(){ + private static ArrayList usersList; + + public void addUserToList(User user){ + this.usersList.add(user); + } + public UserWarehouse(){ + usersList = new ArrayList<>(); } public static void userLogin() { } -} + + public User getUserFromList(String user) { + for (User userLookingFor : usersList) { + if (userLookingFor.getUserName().equals(user)) + return userLookingFor; + } + return null; + } + }