Made some changes to adhere to clean architecture

Author: amyyong11

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

@@ -35,22 +35,11 @@ public Chat getChat(){
 
     }
 
-    /**
-     * 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(getChat());
-        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")));
+        UserAppScreenGateway gateway = new UserAppScreenGateway(this.username);
         try{
             gateway.updateUserChatList(this.username, newOrder);
         } catch (NullPointerException e) {

src/main/java/interface_adapters/appscreen/Refresh.java

@@ -1,5 +1,5 @@
 package interface_adapters.appscreen;
 
 public interface Refresh {
-    void refreshScreen(String chatID);
+    void refreshScreen();
 }

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

@@ -5,26 +5,26 @@
 import entities.user_entities.User;
 import interface_adapters.login_interface_adapters.Login;
 
+import java.io.File;
 import java.util.ArrayList;
 
 public class UserAppScreenGateway implements Login {
 
-    private final UserDatabase userDatabase;
+    private final UserDatabase userDatabase = new UserDatabase(new File("user_accounts"));
     private final String username;
 
     /**
      * Create gateway between user and appscreen
      */
-    public UserAppScreenGateway(String username, UserDatabase userDatabase){
+    public UserAppScreenGateway(String username){
         this.username = username;
-        this.userDatabase = userDatabase;
     }
 
     /**
      * Log the user into the system
      */
     public void login(){
-        ArrayList<Chat> userChats = this.userDatabase.getUserChats(this.username);
+        ArrayList<Chat> userChats = userDatabase.getUserChats(this.username);
         AppScreenLoader appScreenLoader = new AppScreenLoader(this.username, userChats);
         appScreenLoader.openScreen();
     }
@@ -41,4 +41,5 @@ public void updateUserChatList(String username, ArrayList<Chat> userChats){
         this.userDatabase.modifyUser(username, currentUser);
 
     }
+
 }

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

@@ -3,6 +3,7 @@
 import entities.chat.Chat;
 import entities.chat.CommonPrivatechat;
 import entities.chat.PrivateChatfactory;
+import interface_adapters.appscreen.AppScreenController;
 import interface_adapters.appscreen.AppScreenPresenter;
 import interface_adapters.appscreen.Refresh;
 import screens.chat_screen.ChatController;
