Made some minor changes and refactored some parts

Author: amyyong11

src/main/java/entities/chat/GroupChat.java

@@ -1,7 +1,5 @@
 package entities.chat;
 
-import entities.message.Message;
-
 import java.util.ArrayList;
 
 public class GroupChat extends Chat {
@@ -25,7 +23,7 @@ public GroupChat(String name, String chatID, String senderUsername){
         this.name = name;
         this.chatID = chatID;
         this.senderUsername = senderUsername;
-        this.convHist = new ArrayList<Message>();
+        this.convHist = new ArrayList<>();
         this.groupMembers = new ArrayList<>();
     }
 
@@ -35,7 +33,7 @@ public GroupChat(String name, String chatID, String senderUsername){
      * @return groupMembers
      */
     public ArrayList<String> getGroupMembers(){
-        return new ArrayList<String>(this.groupMembers);
+        return new ArrayList<>(this.groupMembers);
     }
 
     /**

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

@@ -1,7 +1,5 @@
 package entities.chat;
 
-import entities.message.Message;
-
 import java.util.ArrayList;
 
 public class PrivateChat extends Chat {
@@ -29,7 +27,7 @@ public PrivateChat(String name, String chatID, String recipientUsername ){
         this.name = name;
         this.chatID = chatID;
         this.recipientUsername = recipientUsername;
-        this.convHist = new ArrayList<Message>();
+        this.convHist = new ArrayList<>();
 
     }
 

src/main/java/interface_adapters/appscreen/AppScreenChatProxy.java

@@ -0,0 +1,38 @@
+package interface_adapters.appscreen;
+
+import entities.chat.Chat;
+import use_cases.appscreen.AppScreenRequestModel;
+import use_cases.appscreen.AppScreenResponseModel;
+import java.util.ArrayList;
+
+public class AppScreenChatProxy {
+
+    private final String username;
+    private final Chat chat;
+
+    /**
+     * Create a proxy between app screen and a chat
+     * @param username Username of the current user
+     * @param chat The new/updated chat
+     */
+    public AppScreenChatProxy(String username, Chat chat){
+        this.username = username;
+        this.chat = chat;
+    }
+
+    /**
+     * Main source for managing chat order and updating it in user database (for a single user)
+     */
+    public void proxyChat() {
+        // get the new chat order
+        AppScreenRequestModel requestModel = new AppScreenRequestModel(this.username, this.chat);
+        ArrayList<Chat> newOrder = requestModel.orderChats();
+
+        // update the user's chat list in user database
+        AppScreenController controller = new AppScreenController(this.username);
+        controller.createGateway(newOrder);
+
+        // update the AppScreen UI
+        AppScreenResponseModel.refreshScreen();
+    }
+}

src/main/java/interface_adapters/appscreen/AppScreenController.java

@@ -1,37 +1,17 @@
 package interface_adapters.appscreen;
 
-import data_access.UserDatabase;
 import entities.chat.Chat;
-import use_cases.appscreen.ChatInfo;
-import use_cases.appscreen.ChatOrder;
-
-import java.io.File;
 import java.util.ArrayList;
 
 public class AppScreenController{
-
     private final String username;
-    private final String chatID;
-
 
     /**
      * Create an app screen controller
      * @param username Username of the user
-     * @param chatID ID the chat with an update
      */
-    public AppScreenController(String username, String chatID){
+    public AppScreenController(String username){
         this.username = username;
-        this.chatID = chatID;
-
-    }
-
-    /**
-     * Return the chat with the given ID
-     * @return Chat with given ID
-     */
-    public Chat getChat(){
-        ChatInfo chatInfo = new ChatInfo(this.username, this.chatID);
-        return chatInfo.getChat();
 
     }
 

src/main/java/interface_adapters/appscreen/AppScreenLoader.java

@@ -1,6 +1,5 @@
 package interface_adapters.appscreen;
 
-import entities.chat.Chat;
 import screens.appscreen.AppScreen;
 import use_cases.appscreen.AppScreenStatus;
 
@@ -9,14 +8,15 @@
 public class AppScreenLoader implements AppScreenPresenter {
 
     private final String username;
-    private final ArrayList<Chat> chats;
+    private final ArrayList<String> chats;
     public AppScreen appScreen;
 
     /**
-     * Create the app screen loader (and store its user and chat information)
+     * Create the app screen loader
      * @param username The username of the current user
+     * @param chats A list of chatIDs of all the chats the given user has
      */
-    public AppScreenLoader(String username, ArrayList<Chat> chats){
+    public AppScreenLoader(String username, ArrayList<String> chats){
         this.username = username;
         this.chats = chats;
 

src/main/java/interface_adapters/appscreen/UserAppScreenGateway.java

@@ -12,20 +12,26 @@ public class UserAppScreenGateway implements Login {
 
     private final UserDatabase userDatabase = new UserDatabase(new File("user_accounts"));
     private final String username;
+    private final ArrayList<Chat> userChats;
 
     /**
-     * Create gateway between user and appscreen
+     * Create gateway between user and app screen
      */
     public UserAppScreenGateway(String username){
         this.username = username;
+        this.userChats = userDatabase.getUserChats(this.username);
     }
 
     /**
      * Log the user into the system
      */
     public void login(){
-        ArrayList<Chat> userChats = userDatabase.getUserChats(this.username);
-        AppScreenLoader appScreenLoader = new AppScreenLoader(this.username, userChats);
+        ArrayList<String> chatIDs = new ArrayList<>();
+
+        for (Chat chat: userChats){
+            chatIDs.add(chat.getChatID());
+        }
+        AppScreenLoader appScreenLoader = new AppScreenLoader(this.username, chatIDs);
         appScreenLoader.openScreen();
     }
 

src/main/java/screens/appscreen/AppScreen.java

@@ -1,9 +1,9 @@
 package screens.appscreen;
 
-import entities.chat.Chat;
 import entities.chat.CommonPrivatechat;
 import entities.chat.PrivateChatfactory;
 import interface_adapters.appscreen.AppScreenPresenter;
+import interface_adapters.appscreen.Refresh;
 import screens.Profile_screen.UserSearchUI;
 import screens.chat_screen.ChatController;
 import screens.chat_screen.ChatView;
@@ -17,25 +17,26 @@
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 
-public class AppScreen implements AppScreenPresenter {
+public class AppScreen implements AppScreenPresenter, Refresh {
 
     private final JFrame jFrame;
     private JScrollPane jScrollPane;
     private final String currentUsername;
-    private ArrayList<Chat> chats;
+    private ArrayList<String> chats;
 
 
     /**
      Create an AppScreen object
      @param chats This is a list of chats given by the user (the list will always come as sorted with the
      most recent chats at the end of the list)
      */
-    public AppScreen(String currentUsername, ArrayList<Chat> chats) {
+    public AppScreen(String currentUsername, ArrayList<String> chats) {
         this.currentUsername = currentUsername;
         this.chats = chats;
         jFrame = new JFrame();
         jFrame.setSize(300, 500);
         jFrame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+        jFrame.setLocation(300, 100);
 
 
         // top panel containing the buttons for creating a new chat
@@ -118,7 +119,7 @@ public void displayAppScreen(){
         // getting the names of each chat to display and creating buttons for each chat
         for (int i = this.chats.size() - 1; i > -1; i--) {
 
-            ChatInfo chatInfo = new ChatInfo(currentUsername, this.chats.get(i).getChatID());
+            ChatInfo chatInfo = new ChatInfo(currentUsername, this.chats.get(i));
 
             String chatName = chatInfo.getChatName();
             LocalDateTime lastUpdated = chatInfo.getLastMessageTime();

src/main/java/screens/chat_screen/ChatController.java

@@ -7,9 +7,11 @@
 public class ChatController {
 
     ChatInputBoundry chatinputboundry;
+    String username;
     PrivateChat newprivatechat;
-    public ChatController(ChatInputBoundry chatinputboundry) {
+    public ChatController(ChatInputBoundry chatinputboundry, String username) {
         this.chatinputboundry = chatinputboundry;
+        this.username = username;
     }
 
     // this method is used in UI to set the recipient username

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

@@ -42,7 +42,7 @@
 public class ChatView extends JFrame implements  ActionListener{
     //use Contrroller
 
-    private ChatController controller;
+    private final ChatController controller;
 
     //Use Jframes, butttons, labels ,textfileds, Jpannels,JMenuBar for UI.
     final JFrame frame ;
@@ -69,7 +69,7 @@ public class ChatView extends JFrame implements  ActionListener{
 
 
     //this is constructor
-    public ChatView( ChatController controller , boolean isNewchat){
+    public ChatView(ChatController controller , boolean isNewchat){
         this.controller = controller;
         this.isNewchat = isNewchat;
 
@@ -110,7 +110,6 @@ public ChatView( ChatController controller , boolean isNewchat){
         // set frame size and frame title
         frame.setSize(450, 500);
         frame.setTitle("Chat box");
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
 
         // adding "addbutton" and "groupchatbutton"  to the menu bar
@@ -165,6 +164,7 @@ public ChatView( ChatController controller , boolean isNewchat){
 
 
         frame.getContentPane().add(BorderLayout.CENTER, conversationHistoryPanel);
+        frame.setLocation(587, 100);
 
         // set the frame visibile
         frame.setVisible(true);