Merge remote-tracking branch 'origin/main'

Author: Madhavan7

README.md

@@ -11,6 +11,39 @@ Each of us have created one or more PRs and most of these have been merged into
 
 ![image](https://user-images.githubusercontent.com/18428059/202935072-ba09587d-c67d-4599-9986-9c652480356f.png)
 
+### Profile display
+- By Parmis
+- Implemented by UserSearchUI, which allows a user to type in a user's username to view their features (user and username so far).
+- User information is captured using ChangeController interface, which uses UserDatabse interfaces to retrieve the user of interest:
+![img.png](img.png)
+- Here, Alex123 is not a user of the chat system:
+![img_1.png](img_1.png)
+- parmis is a user of the chat system though:
+![img_2.png](img_2.png)
+
+### Profile feature modification
+- By Parmis
+- Implemented by UserMdoificationUI, which allows a user to verify their authority to access their account by confirming their username and password, and then choosing the feature they wish to modify, and enter the new value for it. 
+- User information is captured using UserPresenter interface, which uses UserAuthenticationI to confirm user's authority to make the change, then uses Changeable interface (use case) to make the changes to the User entity, and finally uses UserModificationGateway to relay the changed info to UserDatabase:
+![img_3.png](img_3.png)
+- Here: Parmis's password is actually 123, so she doesn't get the chance to change her email:
+![img_4.png](img_4.png)
+- as you can see, her email is unchanged.
+- now she enters the right password and tries again:
+![img_5.png](img_5.png)
+- This time, change was successful. She could use this tool to similarly change her username or password too:
+![img_6.png](img_6.png)
+
+
+### App Screen UI
+- By Amy
+- The App Screen UI is the screen that acts as a proxy between the user's login screen and their individual chats
+- Upon logging in, a user will will be rendered with a view of app screen
+- App Screen provides an ordered list of a user's chats, allowing the user to open an individual chat by clicking the chat button
+- ChatView(the window referenced above) will open, displaying the chats's GUI
+- Apart from that, app screen also provides buttons that allow a user to create new chats
+
+
 
 ## Template Readme
 This is a template repository for CSC 207 projects. 

src/main/java/data_access/UserDatabase.java

@@ -1,17 +1,19 @@
 package data_access;
 
+import entities.chat.Chat;
 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.Chat.UserChatGateway;
 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 {
+public class UserDatabase implements UserExists, UserRetriever, UserCreator, IRetrieveList, UserModificationGateway, UserChatGateway {
     File accounts;
     List<User> accountList;
     public UserDatabase(){
@@ -125,6 +127,16 @@ public void modifyUser(String oldUsername, User modified){
         }
     }
 
+    @Override
+    public ArrayList<Chat> getUserChats(String username) {
+        for (User user: accountList){
+            if (getUser(username).equals(user)){
+                return user.getUserChats();
+            }
+        }
+        throw new RuntimeException("Invalid username");
+    }
+
     // Below two methods are used by conversation history-related interactors
     // (Commented as objects are not found)
 //    /**

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

@@ -1,14 +1,16 @@
 package entities.user_entities;
 
 import entities.chat.Chat;
+import interface_adapters.profile_modification_IA.UserAuthenticationI;
 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;
 import java.util.ArrayList;
 
-public abstract class User implements Serializable, Changeable, Login {
+public abstract class User implements Serializable, Changeable, Login, UserAuthenticationI {
     protected String username;
     protected String password;
     protected String email;
@@ -47,6 +49,7 @@ public void changeFeature(String feature, String newFeature){
         }
     }
 
+    @Override
     public Boolean PasswordMatch(String attempt){
         return (this.getPassword().equals(attempt));
     }
@@ -55,4 +58,9 @@ public void login(){
         UserAppScreenGateway appScreenGateway = new UserAppScreenGateway(this.getUsername());
     }
 
+    public ArrayList<Chat> getChats() {
+        return this.userChats;
+    }
+
+
 }

src/main/java/interface_adapters/Chat/UserChatGateway.java

@@ -1,8 +1,10 @@
 package interface_adapters.Chat;
 
+import entities.chat.Chat;
+
 import java.util.ArrayList;
 
 public interface UserChatGateway {
 
-    // ArrayList<Chat> getUserChats(String username);
+    ArrayList<Chat> getUserChats(String username);
 }

src/main/java/interface_adapters/app_screen_interface_adapters/UserAppScreenGateway.java

@@ -1,10 +1,7 @@
 package interface_adapters.app_screen_interface_adapters;
 
-import java.util.ArrayList;
-
-import entities.chat.Chat;
-import interface_adapters.*;
 import data_access.UserDatabase;
+import entities.chat.Chat;
 import interface_adapters.login_interface_adapters.Login;
 
 import java.util.ArrayList;
@@ -13,7 +10,6 @@ public class UserAppScreenGateway implements Login {
 
     private final UserDatabase userDatabase;
     private final String username;
-    private ArrayList<Chat> userChats;
 
     /**
      * Create gateway between user and appscreen
@@ -27,9 +23,9 @@ public UserAppScreenGateway(String username){
     /**
      * Log the user into the system
      */
-    public void login(){;
-        this.userChats = this.userDatabase.getUserChats(this.username);
-        AppScreenLoader appScreenLoader = new AppScreenLoader(this.username, this.userChats);
+    public void login(){
+        ArrayList<Chat> userChats = this.userDatabase.getUserChats(this.username);
+        AppScreenLoader appScreenLoader = new AppScreenLoader(this.username, userChats);
     }
 
 }

src/main/java/interface_adapters/profile_modification_IA/UserAuthenticationI.java

@@ -0,0 +1,7 @@
+package interface_adapters.profile_modification_IA;
+
+// allows for ChangeController to authenticate user's username and password.
+
+public interface UserAuthenticationI {
+    public Boolean PasswordMatch(String attempt);
+}

src/main/java/screens/Profile_screen/UserSearchUI.java

@@ -31,6 +31,7 @@ public void actionPerformed(ActionEvent e) {
             }
 
         });
+        frame.setTitle("User Search Tool");
         frame.add(field);
         label = new JLabel();
         frame.add(label);

src/main/java/screens/chat_screen/ChatView.java

@@ -93,7 +93,7 @@ public ChatView( boolean isNewchat){
 
 
     // create a setup for display of buttons and other component of the frame.
-    public void chatdisplay(){
+    public void chatDisplay(){
 
         // set frame size and frame title
         frame.setSize(450, 500);

src/main/java/screens/profile_update_screen/UserModificationUI.java

@@ -62,6 +62,7 @@ public void actionPerformed(ActionEvent e) {
 
         label = new JLabel();
 
+        frame.setTitle("Profile Editor Tool");
         frame.add(usernameField);
         frame.add(passwordField);
         frame.add(cb);

src/main/java/use_cases/app_screen_use_case/ChatName.java

@@ -1,6 +1,5 @@
 package use_cases.app_screen_use_case;
 
-
 import entities.chat.Chat;
 
 public interface ChatName {