Added some changes to invert dependency

amyyong11 · amyyong11 · commit b8f2220344bc · 2022-11-28T00:56:49.000-05:00
diff --git a/src/main/java/interface_adapters/appscreen/AppScreenController.java b/src/main/java/interface_adapters/appscreen/AppScreenController.java
@@ -1,8 +1,9 @@
-package interface_adapters.app_screen_interface_adapters;
+package interface_adapters.appscreen;
 
 import data_access.UserDatabase;
 import entities.chat.Chat;
-import use_cases.app_screen_use_case.ChatOrder;
+import use_cases.appscreen.ChatInfo;
+import use_cases.appscreen.ChatOrder;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -11,7 +12,6 @@ public class AppScreenController{
 
     private final String username;
     private final String chatID;
-    private final UserDatabase userDatabase;
 
 
     /**
@@ -22,7 +22,6 @@ public class AppScreenController{
     public AppScreenController(String username, String chatID){
         this.username = username;
         this.chatID = chatID;
-        this.userDatabase = new UserDatabase(new File("user_accounts"));
 
     }
 
@@ -31,13 +30,8 @@ public AppScreenController(String username, String chatID){
      * @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");
+        ChatInfo chatInfo = new ChatInfo(this.username, this.chatID);
+        return chatInfo.getChat();
 
     }
 
@@ -46,7 +40,7 @@ public Chat getChat(){
      */
     public void updateScreen(){
         ChatOrder chatOrder = new ChatOrder(this.username);
-        ArrayList<Chat> newOrder = chatOrder.changeOrder(this.chatID);
+        ArrayList<Chat> newOrder = chatOrder.changeOrder(getChat());
         createGateway(newOrder);
 
     }
diff --git a/src/main/java/interface_adapters/appscreen/AppScreenLoader.java b/src/main/java/interface_adapters/appscreen/AppScreenLoader.java
@@ -1,7 +1,7 @@
-package interface_adapters.app_screen_interface_adapters;
+package interface_adapters.appscreen;
 
 import entities.chat.Chat;
-import screens.app_screen.AppScreen;
+import screens.appscreen.AppScreen;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/interface_adapters/appscreen/AppScreenPresenter.java b/src/main/java/interface_adapters/appscreen/AppScreenPresenter.java
@@ -1,4 +1,4 @@
-package interface_adapters.app_screen_interface_adapters;
+package interface_adapters.appscreen;
 
 public interface AppScreenPresenter {
     void openScreen();
diff --git a/src/main/java/interface_adapters/appscreen/Refresh.java b/src/main/java/interface_adapters/appscreen/Refresh.java
@@ -0,0 +1,5 @@
+package interface_adapters.appscreen;
+
+public interface Refresh {
+    void refreshScreen(String chatID);
+}
diff --git a/src/main/java/interface_adapters/appscreen/UserAppScreenGateway.java b/src/main/java/interface_adapters/appscreen/UserAppScreenGateway.java
@@ -1,4 +1,4 @@
-package interface_adapters.app_screen_interface_adapters;
+package interface_adapters.appscreen;
 
 import data_access.UserDatabase;
 import entities.chat.Chat;
diff --git a/src/main/java/screens/appscreen/AppScreen.java b/src/main/java/screens/appscreen/AppScreen.java
@@ -1,13 +1,13 @@
-package screens.app_screen;
+package screens.appscreen;
 
 import entities.chat.Chat;
 import entities.chat.CommonPrivatechat;
 import entities.chat.PrivateChatfactory;
-import interface_adapters.app_screen_interface_adapters.AppScreenController;
-import interface_adapters.app_screen_interface_adapters.AppScreenPresenter;
+import interface_adapters.appscreen.AppScreenPresenter;
+import interface_adapters.appscreen.Refresh;
 import screens.chat_screen.ChatController;
 import screens.chat_screen.ChatView;
-import use_cases.app_screen_use_case.*;
+import use_cases.appscreen.*;
 import use_cases.chat_initiation_use_case.ChatInputBoundry;
 import use_cases.chat_initiation_use_case.ChatInteractor;
 
@@ -16,7 +16,7 @@
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 
-public class AppScreen implements AppScreenPresenter, ChatName, LastUpdate {
+public class AppScreen implements AppScreenPresenter, Refresh {
 
     private final JFrame jFrame;
     private JScrollPane jScrollPane;
@@ -94,8 +94,10 @@ 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--) {
 
-            String chatName = getChatName(this.chats.get(i));
-            LocalDateTime lastUpdated = getLastUpdatedTime(this.chats.get(i));
+            ChatInfo chatInfo = new ChatInfo(currentUsername, this.chats.get(i).getChatID());
+
+            String chatName = chatInfo.getChatName();
+            LocalDateTime lastUpdated = chatInfo.getLastMessageTime();
 
             jPanel.add(ChatButton.createButton(chatName, currentUsername, lastUpdated));
         }
@@ -114,16 +116,6 @@ public void displayAppScreen(){
 
     }
 
-    /**
-     * Return the date and time of the last message in a chat
-     * @param chat The given chat
-     * @return date and time of last update
-     */
-    @Override
-    public LocalDateTime getLastUpdatedTime(Chat chat) {
-        return chat.getLastUpdated();
-    }
-
     /**
      Make the chat list scrollable
      @param jPanel The panel containing the chats
@@ -137,26 +129,12 @@ private void scrollableChats(JPanel jPanel) {
     }
 
 
-    /**
-     * Get the name of the chat
-     * @param chat The chat in context
-     * @return name
-     */
-    @Override
-    public String getChatName(Chat chat) {
-        return chat.getName();
-    }
-
-
     /**
      * 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) {
-        AppScreenController appScreenController = new AppScreenController(currentUsername, chatID);
-        appScreenController.updateScreen();
-
         ChatOrder chatOrder = new ChatOrder(currentUsername);
         this.chats = chatOrder.getUserChats();
 
diff --git a/src/main/java/use_cases/app_screen_use_case/ChatName.java b/src/main/java/use_cases/app_screen_use_case/ChatName.java
diff --git a/src/main/java/use_cases/app_screen_use_case/LastUpdate.java b/src/main/java/use_cases/app_screen_use_case/LastUpdate.java
diff --git a/src/main/java/use_cases/appscreen/AppScreenRequestModel.java b/src/main/java/use_cases/appscreen/AppScreenRequestModel.java
@@ -0,0 +1,17 @@
+package use_cases.appscreen;
+
+import interface_adapters.appscreen.AppScreenController;
+import interface_adapters.appscreen.Refresh;
+
+public class AppScreenRequestModel implements Refresh {
+    private final AppScreenController appScreenController;
+
+    public AppScreenRequestModel(String username, String chatID){
+        this.appScreenController = new AppScreenController(username, chatID);
+    }
+
+    @Override
+    public void refreshScreen(String chatID) {
+        this.appScreenController.updateScreen();
+    }
+}
diff --git a/src/main/java/use_cases/appscreen/AppScreenResponseModel.java b/src/main/java/use_cases/appscreen/AppScreenResponseModel.java
@@ -0,0 +1,14 @@
+package use_cases.appscreen;
+
+import screens.appscreen.AppScreen;
+
+public class AppScreenResponseModel {
+
+    AppScreen appScreen;
+    String chatID;
+    public AppScreenResponseModel(AppScreen appScreen, String chatID){
+        this.appScreen = appScreen;
+        this.chatID = chatID;
+        appScreen.refreshScreen(chatID);
+    }
+}
diff --git a/src/main/java/use_cases/appscreen/ChatButton.java b/src/main/java/use_cases/appscreen/ChatButton.java
@@ -1,11 +1,7 @@
-package use_cases.app_screen_use_case;
-
-import screens.chat_screen.ChatView;
+package use_cases.appscreen;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.time.LocalDateTime;
 
 public class ChatButton {
@@ -34,12 +30,8 @@ public static JButton createButton(String chatName, String currentUsername, Loca
         jButton.add(jLabel);
 
         // defines the action of opening a chat when a chat is clicked on
-        jButton.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
+        jButton.addActionListener(e -> {
 
-            }
         });
         return jButton;
     }
diff --git a/src/main/java/use_cases/appscreen/ChatInfo.java b/src/main/java/use_cases/appscreen/ChatInfo.java
@@ -0,0 +1,60 @@
+package use_cases.appscreen;
+
+import data_access.UserDatabase;
+import entities.chat.Chat;
+
+import java.io.File;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+
+public class ChatInfo {
+
+    private final String username;
+    private final String chatID;
+    private final UserDatabase userDatabase = new UserDatabase(new File("user_accounts"));
+
+    /**
+     * Create an object pertaining to chat information
+     * @param username Username of current user
+     * @param chatID ID of the chat in context
+     */
+    public ChatInfo(String username, String chatID){
+        this.username = username;
+        this.chatID = chatID;
+    }
+
+    /**
+     * Return the chat of the given user and specified chat ID
+     * @return a chat
+     */
+    public Chat getChat(){
+        try{
+            ArrayList<Chat> userChats = userDatabase.getUserChats(username);
+            for (Chat chat: userChats){
+                if (chat.getChatID().equals(chatID)){
+                    return chat;
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to get indicated chat");
+        }
+        return null;
+    }
+
+    /**
+     * Get the name of the chat
+     * @return chat name
+     */
+    public String getChatName(){
+        return getChat().getName();
+    }
+
+    /**
+     * Return the date and time of the last message the chat
+     * @return date and time of last update
+     */
+    public LocalDateTime getLastMessageTime(){
+        return getChat().getLastUpdated();
+    }
+
+}
diff --git a/src/main/java/use_cases/appscreen/ChatOrder.java b/src/main/java/use_cases/appscreen/ChatOrder.java
@@ -1,23 +1,20 @@
-package use_cases.app_screen_use_case;
+package use_cases.appscreen;
 
 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);
     }
@@ -32,12 +29,10 @@ public ArrayList<Chat> getUserChats(){
 
     /**
      * Update the order of the chats
-     * @param chatID The ID of the chat that has an update
+     * @param updatedChat The chat that has an update
      */
-    public ArrayList<Chat> changeOrder(String chatID){
+    public ArrayList<Chat> changeOrder(Chat updatedChat){
 
-        AppScreenController appScreenController = new AppScreenController(this.username, chatID);
-        Chat updatedChat = appScreenController.getChat();
         if (this.userChats.contains(updatedChat)) {
             this.userChats.remove(updatedChat);
             this.userChats.add(updatedChat);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package interface_adapters.app_screen_interface_adapters;`
	`1`	`+package interface_adapters.appscreen;`
`2`	`2`
`3`	`3`	`public interface AppScreenPresenter {`
`4`	`4`	`void openScreen();`