Minor Changes

Author: Madhavan7

src/main/java/data_access/UserDatabase.java

@@ -2,8 +2,8 @@
 
 import interface_adapters.IRetrieveList;
 import interface_adapters.user_registration_interface_adapters.UserExists;
-import Entities.user_entities.User;
-import Entities.user_entities.UserFactory;
+import entities.user_entities.User;
+import entities.user_entities.UserFactory;
 import use_cases.user_login_use_case.UserCreator;
 import interface_adapters.UserRetriever;
 
@@ -47,12 +47,7 @@ public boolean UserExists(String username, String email) {
 
     @Override
     public boolean UserExists(String username) {
-        for(User user: this.accountList){
-            if(user.getUsername().equals(username)){
-                return true;
-            }
-        }
-        return false;
+        return UserExists(username, "");
     }
 
     // Creates a new user with a username and password, and an email address

src/main/java/entities/userEntities/BasicUser.java

@@ -1,6 +1,5 @@
 package entities.user_entities;
 
-import entities.user_entities.User;
 public class BasicUser extends User{
     public BasicUser(String Username, String Password, String Email){
         super(Username, Password, Email);

src/main/java/entities/userEntities/User.java

@@ -1,18 +1,21 @@
 package entities.user_entities;
 
-import use_cases.user_attribute_modification_use_case.Changeable;
+import interface_adapters.User.*;
 
 import java.io.Serializable;
-public abstract class User implements Serializable, Changeable {
+
+public abstract class User implements Serializable, Changeable, UserAuthenticationI {
     protected String username;
     protected String password;
     protected String email;
     boolean verified = false;
     boolean online = false;
+//    protected ArrayList<Chat> chats;
     public User(String username, String password, String email){
         this.username = username;
         this.password = password;
         this.email = email;
+//        this.chats = new ArrayList<Chat>();
     }
     public String getEmail(){
         return this.email;
@@ -24,8 +27,17 @@ private String getPassword(){
         return this.password;
     }
 
+//    public ArrayList<Chat> getChats() {
+//        return this.chats;
+//    }
+
+    @Override
+    public Boolean PasswordMatch(String attempt){
+        return (this.getPassword().equals(attempt));
+    }
+
     @Override
-//    from Changeable
+//    from interface_adapters.User.Changeable
     public void changeFeature(String feature, String newFeature){
         if (feature == "Username"){
             this.username = newFeature;

src/main/java/entities/userEntities/UserFactory.java

@@ -1,6 +1,6 @@
 package interface_adapters.User;
 
-import entities.userEntities.User;
+import entities.user_entities.User;
 
 import java.util.List;
 

src/main/java/entities/user_entities/BasicUser.java

@@ -1,6 +1,6 @@
 package interface_adapters.User;
 
-import entities.userEntities.User;
+import entities.user_entities.User;
 
 // allows for the serialized data_access.UserDatabase to update when changes occur to user attributes.
 public interface UserModificationGateway {

src/main/java/entities/user_entities/User.java

@@ -1,6 +1,6 @@
 package interface_adapters.User;
 
-import entities.userEntities.User;
+import entities.user_entities.User;
 
 public interface UserRetriever {
     User getUser(String username);

src/main/java/interface_adapters/User/IRetrieveList.java

@@ -2,4 +2,5 @@
 
 public interface UserExists {
     boolean UserExists(String username, String password);
+    boolean UserExists(String username);
 }