Created a new file as a result of the old file being corrupted

Author: amyyong11

accounts

@@ -17,7 +17,7 @@ public class UserDatabase implements UserExists, UserRetriever, UserCreator, IRe
     File accounts;
     List<User> accountList;
     public UserDatabase(){
-        this.accounts = new File("accounts");
+        this.accounts = new File("user_accounts");
         if(!accounts.exists()){
             try {
                 accounts.createNewFile();

src/main/java/data_access/UserDatabase.java

@@ -56,7 +56,7 @@ public Boolean PasswordMatch(String attempt){
     }
 
     public void login(){
-        UserAppScreenGateway appScreenGateway = new UserAppScreenGateway(this.getUsername(), new UserDatabase(new File("accounts")));
+        UserAppScreenGateway appScreenGateway = new UserAppScreenGateway(this.getUsername(), new UserDatabase(new File("user_accounts")));
         appScreenGateway.login();
     }
 

src/main/java/entities/user_entities/User.java

@@ -3,9 +3,14 @@
 
 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 screens.chat_screen.ChatController;
 import screens.chat_screen.ChatView;
 import use_cases.app_screen_use_case.*;
+import use_cases.chat_initiation_use_case.ChatInputBoundry;
+import use_cases.chat_initiation_use_case.ChatInteractor;
 
 import javax.swing.*;
 import java.awt.*;
@@ -46,8 +51,10 @@ public AppScreen(String currentUsername, ArrayList<Chat> chats) {
 
         // adding the action listeners for the +private-chat and +group-chat buttons
         addPrivateChat.addActionListener(e -> {
-            ChatView newChat = new ChatView(true);
-            newChat.chatDisplay();
+            PrivateChatfactory privateChatfactory = (PrivateChatfactory) new CommonPrivatechat();
+            ChatInputBoundry inputBoundry = new ChatInteractor(privateChatfactory);
+            ChatController controller = new ChatController(inputBoundry);
+            new ChatView(controller, true);
 
         });
         //TODO: add groupchat action
@@ -211,7 +218,7 @@ public Chat getChat(String chatID) {
      */
     public void createGateway(){
         UserAppScreenGateway gateway = new UserAppScreenGateway(currentUsername,
-                new UserDatabase(new File("accounts")));
+                new UserDatabase(new File("user_accounts")));
         try{
             gateway.updateUserChatList(currentUsername, this.chats);
         } catch (NullPointerException e) {

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

@@ -53,7 +53,7 @@ public void getLoginCredentials(){
     }
 
     public static void main(String[] args){
-        UserRetriever testDB = new UserDatabase(new File("accounts"));
+        UserRetriever testDB = new UserDatabase(new File("user_accounts"));
         UserLoginUI screen = new UserLoginUI(testDB);
         screen.getLoginCredentials();
     }

src/main/java/screens/login_screen/UserLoginUI.java

@@ -99,10 +99,9 @@ public void getPreferredDeliveryMethod(){
     }
 
     public static void main(String[] args){
-        UserDatabase testDB = new UserDatabase(new File("accounts"));
+        UserDatabase testDB = new UserDatabase(new File("user_accounts"));
         System.out.println(testDB.UserExists("RandomUser", "[email protected]"));
         System.out.println(testDB.getList().size());
-        System.out.println(testDB.getList().get(0).getUsername());
         UserRegistrationUI testUI = new UserRegistrationUI(testDB);
 
         testUI.GetUserCredentials();

src/main/java/screens/user_registration_screen/UserRegistrationUI.java

@@ -38,7 +38,7 @@ public static JButton createButton(String chatName, String currentUsername, Loca
 
             @Override
             public void actionPerformed(ActionEvent e) {
-                ChatView chatView = new ChatView(false);
+
             }
         });
         return jButton;

src/main/java/use_cases/app_screen_use_case/ChatButton.java

@@ -14,47 +14,47 @@ public class TestAppScreen {
 
     public static void main(String[] args) {
 
-        UserDatabase userDatabase = new UserDatabase(new File("accounts"));
-        System.out.println(userDatabase.getUser("amy").getUserChats());
-
-        BasicUser james = new BasicUser("James", "password2", "email", new ArrayList<>());
-        BasicUser nasim = new BasicUser("Nasim", "password3", "email", new ArrayList<>());
-        BasicUser parmis = new BasicUser("Parmis", "password4","email", new ArrayList<>());
-        BasicUser madhav = new BasicUser("Madhav", "password5","email", new ArrayList<>());
-        BasicUser bin = new BasicUser("Bin", "password6","email", new ArrayList<>());
-        BasicUser emma = new BasicUser("Emma", "password7","email", new ArrayList<>());
-
-        GroupChat groupChat1 = new GroupChat("Group Chat 1", "gc1","Amy");
-        GroupChat groupChat2 = new GroupChat("Group Chat 2", "gc2","Amy");
-        PrivateChat privateChat1 = new PrivateChat("James", "pc1", "Amy", "James");
-        PrivateChat privateChat2 = new PrivateChat("Nasim", "pc2", "Amy", "Nasim");
-        PrivateChat privateChat3 = new PrivateChat("Parmis", "pc3", "Amy", "Parmis");
-        PrivateChat privateChat4 = new PrivateChat("Madhav", "pc4", "Amy", "Madhav");
-        PrivateChat privateChat5 = new PrivateChat("Bin", "pc5", "Amy", "Bin");
-        PrivateChat privateChat6 = new PrivateChat("Emma", "pc6", "Amy", "Emma");
-
-        ArrayList<Chat> myChats = new ArrayList<>();
-        myChats.add(groupChat2);
-        myChats.add(groupChat1);
-        myChats.add(privateChat6);
-        myChats.add(privateChat5);
-        myChats.add(privateChat4);
-        myChats.add(privateChat3);
-        myChats.add(privateChat2);
-        //myChats.add(privateChat1);
-        privateChat2.addToConvHist(new TextMessage("amy", "Hi", LocalDateTime.now(), "1"));
-        AppScreen appScreen = new AppScreen("amy", myChats);
-
-        privateChat1.addToConvHist(new TextMessage("amy", "Hi", LocalDateTime.now(), "2"));
-        appScreen.addNewChat(privateChat1);
-        appScreen.updateScreen("gc1");
-
-
-        for (Chat chat: userDatabase.getUserChats("amy")){
-            System.out.println(chat.getName());
-        }
-
-        System.out.println(userDatabase.getUser("amy").getChats());
+        UserDatabase userDatabase = new UserDatabase(new File("user_accounts"));
+        System.out.println(userDatabase.UserExists("amy"));
+
+//        BasicUser james = new BasicUser("James", "password2", "email", new ArrayList<>());
+//        BasicUser nasim = new BasicUser("Nasim", "password3", "email", new ArrayList<>());
+//        BasicUser parmis = new BasicUser("Parmis", "password4","email", new ArrayList<>());
+//        BasicUser madhav = new BasicUser("Madhav", "password5","email", new ArrayList<>());
+//        BasicUser bin = new BasicUser("Bin", "password6","email", new ArrayList<>());
+//        BasicUser emma = new BasicUser("Emma", "password7","email", new ArrayList<>());
+//
+//        GroupChat groupChat1 = new GroupChat("Group Chat 1", "gc1","Amy");
+//        GroupChat groupChat2 = new GroupChat("Group Chat 2", "gc2","Amy");
+//        PrivateChat privateChat1 = new PrivateChat("James", "pc1", "Amy", "James");
+//        PrivateChat privateChat2 = new PrivateChat("Nasim", "pc2", "Amy", "Nasim");
+//        PrivateChat privateChat3 = new PrivateChat("Parmis", "pc3", "Amy", "Parmis");
+//        PrivateChat privateChat4 = new PrivateChat("Madhav", "pc4", "Amy", "Madhav");
+//        PrivateChat privateChat5 = new PrivateChat("Bin", "pc5", "Amy", "Bin");
+//        PrivateChat privateChat6 = new PrivateChat("Emma", "pc6", "Amy", "Emma");
+
+//        ArrayList<Chat> myChats = new ArrayList<>();
+//        myChats.add(groupChat2);
+//        myChats.add(groupChat1);
+//        myChats.add(privateChat6);
+//        myChats.add(privateChat5);
+//        myChats.add(privateChat4);
+//        myChats.add(privateChat3);
+//        myChats.add(privateChat2);
+//        //myChats.add(privateChat1);
+//        privateChat2.addToConvHist(new TextMessage("amy", "Hi", LocalDateTime.now(), "1"));
+//        AppScreen appScreen = new AppScreen("amy", myChats);
+//
+//        privateChat1.addToConvHist(new TextMessage("amy", "Hi", LocalDateTime.now(), "2"));
+//        appScreen.addNewChat(privateChat1);
+//        appScreen.updateScreen("gc1");
+
+
+//        for (Chat chat: userDatabase.getUserChats("amy")){
+//            System.out.println(chat.getName());
+//        }
+//
+//        System.out.println(userDatabase.getUser("amy").getChats());