I'm trying to make it better

pom.xml

@@ -13,12 +13,21 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
+    <dependencies>
+        <!-- https://mvnrepository.com/artifact/junit/junit -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+
+    </dependencies>
 
 </project>

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'.");
+            }
+        }
+    }*/
+}

src/main/java/t/ATMFunctions/Console.java → 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;
 

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());
+
+
+    }
+}

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:
+    }
+}

src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/CheckingTest.java

@@ -0,0 +1,4 @@
+package fountain.donald.atmproject.RoughCopy.ATMProjectTest;
+
+public class CheckingTest {
+}

src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/InvestmentTest.java

@@ -0,0 +1,4 @@
+package fountain.donald.atmproject.RoughCopy.ATMProjectTest;
+
+public class InvestmentTest {
+}

src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/MainTest.java

@@ -0,0 +1,4 @@
+package fountain.donald.atmproject.RoughCopy.ATMProjectTest;
+
+public class MainTest {
+}

src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/SavingTest.java

@@ -0,0 +1,4 @@
+package fountain.donald.atmproject.RoughCopy.ATMProjectTest;
+
+public class SavingTest {
+}

src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/UserFactoryTest.java

@@ -0,0 +1,4 @@
+package fountain.donald.atmproject.RoughCopy.ATMProjectTest;
+
+public class UserFactoryTest {
+}

src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/UserTest.java

@@ -0,0 +1,4 @@
+package fountain.donald.atmproject.RoughCopy.ATMProjectTest;
+
+public class UserTest {
+}

src/main/java/fountain/donald/atmproject/RoughCopy/ATMProjectTest/UserWarehouseTest.java

@@ -0,0 +1,4 @@
+package fountain.donald.atmproject.RoughCopy.ATMProjectTest;
+
+public class UserWarehouseTest {
+}

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<String> transactionHistory;
+
+        public Account2(double initialBalance)
+        {
+            this.accountBalance=initialBalance;
+        }
+
+        public double getAccountBalance(){
+
+            return this.accountBalance;
+        }
+
+        public double withdrawMoney(double withdrawAmount){
+
+            this.accountBalance -= withdrawAmount;
+
+            return accountBalance;
+        }
+}

src/main/java/t/Accounts/Accounts.java → 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
+        }
+
+    }
 }

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 {
+
+
+
+}

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 {
+
+
+
+}

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 {
+
+
+
+}

src/main/java/t/User/User.java → 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;
     }
 }

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;
+    }
+}

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;
+    }
+}
+

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: ");
+    }
+}

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;
+    }
+}

src/main/java/t/ATMFunctions/Main.java → src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/Main.java

@@ -1,12 +1,13 @@
-package t.ATMFunctions;
+package foutain.donald.atmproject.bettercopy.ATMFunctions;
 
 /**
  * Created by iyasuwatts on 10/17/17.
  */
 public class Main {
 
     public static void main(String[] args){
-        ATM atmTransaction = new ATM();
-        atmTransaction.start();
+        ATM newATM = new ATM();
+        newATM.startATM();
+
     }
 }