Merge remote-tracking branch 'origin/main'

Author: Madhavan7

README.md

@@ -1,6 +1,6 @@
 # SOLID Chat
 
-## Our Progress (Last Updated on Nov 20)
+## Our Progress (Last Updated on Nov 21)
 
 Each of us have created one or more PRs and most of these have been merged into the main branch. Many members have functional UI's (and they are likely happy to demonstrate in tutorial) and others have a basic non-interactive UI and the inner layers of clean architecture. While they may not be able to do an interactive demo, screenshots of these user interfaces are included below.
 
@@ -11,6 +11,9 @@ 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)
 
+- Update on inner layers of the conversation history feature:
+  - The ConvHistInteractor, responsible for displaying a conversation history, was tested (see [here](https://github.com/CSC207-2022F-UofT/course-project-SOLID-chat/pull/32)). To focus testing on the interactor, a mock data access class was used. While the test does not currently pass, the structure of the test is there.
+
 ### 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).

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

@@ -1,12 +1,14 @@
 package entities.user_entities;
 
+import data_access.UserDatabase;
 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.File;
 import java.io.Serializable;
 import java.util.ArrayList;
 
@@ -55,7 +57,7 @@ public Boolean PasswordMatch(String attempt){
     }
 
     public void login(){
-        UserAppScreenGateway appScreenGateway = new UserAppScreenGateway(this.getUsername());
+        UserAppScreenGateway appScreenGateway = new UserAppScreenGateway(this.getUsername(), new UserDatabase(new File("test9")));
     }
 
     public ArrayList<Chat> getChats() {

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

@@ -14,9 +14,9 @@ public class UserAppScreenGateway implements Login {
     /**
      * Create gateway between user and appscreen
      */
-    public UserAppScreenGateway(String username){
+    public UserAppScreenGateway(String username, UserDatabase userDatabase){
         this.username = username;
-        this.userDatabase = new UserDatabase();
+        this.userDatabase = userDatabase;
         login();
     }
 

src/main/java/interface_adapters/login_interface_adapters/UserLoginController.java

@@ -21,6 +21,7 @@ public void allowLogin(){
         try{
             boolean allowLogin = user.PasswordMatch(this.password);
             if(allowLogin){
+                System.out.println("made it here");
                 user.login();
             }else{
                 accessDenied("Wrong Password");

src/main/java/screens/login_screen/UserLoginUI.java

@@ -47,7 +47,7 @@ public void getLoginCredentials(){
         JButton loginButton = new JButton("login");
         loginButton.setBounds(210, 95, 100, 25);
         loginPanel.add(loginButton);
-        loginButton.addActionListener(this);
+        loginButton.addActionListener(this::actionPerformed);
         loginFrame.setVisible(true);
 
     }

src/main/java/screens/user_registration_screen/UserRegistrationUI.java

@@ -102,6 +102,7 @@ public static void main(String[] args){
         UserDatabase testDB = new UserDatabase(new File("Test9"));
         System.out.println(testDB.UserExists("RandomUser", "[email protected]"));
         System.out.println(testDB.getList().size());
+        System.out.println(testDB.getList().get(0).getUsername());
         UserRegistrationUI testUI = new UserRegistrationUI(testDB);
 
         testUI.GetUserCredentials();