Merge pull request #31 from CSC207-2022F-UofT/14-feature-2-user-login

14 feature 2 user login

Author: Madhavan7

.gitignore

@@ -1,14 +1,14 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# entities.userEntities.User-specific stuff
+# entities.user_entities.User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
 
-# AWS entities.userEntities.User-specific
+# AWS entities.user_entities.User-specific
 .idea/**/aws.xml
 
 # Generated files

src/main/java/data_access/UserDatabase.java

@@ -1,17 +1,17 @@
 package data_access;
 
-import entities.userEntities.User;
-import entities.userEntities.UserFactory;
-import interface_adapters.Chat.ConvHistGateway;
-import interface_adapters.Chat.MsgSenderGateway;
-import interface_adapters.Chat.UserChatGateway;
-import interface_adapters.User.*;
+import interface_adapters.User_search_IA.IRetrieveList;
+import interface_adapters.user_registration_interface_adapters.UserExists;
+import entities.user_entities.User;
+import interface_adapters.profile_modification_IA.UserModificationGateway;
+import use_cases.user_registration_use_cases.UserCreator;
+import entities.user_entities.UserFactory;
+import interface_adapters.User_search_IA.UserRetriever;
 
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
-public class UserDatabase implements UserExists, UserRetriever, UserCreator, IRetrieveList, UserModificationGateway,
-        ConvHistGateway, MsgSenderGateway, UserChatGateway {
+public class UserDatabase implements UserExists, UserRetriever, UserCreator, IRetrieveList, UserModificationGateway {
     File accounts;
     List<User> accountList;
     public UserDatabase(){
@@ -92,7 +92,7 @@ public List<User> getList() {
             /*
             while(true){
                 try{
-                    entities.userEntities.User user = (entities.userEntities.User) in.readObject();
+                    Entities.User_Entities.User user = (Entities.User_Entities.User) in.readObject();
                     users.add(user);}
                 catch(EOFException e){
                     break;
@@ -125,7 +125,6 @@ public void modifyUser(String oldUsername, User modified){
         }
     }
 
-
     // Below two methods are used by conversation history-related interactors
     // (Commented as objects are not found)
 //    /**
@@ -137,7 +136,7 @@ public void modifyUser(String oldUsername, User modified){
 //        String chatID = dsRequestModel.getChatID();
 //        Message message = dsRequestModel.getMessage();
 //
-//        // Find chat under specified entities.userEntities.User
+//        // Find chat under specified Entities.User_Entities.User
 //        Chat chat = this.getUser(userID).getChat(chatID);
 //
 //        chat.addMessage(message);
@@ -152,25 +151,9 @@ public void modifyUser(String oldUsername, User modified){
 //        String userID = dsRequestModel.getUserID();
 //        String chatID = dsRequestModel.getChatID();
 //
-//        // Find chat under specified entities.userEntities.User
+//        // Find chat under specified Entities.User_Entities.User
 //        Chat chat = this.getUser(userID).getChat(chatID);
 //
 //        return Chat.getConversationHistory();
 //    }
-
-
-
-
-// This method will get a user's chats; this will be used by AppScreenLoader to display chats and could
-// also be used by ChatInteractor  (Chat entity is undefined here and at the moment user doesn't have chats)
-//    @Override
-//    public ArrayList<Chat> getUserChats(String username) {
-//        for (entities.userEntities.User user: accountList){
-//            if (user.getUsername().equals(username)){
-//                return user.getChats();
-//            }
-//        }
-//        throw new RuntimeException("Invalid username: user does not exist");
-//    }
-
 }

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

@@ -1,8 +1,10 @@
 package entities.user_entities;
 
-import entities.user_entities.User;
+import java.util.ArrayList;
+import entities.chat;
+
 public class BasicUser extends User{
-    public BasicUser(String Username, String Password, String Email){
-        super(Username, Password, Email);
+    public BasicUser(String Username, String Password, String Email, ArrayList<Chat> userChats){
+        super(Username, Password, Email, userChats);
     }
 }

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

@@ -1,18 +1,26 @@
 package entities.user_entities;
 
+import interface_adapters.login_interface_adapters.Login;
 import use_cases.user_attribute_modification_use_case.Changeable;
+import interface_adapters.app_screen_interface_adapters.UserAppScreenGateway;
+import entities.chat;
 
 import java.io.Serializable;
-public abstract class User implements Serializable, Changeable {
+import java.util.ArrayList;
+
+public abstract class User implements Serializable, Changeable, Login {
     protected String username;
     protected String password;
     protected String email;
+
+    protected ArrayList<Chat> userChats;
     boolean verified = false;
     boolean online = false;
-    public User(String username, String password, String email){
+    public User(String username, String password, String email, ArrayList<Chat> userChats){
         this.username = username;
         this.password = password;
         this.email = email;
+        this.userChats = userChats;
     }
     public String getEmail(){
         return this.email;
@@ -23,6 +31,9 @@ public String getUsername(){
     private String getPassword(){
         return this.password;
     }
+    public ArrayList<Chat> getUserChats(){
+        return  this.userChats;
+    }
 
     @Override
 //    from Changeable
@@ -36,4 +47,8 @@ public void changeFeature(String feature, String newFeature){
         }
     }
 
+    public void login(){
+        UserAppScreenGateway appScreenGateway = new UserAppScreenGateway(this.getUsername());
+    }
+
 }