Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/java/screens/app_screen/AppScreen.java
#	src/main/java/use_cases/chat_initiation_use_case/ChatInteractor.java

Author: Nasim Bondar Sahebi

README.md

@@ -42,9 +42,14 @@ Each of us have created one or more PRs and most of these have been merged into
 - 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
+- App screen provides an ordered list of a user's chats and also allows a user to create new chats
+- Each chat button will also display a date indicating the date of the last message in a chat's conversation history, or no date if a chat has no messages 
+- ChatView (the window referenced above) will open upon clicking an existing chat to display the chats's GUI
+- With respect to ChatView, clicking on the +Private Chat and +Group Chat buttons will also open an instance of ChatView for a user to create a new chat
+
+<img width="214" alt="appscreen-nov 25" src="https://user-images.githubusercontent.com/71410005/204060542-82bb8432-09fc-4379-aee6-7a9039e58029.png">
+
+
 
 ### User Registration and Login
 - By Madhav

accounts

@@ -146,9 +146,8 @@ public void modifyUser(String oldUsername, User modified){
     @Override
     public ArrayList<Chat> getUserChats(String username) {
         for (User user: accountList){
-            //if(getUser(username).equals(user)){
             if(user.getUsername().equals(username)){
-                return user.getUserChats();
+                return user.getChats();
             }
         }
         throw new RuntimeException("Invalid username");

src/main/java/data_access/UserDatabase.java

@@ -1,10 +1,11 @@
 package entities.chat;
 import entities.message.Message;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 // Chat is an abstract class
-public class Chat {
+public class Chat implements Serializable {
 
     protected String name;
     protected String chatID;
@@ -43,14 +44,14 @@ public String getSenderUsername(){
      * @return convHist
      */
     public ArrayList<Message> getConvHist(){
-        return new ArrayList<Message>(this.convHist);
+        return new ArrayList<>(this.convHist);
     }
 
     /**
      * Add a message to the chat's conversation history when a message is sent or received
      * @param message Message that is sent or received
      */
-    public void addtoconvHist(Message message){
+    public void addToConvHist(Message message){
         this.convHist.add(message);
     }
 

src/main/java/entities/chat/Chat.java

@@ -1,13 +1,14 @@
 package entities.message;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
  * Message (abstract class) containing the message content and associated metadata
  * The type of the message content is dependent on which child(ren) of Message the message is
  * The metadata is universal for all message types and includes the ID of the sender, timestamp, ID of message
  */
-public abstract class Message {
+public abstract class Message implements Serializable{
     /**
      * ID of message sender (UUID)
      */

src/main/java/entities/message/Message.java

@@ -6,7 +6,6 @@
 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;
@@ -57,7 +56,8 @@ public Boolean PasswordMatch(String attempt){
     }
 
     public void login(){
-        UserAppScreenGateway appScreenGateway = new UserAppScreenGateway(this.getUsername(), new UserDatabase(new File("test9")));
+        UserAppScreenGateway appScreenGateway = new UserAppScreenGateway(this.getUsername(), new UserDatabase(new File("accounts")));
+        appScreenGateway.login();
     }
 
     public ArrayList<Chat> getChats() {

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

@@ -2,6 +2,7 @@
 
 import data_access.UserDatabase;
 import entities.chat.Chat;
+import entities.user_entities.User;
 import interface_adapters.login_interface_adapters.Login;
 
 import java.util.ArrayList;
@@ -17,7 +18,6 @@ public class UserAppScreenGateway implements Login {
     public UserAppScreenGateway(String username, UserDatabase userDatabase){
         this.username = username;
         this.userDatabase = userDatabase;
-        login();
     }
 
     /**
@@ -28,4 +28,11 @@ public void login(){
         AppScreenLoader appScreenLoader = new AppScreenLoader(this.username, userChats);
     }
 
+    public void updateUserChatList(String username, ArrayList<Chat> userChats){
+        User currentUser = this.userDatabase.getUser(username);
+        currentUser.getUserChats().clear();
+        currentUser.getUserChats().addAll(userChats);
+        this.userDatabase.modifyUser(username, currentUser);
+
+    }
 }

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

@@ -21,7 +21,6 @@ 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/interface_adapters/login_interface_adapters/UserLoginController.java

@@ -1,17 +1,15 @@
 package screens.app_screen;
 
 
+import data_access.UserDatabase;
 import entities.chat.Chat;
-import entities.chat.CommonPrivatechat;
-import entities.chat.PrivateChatfactory;
-import screens.chat_screen.ChatController;
+import interface_adapters.app_screen_interface_adapters.UserAppScreenGateway;
 import screens.chat_screen.ChatView;
 import use_cases.app_screen_use_case.*;
-import use_cases.chat_initiation_use_case.ChatInputBoundry;
-import use_cases.chat_initiation_use_case.ChatInteractor;
 
 import javax.swing.*;
 import java.awt.*;
+import java.io.File;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 
@@ -48,14 +46,8 @@ public AppScreen(String currentUsername, ArrayList<Chat> chats) {
 
         // adding the action listeners for the +private-chat and +group-chat buttons
         addPrivateChat.addActionListener(e -> {
-        //TODO AMY please double check this part(Nasim)
-
-        PrivateChatfactory chatfactory = new CommonPrivatechat();
-        ChatInputBoundry Interactor = new ChatInteractor(chatfactory);
-        ChatController controller = new ChatController(Interactor);
-        new ChatView(controller,true);
-        ChatView newChat = new ChatView(controller,true);
-
+            ChatView newChat = new ChatView(true);
+            newChat.chatDisplay();
 
         });
         //TODO: add groupchat action
@@ -176,6 +168,7 @@ public void addNewChat(Chat chat){
         if (!(this.chats.contains(chat))){
             updateChatOrder(chat);
             jFrame.remove(this.jScrollPane);
+            createGateway();
 
             // refresh the screen
             displayAppScreen();
@@ -190,28 +183,12 @@ public void addNewChat(Chat chat){
      */
     @Override
     public void updateScreen(String chatID) {
-        if (hasUpdate(chatID)){
-
-            updateChatOrder(getChat(chatID));
-            jFrame.remove(this.jScrollPane);
+        updateChatOrder(getChat(chatID));
+        jFrame.remove(this.jScrollPane);
+        createGateway();
 
-            // refresh the screen
-            displayAppScreen();
-        }
-    }
-
-    /**
-     * Return true if the given existing chat has an update to its conversation history
-     * @param chatID The ID of the given chat
-     * @return true/false
-     */
-    @Override
-    public boolean hasUpdate(String chatID) {
-        Chat chat = getChat(chatID);
-        if (!(this.chats.isEmpty())) {
-            return !(this.chats.get(this.chats.size() - 1).equals(chat));
-        }
-        return true;
+        // refresh the screen
+        displayAppScreen();
     }
 
     /**
@@ -229,4 +206,20 @@ public Chat getChat(String chatID) {
         throw new RuntimeException("User does not currently have this chat");
     }
 
+    /**
+     * Create the gateway to save a user's chat list order in the user database
+     */
+    public void createGateway(){
+        UserAppScreenGateway gateway = new UserAppScreenGateway(currentUsername,
+                new UserDatabase(new File("accounts")));
+        try{
+            gateway.updateUserChatList(currentUsername, this.chats);
+        } catch (NullPointerException e) {
+            throw new NullPointerException("New chat list is empty");
+        }
+        catch (Exception e){
+            throw new RuntimeException("Unable to update chat order");
+        }
+    }
+
 }

src/main/java/screens/app_screen/AppScreen.java

@@ -47,13 +47,13 @@ public void getLoginCredentials(){
         JButton loginButton = new JButton("login");
         loginButton.setBounds(210, 95, 100, 25);
         loginPanel.add(loginButton);
-        loginButton.addActionListener(this::actionPerformed);
+        loginButton.addActionListener(this);
         loginFrame.setVisible(true);
 
     }
 
     public static void main(String[] args){
-        UserRetriever testDB = new UserDatabase(new File("Test9"));
+        UserRetriever testDB = new UserDatabase(new File("accounts"));
         UserLoginUI screen = new UserLoginUI(testDB);
         screen.getLoginCredentials();
     }