Refactored some parts to make it more clean

Author: amyyong11

src/main/java/interface_adapters/app_screen_interface_adapters/AppScreenController.java

@@ -0,0 +1,70 @@
+package interface_adapters.app_screen_interface_adapters;
+
+import data_access.UserDatabase;
+import entities.chat.Chat;
+import use_cases.app_screen_use_case.ChatOrder;
+
+import java.io.File;
+import java.util.ArrayList;
+
+public class AppScreenController{
+
+    private final String username;
+    private final String chatID;
+    private final UserDatabase userDatabase;
+
+
+    /**
+     * 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){
+        this.username = username;
+        this.chatID = chatID;
+        this.userDatabase = new UserDatabase(new File("user_accounts"));
+
+    }
+
+    /**
+     * Return the chat with the given ID
+     * @return Chat with given ID
+     */
+    public Chat getChat(){
+        ArrayList<Chat> userChats = this.userDatabase.getUser(this.username).getUserChats();
+        for (Chat chat: userChats){
+            if (chat.getChatID().equals(this.chatID)){
+                return chat;
+            }
+        }
+        throw new RuntimeException("User is not part of this chat");
+
+    }
+
+    /**
+     * Controller to update the screen and change the order chats of in user database
+     */
+    public void updateScreen(){
+        ChatOrder chatOrder = new ChatOrder(this.username);
+        ArrayList<Chat> newOrder = chatOrder.changeOrder(this.chatID);
+        createGateway(newOrder);
+
+    }
+
+    /**
+     * Create the gateway to save a user's chat list order in the user database
+     */
+    public void createGateway(ArrayList<Chat> newOrder){
+        UserAppScreenGateway gateway = new UserAppScreenGateway(this.username,
+                new UserDatabase(new File("user_accounts")));
+        try{
+            gateway.updateUserChatList(this.username, newOrder);
+        } 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/interface_adapters/app_screen_interface_adapters/AppScreenLoader.java

@@ -1,7 +1,6 @@
 package interface_adapters.app_screen_interface_adapters;
 
 import entities.chat.Chat;
-import use_cases.app_screen_use_case.AppScreenPresenter;
 import screens.app_screen.AppScreen;
 
 import java.util.ArrayList;
@@ -19,11 +18,6 @@ public class AppScreenLoader implements AppScreenPresenter {
     public AppScreenLoader(String username, ArrayList<Chat> chats){
         this.username = username;
         this.chats = chats;
-        try {
-            openScreen();
-        } catch (Exception e) {
-            throw new RuntimeException("Unexpected Interruption: cannot load screen");
-        }
 
     }
 
@@ -32,7 +26,11 @@ public AppScreenLoader(String username, ArrayList<Chat> chats){
      */
     @Override
     public void openScreen() {
-        this.appScreen = new AppScreen(this.username, this.chats);
+        try {
+            this.appScreen = new AppScreen(this.username, this.chats);
+        } catch (Exception e) {
+            throw new RuntimeException("Unexpected Interruption: cannot load screen");
+        }
     }
 
 }

src/main/java/use_cases/app_screen_use_case/AppScreenPresenter.java renamed to src/main/java/interface_adapters/app_screen_interface_adapters/AppScreenPresenter.java

@@ -1,4 +1,4 @@
-package use_cases.app_screen_use_case;
+package interface_adapters.app_screen_interface_adapters;
 
 public interface AppScreenPresenter {
     void openScreen();

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

@@ -26,8 +26,14 @@ public UserAppScreenGateway(String username, UserDatabase userDatabase){
     public void login(){
         ArrayList<Chat> userChats = this.userDatabase.getUserChats(this.username);
         AppScreenLoader appScreenLoader = new AppScreenLoader(this.username, userChats);
+        appScreenLoader.openScreen();
     }
 
+    /**
+     * Update and save the order of chats for a user in UserDatabase
+     * @param username Username of the current user
+     * @param userChats Updated list of chats in order
+     */
     public void updateUserChatList(String username, ArrayList<Chat> userChats){
         User currentUser = this.userDatabase.getUser(username);
         currentUser.getUserChats().clear();

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

@@ -1,11 +1,10 @@
 package screens.app_screen;
 
-
-import data_access.UserDatabase;
 import entities.chat.Chat;
 import entities.chat.CommonPrivatechat;
 import entities.chat.PrivateChatfactory;
-import interface_adapters.app_screen_interface_adapters.UserAppScreenGateway;
+import interface_adapters.app_screen_interface_adapters.AppScreenController;
+import interface_adapters.app_screen_interface_adapters.AppScreenPresenter;
 import screens.chat_screen.ChatController;
 import screens.chat_screen.ChatView;
 import use_cases.app_screen_use_case.*;
@@ -14,11 +13,10 @@
 
 import javax.swing.*;
 import java.awt.*;
-import java.io.File;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 
-public class AppScreen implements AppScreenPresenter, AppScreenController, ChatName, Refresh, LastUpdate {
+public class AppScreen implements AppScreenPresenter, ChatName, LastUpdate {
 
     private final JFrame jFrame;
     private JScrollPane jScrollPane;
@@ -149,66 +147,23 @@ public String getChatName(Chat chat) {
         return chat.getName();
     }
 
-    /**
-     * Update the order of the chats
-     * @param chat The chat that has an update
-     */
-    public void updateChatOrder(Chat chat){
-
-        if (this.chats.contains(chat)) {
-            this.chats.remove(chat);
-            this.chats.add(chat);
-        }
-        else {
-            this.chats.add(chat);
-        }
-
-    }
 
     /**
      * Update the order of chats that appear on screen if there was a change to conversation history
      * This should be called if a new chat was added or if an existing chat has a new message
-     * @param chat The chat with an update
+     * @param chatID The ID of the chat with an update
      */
-    @Override
-    public void updateScreen(Chat chat) {
-        updateChatOrder(chat);
+    public void refreshScreen(String chatID) {
+        AppScreenController appScreenController = new AppScreenController(currentUsername, chatID);
+        appScreenController.updateScreen();
+
+        ChatOrder chatOrder = new ChatOrder(currentUsername);
+        this.chats = chatOrder.getUserChats();
+
         jFrame.remove(this.jScrollPane);
-        createGateway();
 
         // refresh the screen
         displayAppScreen();
     }
 
-    /**
-     * Get the existing chat object given its chat ID
-     * @param chatID The ID of the existing chat
-     * @return The existing chat with the given ID
-     */
-    @Override
-    public Chat getChat(String chatID) {
-        for (Chat chat: this.chats){
-            if (chat.getChatID().equals(chatID)){
-                return chat;
-            }
-        }
-        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("user_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/use_cases/app_screen_use_case/AppScreenController.java

@@ -0,0 +1,50 @@
+package use_cases.app_screen_use_case;
+
+import data_access.UserDatabase;
+import entities.chat.Chat;
+import interface_adapters.app_screen_interface_adapters.AppScreenController;
+
+import java.io.File;
+import java.util.ArrayList;
+
+public class ChatOrder {
+
+    private final String username;
+    private final ArrayList<Chat> userChats;
+
+    /**
+     * Create a chat order object
+     * @param username Username of the current user
+     */
+    public ChatOrder(String username){
+        this.username = username;
+        UserDatabase userDatabase = new UserDatabase(new File("user_accounts"));
+        this.userChats = userDatabase.getUserChats(username);
+    }
+
+    /**
+     * Return the chats that the given user has
+     * @return List of the given user's chats
+     */
+    public ArrayList<Chat> getUserChats(){
+        return this.userChats;
+    }
+
+    /**
+     * Update the order of the chats
+     * @param chatID The ID of the chat that has an update
+     */
+    public ArrayList<Chat> changeOrder(String chatID){
+
+        AppScreenController appScreenController = new AppScreenController(this.username, chatID);
+        Chat updatedChat = appScreenController.getChat();
+        if (this.userChats.contains(updatedChat)) {
+            this.userChats.remove(updatedChat);
+            this.userChats.add(updatedChat);
+        }
+        else {
+            this.userChats.add(updatedChat);
+        }
+        return this.userChats;
+    }
+}