Merge remote-tracking branch 'origin/main'

# Conflicts:
#	accounts

Author: parmism

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

@@ -0,0 +1,8 @@
+package data_access;
+
+import interface_adapters.User_search_IA.UserRetriever;
+import use_cases.user_registration_use_cases.UserExists;
+import use_cases.user_registration_use_cases.UserCreator;
+
+public abstract class Database implements UserCreator, UserRetriever, UserExists {
+}

src/main/java/data_access/Database.java

@@ -2,22 +2,19 @@
 
 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, UserChatGateway {
+public class UserDatabase extends Database implements IRetrieveList, UserModificationGateway, UserChatGateway {
     File accounts;
     List<User> accountList;
     public UserDatabase(){
-        this.accounts = new File("accounts");
+        this.accounts = new File("user_accounts");
         if(!accounts.exists()){
             try {
                 accounts.createNewFile();
@@ -146,9 +143,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

@@ -0,0 +1,10 @@
+package entities.chat;
+
+public class CommonPrivatechat implements PrivateChatfactory{
+
+    @Override
+    public PrivateChat create(String name, String chatID, String recipientUsername) {
+        return new PrivateChat(name,chatID,recipientUsername);
+    }
+
+}

src/main/java/entities/chat/CommonPrivatechat.java

@@ -14,25 +14,28 @@ public class PrivateChat extends Chat {
         Arraylist<Message> convHist;
      */
     protected String recipientUsername;
+    protected String senderUsername;
 
     /**
      * Create a private chat
      *
      * @param name  The name of the chat (also the username of the recipient)
      * @param chatID The ID of the chat
-     * @param senderUsername    The user sending the messages
      * @param recipientUsername The user receiving the messages
      *
+     *
      */
-    public PrivateChat(String name, String chatID, String senderUsername, String recipientUsername ){
+    public PrivateChat(String name, String chatID, String recipientUsername ){
         this.name = name;
         this.chatID = chatID;
-        this.senderUsername = senderUsername;
         this.recipientUsername = recipientUsername;
         this.convHist = new ArrayList<Message>();
+
     }
 
 
+
+
     /**
      * Get the recipient's username
      * @return senderRecipient
@@ -45,6 +48,10 @@ public void setRecipientUsername(String recipientUsername) {
         this.recipientUsername= recipientUsername;
     }
 
+    public String getRecipientUsername(String recipientUsername) {
+        return this.recipientUsername;
+    }
+
     public String getSenderUsername(){
         return this.senderUsername;
     }

src/main/java/entities/chat/PrivateChat.java

@@ -0,0 +1,9 @@
+package entities.chat;
+
+//in Entity layer Interface tor create private chat.
+
+public interface PrivateChatfactory {
+
+    PrivateChat create(String name, String chatID, String recipientUsername);
+
+}

src/main/java/entities/chat/PrivateChatfactory.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

@@ -60,7 +60,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("user_accounts")));
+        appScreenGateway.login();
     }
 
     public ArrayList<Chat> getChats() {