Initial work on classes + methods

.gitignore

@@ -0,0 +1,2 @@
+.idea/workspace.xml
+target

src/main/java/Customer.java

@@ -3,7 +3,6 @@ public class Customer {
     private String lastName;
     private String emailAddress;
     private String password;
-    final public static String dataSourceName = "customer";
 
     public Customer(String emailAddress, String firstName, String lastName, String password){
         this.emailAddress = emailAddress;

src/main/java/Customers.java

@@ -0,0 +1,5 @@
+import java.util.List;
+
+public interface Customers {
+    public List<Customer> getAllCustomers();
+}

src/main/java/CustomersFromFile.java

@@ -0,0 +1,23 @@
+import java.util.ArrayList;
+import java.util.List;
+
+public class CustomersFromFile implements Customers {
+    List<Customer> listOfCustomers = new ArrayList<>();
+
+    public List<Customer> getAllCustomers(){
+        ReadDelimitedFile readDelimitedFile = new ReadDelimitedFile();
+        List<String[]> fileData = readDelimitedFile.getFileData("customer.csv");
+        addToList(fileData);
+        return listOfCustomers;
+    }
+
+    private void addToList(List<String[]> customerList){
+        for(String[] customer : customerList){
+            listOfCustomers.add(arrayToCustomer(customer));
+        }
+    }
+
+    private Customer arrayToCustomer(String[] customerInfo){
+        return new Customer(customerInfo[0],customerInfo[1],customerInfo[2],customerInfo[3]);
+    }
+}

src/main/java/Display.java

@@ -0,0 +1,11 @@
+public class Display {
+    public void mainMenu(){
+
+    }
+    public void displayItems(){
+
+    }
+    public void leaveStore(){
+
+    }
+}

src/main/java/Items.java

@@ -0,0 +1,2 @@
+public class Items {
+}

src/main/java/LogIn.java

@@ -9,12 +9,12 @@ private String input(String message) {
         return userInput.nextLine();
     }
 
-    private String getPassword(String emailAddress){
-        AllCustomers allCustomers = new AllCustomers();
+    private String getPassword(String emailAddress) {
+        Customers allCustomers = new CustomersFromFile();
         String password = "";
-        List<Customer> listOfCustomers = allCustomers.getListOfCustomers();
-        for (Customer customer :listOfCustomers){
-            if (customer.getEmailAddress().equals(emailAddress)){
+        List<Customer> listOfCustomers = allCustomers.getAllCustomers();
+        for (Customer customer : listOfCustomers) {
+            if (customer.getEmailAddress().equals(emailAddress)) {
                 password = customer.getPassword();
             }
         }
@@ -24,7 +24,7 @@ private String getPassword(String emailAddress){
     public void logIn() {
         String emailAddress = input("Enter email address");
         String password = getPassword(emailAddress);
-        if (password == "") {
+        if (password.equals("")) {
             System.out.println("You are not a user");
         }
         else if (password.equals(input("Enter password"))){
@@ -34,9 +34,4 @@ else if (password.equals(input("Enter password"))){
             System.out.println("Wrong password, no second chances");
         }
     }
-
-    public static void main(String[] args){
-        LogIn logIn = new LogIn();
-        logIn.logIn();
-    }
 }

src/main/java/Main.java

@@ -0,0 +1,8 @@
+public class Main {
+
+    public static void main(String[] args){
+        LogIn logIn = new LogIn();
+        logIn.logIn();
+    }
+
+}

src/main/java/ReadDelimitedFile.java

@@ -6,11 +6,11 @@
 
 public class ReadDelimitedFile {
 
-    private String fileDelimitor = ",";
+    private String fileDelimiter = ",";
     private String filePathPrefix = "src/main/resources/";
 
-    public void setFileDelimitor(String fileDelimitor){
-        this.fileDelimitor = fileDelimitor;
+    public void setFileDelimiter(String fileDelimiter){
+        this.fileDelimiter = fileDelimiter;
     }
 
     public List<String[]> getFileData(String fileName){
@@ -20,7 +20,7 @@ public List<String[]> getFileData(String fileName){
             Scanner propertyReader = new Scanner(propertyFile);
             while (propertyReader.hasNextLine()) {
                 String fileRow = propertyReader.nextLine();
-                fileData.add(fileRow.split(fileDelimitor));
+                fileData.add(fileRow.split(fileDelimiter));
             }
             propertyReader.close();
         } catch (IOException e) {

src/main/resources/customer.csv

@@ -1,4 +1,5 @@
 emailAddress,firstName,lastName,password
 derek.somerville@glasgow.ac.uk,Derek,Somerville,1234
 matthew.barr@glasgow.ac.uk,Matt,Barr,4321
-e.kelly.1@research.gla.ac.uk,Ethan,Kelly,9876
+e.kelly.1@research.gla.ac.uk,Ethan,Kelly,9876
+2089327W@student.gla.ac.uk,Conor,Walker,password