@@ -16,7 +17,7 @@
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 
-public class AppScreen implements AppScreenPresenter, Refresh {
+public class AppScreen implements AppScreenPresenter {
 
     private final JFrame jFrame;
     private JScrollPane jScrollPane;
@@ -51,7 +52,7 @@ public AppScreen(String currentUsername, ArrayList<Chat> chats) {
         addPrivateChat.addActionListener(e -> {
             PrivateChatfactory privateChatfactory = new CommonPrivatechat();
             ChatInputBoundry inputBoundry = new ChatInteractor(privateChatfactory);
-            ChatController controller = new ChatController(inputBoundry);
+            ChatController controller = new ChatController(inputBoundry, currentUsername);
             new ChatView(controller, true);
 
         });
@@ -132,11 +133,8 @@ private void scrollableChats(JPanel jPanel) {
     /**
      * 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 chatID The ID of the chat with an update
      */
-    public void refreshScreen(String chatID) {
-        ChatOrder chatOrder = new ChatOrder(currentUsername);
-        this.chats = chatOrder.getUserChats();
+    public void refreshScreen() {
 
         jFrame.remove(this.jScrollPane);
 

src/main/java/use_cases/appscreen/AppScreenChatProxy.java

@@ -0,0 +1,28 @@
+package use_cases.appscreen;
+
+import entities.chat.Chat;
+import interface_adapters.appscreen.AppScreenController;
+import interface_adapters.appscreen.Refresh;
+
+import java.util.ArrayList;
+
+public class AppScreenChatProxy implements Refresh {
+
+    private final String username;
+    private final Chat chat;
+
+    public AppScreenChatProxy(String username, Chat chat){
+        this.username = username;
+        this.chat = chat;
+    }
+
+    @Override
+    public void refreshScreen() {
+        AppScreenRequestModel requestModel = new AppScreenRequestModel(this.username, this.chat);
+        ArrayList<Chat> newOrder = requestModel.orderChats();
+        AppScreenController controller = new AppScreenController(this.username, this.chat.getChatID());
+        controller.createGateway(newOrder);
+
+        AppScreenResponseModel.refreshScreen();
+    }
+}

src/main/java/use_cases/appscreen/AppScreenRequestModel.java

@@ -1,13 +1,22 @@
 package use_cases.appscreen;
 
+import entities.chat.Chat;
 import interface_adapters.appscreen.AppScreenController;
 
+import java.util.ArrayList;
+
 public class AppScreenRequestModel {
 
-    public AppScreenRequestModel(String username, String chatID){
-        AppScreenController appScreenController = new AppScreenController(username, chatID);
-        appScreenController.updateScreen();
-        AppScreenResponseModel.refreshScreen(chatID);
+    private String username;
+    private Chat chat;
+    public AppScreenRequestModel(String username, Chat chat){
+        this.username = username;
+        this.chat = chat;
+    }
+
+    public ArrayList<Chat> orderChats(){
+        ChatOrder chatOrder  = new ChatOrder(username, chat);
+        return chatOrder.changeOrder();
     }
 
 }

src/main/java/use_cases/appscreen/AppScreenResponseModel.java

@@ -1,8 +1,13 @@
 package use_cases.appscreen;
 
+import entities.chat.Chat;
+import interface_adapters.appscreen.UserAppScreenGateway;
+
+import java.util.ArrayList;
+
 public class AppScreenResponseModel {
 
-    public static void refreshScreen(String chatID) {
-        AppScreenStatus.getAppScreen().refreshScreen(chatID);
+    public static void refreshScreen() {
+        AppScreenStatus.getAppScreen().refreshScreen();
     }
 }

src/main/java/use_cases/appscreen/ChatOrder.java

@@ -2,21 +2,28 @@
 
 import data_access.UserDatabase;
 import entities.chat.Chat;
+import interface_adapters.Chat.UserChatGateway;
 
 import java.io.File;
 import java.util.ArrayList;
 
 public class ChatOrder {
 
+    private final String username;
+    private final Chat chat;
+
     private final ArrayList<Chat> userChats;
 
     /**
      * Create a chat order object
-     * @param username Username of the current user
+     * @param username The username of the user
+     * @param chat The given chat
      */
-    public ChatOrder(String username){
-        UserDatabase userDatabase = new UserDatabase(new File("user_accounts"));
-        this.userChats = userDatabase.getUserChats(username);
+    public ChatOrder(String username, Chat chat){
+        this.username = username;
+        this.chat = chat;
+        this.userChats = new UserDatabase(new File("user_accounts")).getUserChats(username);
+
     }
 
     /**
@@ -28,17 +35,16 @@ public ArrayList<Chat> getUserChats(){
     }
 
     /**
-     * Update the order of the chats
-     * @param updatedChat The chat that has an update
+     * Update the order of the chats and return the new lisst
      */
-    public ArrayList<Chat> changeOrder(Chat updatedChat){
+    public ArrayList<Chat> changeOrder(){
 
-        if (this.userChats.contains(updatedChat)) {
-            this.userChats.remove(updatedChat);
-            this.userChats.add(updatedChat);
+        if (this.userChats.contains(this.chat)) {
+            this.userChats.remove(this.chat);
+            this.userChats.add(this.chat);
         }
         else {
-            this.userChats.add(updatedChat);
+            this.userChats.add(this.chat);
         }
         return this.userChats;
     }

src/test/java/testappscreen/TestChatOrder.java

@@ -0,0 +1,52 @@
+package testappscreen;
+
+import entities.chat.Chat;
+import entities.chat.PrivateChat;
+import entities.user_entities.BasicUser;
+import use_cases.appscreen.ChatOrder;
+
+import java.util.ArrayList;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestChatOrder {
+
+    static PrivateChat pv1 = new PrivateChat("name1", "1", "amy");
+    static PrivateChat pv2 = new PrivateChat("name2", "2", "amy");
+    static PrivateChat pv3 = new PrivateChat("name3", "3", "amy");
+    static PrivateChat pv4 = new PrivateChat("name4", "4", "amy");
+    static PrivateChat pv5 = new PrivateChat("name5", "5", "amy");
+    static PrivateChat pv6 = new PrivateChat("name6", "6", "amy");
+
+//    public static void main(String[] args) {
+//
+//        ArrayList<Chat> myChats = new ArrayList<>();
+//        myChats.add(pv1);
+//        myChats.add(pv2);
+//        myChats.add(pv3);
+//        myChats.add(pv4);
+//        myChats.add(pv5);
+//        myChats.add(pv6);
+//        BasicUser amy = new BasicUser("amy", "123", "myEmail", myChats);
+//
+//        leastRecentChat();
+//    }
+//
+//    public static void leastRecentChat(){
+//        ChatOrder chatOrder = new ChatOrder("amy");
+//        chatOrder.changeOrder(pv1);
+//        assertEquals(chatOrder.getUserChats().get(chatOrder.getUserChats().size() - 1), pv1);
+//    }
+//
+//    public static void moderatelyRecentChat(){
+//        ChatOrder chatOrder = new ChatOrder("amy");
+//        chatOrder.changeOrder(pv3);
+//        assertEquals(chatOrder.getUserChats().get(chatOrder.getUserChats().size() - 1), pv3);
+//    }
+//
+//    public static void mostRecentChat(){
+//        ChatOrder chatOrder = new ChatOrder("amy");
+//        chatOrder.changeOrder(pv6);
+//        assertEquals(chatOrder.getUserChats().get(chatOrder.getUserChats().size() - 1), pv6);
+//    }
+}