added changes made to another branch and brought it here

Author: Madhavan7

src/main/java/TestUserDatabase2.csv

@@ -3,6 +3,7 @@
 import java.util.List;
 public class UserDatabase implements UserExists, UserRetriever, UserCreator, IRetrieveList{
     File accounts;
+<<<<<<< HEAD
     public UserDatabase(){
         this.accounts = new File("UserAccounts.csv");
     }
@@ -12,12 +13,26 @@ public UserDatabase(File accounts){
     @Override
     public boolean UserExists(String username, String email) {
         User user = null;
+=======
+    List<User> accountList;
+    public UserDatabase(File accounts){
+        this.accounts = accounts;
+        this.accountList = this.getList();
+    }
+    @Override
+    public boolean UserExists(String username, String email) {
+        /*User user = null;
+>>>>>>> 15-userdatabase-and-user
         try(FileInputStream fileIn = new FileInputStream(accounts);
         ObjectInputStream in = new ObjectInputStream(fileIn)){
             do{
                 try{
                     user = (User)in.readObject();
                 }catch(NullPointerException e){
+<<<<<<< HEAD
+=======
+                    user = null;
+>>>>>>> 15-userdatabase-and-user
                     break;
                 }
             }while(!user.getEmail().equals(email) && !user.getUsername().equals(username));
@@ -26,7 +41,17 @@ public boolean UserExists(String username, String email) {
         } catch (ClassNotFoundException e) {
             throw new RuntimeException(e);
         }
+<<<<<<< HEAD
         return user != null;
+=======
+        return user != null;*/
+        for(User user: this.accountList){
+            if(user.getUsername().equals(username) || user.getEmail().equals(email)){
+                return true;
+            }
+        }
+        return false;
+>>>>>>> 15-userdatabase-and-user
     }
 
     // Creates a new user with a username and password, and an email address
@@ -38,6 +63,10 @@ public void createUser(String username, String password, String email, String ty
         try(FileOutputStream fileOut = new FileOutputStream(accounts)){
             try(ObjectOutputStream out = new ObjectOutputStream(fileOut)){
                 out.writeObject(newUser);
+<<<<<<< HEAD
+=======
+                this.accountList.add(newUser);
+>>>>>>> 15-userdatabase-and-user
                 out.close();
                 fileOut.close();
             }catch(Exception e){
@@ -66,10 +95,21 @@ public List<User> getList() {
         List<User> users = new ArrayList<>();
         try(FileInputStream fileIn = new FileInputStream(accounts);
             ObjectInputStream in = new ObjectInputStream(fileIn)){
+<<<<<<< HEAD
             User user = (User) in.readObject();
             while(user != null){
                 users.add(user);
                 user = (User)in.readObject();
+=======
+            /*User user = (User) in.readObject();*/
+            while(true){
+                try{
+                    User user = (User) in.readObject();
+                    users.add(user);}
+                catch(EOFException e){
+                    break;
+                }
+>>>>>>> 15-userdatabase-and-user
             }
         }catch(Exception e){
             e.printStackTrace();

src/main/java/UserDatabase.java

@@ -2,7 +2,10 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
+<<<<<<< HEAD
 import java.util.ArrayList;
+=======
+>>>>>>> 15-userdatabase-and-user
 import java.util.List;
 
 public class UserDatabaseTest {
@@ -24,6 +27,10 @@ public void addingMultipleFiles(){
     public void rightEmailWrongUser(){
         File accounts = new File("TestUserDatabase2.csv");
         UserDatabase accountDatabase = new UserDatabase(accounts);
+<<<<<<< HEAD
+=======
+        accountDatabase.createUser("MadhavGopakumar", "123", "[email protected]", "Basic");
+>>>>>>> 15-userdatabase-and-user
         Assertions.assertTrue(accountDatabase.UserExists("MadG", "[email protected]"));
     }
     @Test