Merge remote-tracking branch 'origin/15-userdatabase-and-user' into 15-userdatabase-and-user

# Conflicts:
#	src/main/java/UserDatabase.java

Author: Madhavan7

src/main/java/User.java

@@ -20,6 +20,10 @@ private String getPassword(){
         return this.password;
     }
 
+    public Boolean PasswordMatch(String attempt){
+        return (this.getPassword().equals(attempt));
+    }
+
     @Override
 //    from Changeable
     public void changeFeature(String feature, String newFeature){

src/main/java/UserDatabase.java

@@ -8,8 +8,8 @@ public UserDatabase(){
         this.accounts = new File("TestUserDatabase3.csv");
         this.accountList = this.getList();
     }
-    public UserDatabase(File accounts){
-        if(!accounts.exists()){
+    public UserDatabase(File accounts) {
+        if (!accounts.exists()) {
             try {
                 accounts.createNewFile();
             } catch (IOException e) {
@@ -21,6 +21,23 @@ public UserDatabase(File accounts){
     }
     @Override
     public boolean UserExists(String username, String email) {
+        /*User user = null;
+        try(FileInputStream fileIn = new FileInputStream(accounts);
+        ObjectInputStream in = new ObjectInputStream(fileIn)){
+            do{
+                try{
+                    user = (User)in.readObject();
+                }catch(NullPointerException e){
+                    user = null;
+                    break;
+                }
+            }while(!user.getEmail().equals(email) && !user.getUsername().equals(username));
+        }catch(IOException e){
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+        return user != null;*/
         for(User user: this.accountList){
             if(user.getUsername().equals(username) || user.getEmail().equals(email)){
                 return true;
@@ -29,16 +46,26 @@ public boolean UserExists(String username, String email) {
         return false;
     }
 
-    // Creates a new user with a username and password, and an email address
+    @Override
+    public boolean UserExists(String username) {
+        for(User user: this.accountList){
+            if(user.getUsername().equals(username)){
+                return true;
+            }
+        }
+        return false;
+    }
+
+        // Creates a new user with a username and password, and an email address
     // The order is username, password, email address, verification status, status
     //
     @Override
     public void createUser(String username, String password, String email, String type){
         User newUser = UserFactory.BirthUser(username, password, email, type);
-        this.accountList.add(newUser);
         try(FileOutputStream fileOut = new FileOutputStream(accounts)){
             try(ObjectOutputStream out = new ObjectOutputStream(fileOut)){
-                out.writeObject(this.accountList);
+                out.writeObject(newUser);
+                this.accountList.add(newUser);
                 out.close();
                 fileOut.close();
             }catch(Exception e){
@@ -50,7 +77,6 @@ public void createUser(String username, String password, String email, String ty
     }
 
     @Override
-//  To be edited to get user from the array format rather than the serialized format.
     public User getUser(String username) {
         User ans = null;
         for (int i = 0; i < (this.getList().size()); i++) {
@@ -66,22 +92,19 @@ public User getUser(String username) {
     public List<User> getList() {
         List<User> users = new ArrayList<>();
         try(FileInputStream fileIn = new FileInputStream(accounts);
-            ObjectInputStream in = new ObjectInputStream(fileIn)) {
-
-            users = (ArrayList<User>) in.readObject();
-            /*
+            ObjectInputStream in = new ObjectInputStream(fileIn)){
+            /*User user = (User) in.readObject();*/
             while(true){
                 try{
                     User user = (User) in.readObject();
                     users.add(user);}
                 catch(EOFException e){
                     break;
-                }*/
-            return users;
-        }catch(EOFException e){
-            return users;
-            } catch (IOException | ClassNotFoundException ex) {
-            throw new RuntimeException(ex);
+                }
+            }
+        }catch(Exception e){
+            e.printStackTrace();
         }
+        return users;
     }
 }

src/main/java/UserExists.java

@@ -1,3 +1,4 @@
 public interface UserExists {
-    boolean UserExists(String username, String password);
+    boolean UserExists(String username, String email);
+    boolean UserExists(String username);
 }