Reorganized classes to follow clean architecture

Author: Madhavan7

src/main/java/emoji_manager/msg/Sender.java

@@ -1,4 +1,4 @@
-package main.java.emoji_manager.msg;
+package emoji_manager.msg;
 
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;

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

@@ -9,7 +9,7 @@
 /** This is the screen on which the user enters his credentials in order to login **/
 public class UserLoginUI implements ActionListener, UserVerificationOutputBoundary {
 
-    private final UserLoginInputBoundary loginInteractor;
+    private UserLoginInputBoundary loginInteractor;
     JTextField credentialText;
     JPasswordField passwordText;
 
@@ -65,6 +65,11 @@ public void cannotVerify() {
 
     }
 
+    @Override
+    public void setInputBoundary(UserLoginInputBoundary loginInteractor) {
+        this.loginInteractor = loginInteractor;
+    }
+
     @Override
     public void actionPerformed(ActionEvent e) {
         String username = credentialText.getText();

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

@@ -1,9 +1,10 @@
 package screens.user_registration_screen;
 import data_access.Database;
 import data_access.UserDatabase;
-import use_cases.user_registration_use_cases.UserExistsInputBoundary;
-import use_cases.user_registration_use_cases.UserExistsInteractor;
-import use_cases.user_registration_use_cases.userRegCredentialsRetriever;
+import screens.login_screen.UserLoginUI;
+import use_cases.user_login_use_cases.UserLoginInputBoundary;
+import use_cases.user_login_use_cases.UserLoginInteractor;
+import use_cases.user_registration_use_cases.*;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -22,8 +23,8 @@ public class UserRegistrationUI implements ActionListener, userRegCredentialsRet
     */
     private JTextField deliveryText;
 
-    public UserRegistrationUI(UserExistsInputBoundary verifyUser) {
-        this.verifyUser = verifyUser;
+    public UserRegistrationUI(UserExistsInputBoundary existsInputBoundary) {
+        this.verifyUser = existsInputBoundary;
     }
     @Override
     public void getUserCredentials(){
@@ -80,10 +81,15 @@ public void getUserCredentials(){
     }
 
     public static void main(String[] args){
-        //Testing purposes
-        Database testDB = new UserDatabase(new File("test301"));
-        UserExistsInputBoundary interactor = new UserExistsInteractor(testDB);
-        new UserRegistrationUI(interactor).getUserCredentials();
+        Database testDB = new UserDatabase(new File("newAccounts"));
+        UserLoginInputBoundary userLoginInteractor = new UserLoginInteractor(testDB);
+        UserVerificationOutputBoundary loginUI = new UserLoginUI(userLoginInteractor);
+        UserVerificationInputBoundary verificationInteractor = new UserVerificationInteractor(testDB, loginUI);
+        UserExistsOutputBoundary verificationScreen = new UserVerificationScreen(verificationInteractor, new verificationMethodFactory());
+        UserExistsInputBoundary existsInteractor = new UserExistsInteractor(testDB, verificationScreen);
+        UserRegistrationUI testUI = new UserRegistrationUI(existsInteractor);
+        testUI.getUserCredentials();
+
     }
     @Override
     public void actionPerformed(ActionEvent e) {

src/main/java/screens/user_registration_screen/UserVerificationScreen.java

@@ -1,19 +1,26 @@
 package screens.user_registration_screen;
 
-import use_cases.user_registration_use_cases.UserExistsOutputBoundary;
-import use_cases.user_registration_use_cases.UserVerificationInputBoundary;
+import screens.login_screen.UserLoginUI;
+import use_cases.user_login_use_cases.UserLoginInputBoundary;
+import use_cases.user_registration_use_cases.*;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 public class UserVerificationScreen implements UserExistsOutputBoundary, ActionListener {
     private final JTextField verText = new JTextField(20);
-    private final UserVerificationInputBoundary verificationInputBoundary;
+    private final verificationMethodFactory deliveryMethod;
+    private UserVerificationInputBoundary verificationInputBoundary;
+    private int code;
+    private String username;
+    private String password;
+    private String email;
 
-    public UserVerificationScreen(UserVerificationInputBoundary verificationInputBoundary) {
+    public UserVerificationScreen(UserVerificationInputBoundary verificationInputBoundary, verificationMethodFactory deliveryMethod){
         this.verificationInputBoundary = verificationInputBoundary;
-    }
+        this.deliveryMethod = deliveryMethod;
+    };
 
     @Override
     public void getVerificationCredentials() {
@@ -53,10 +60,24 @@ public void presentUserExistsMessage() {
         userExistsFrame.setVisible(true);
     }
 
+    @Override
+    public void getCode(int code) {
+        this.code = code;
+    }
+
+    @Override
+    public void getUserCredentials(String username, String password, String email) {
+        this.username = username;
+        this.password = password;
+        this.email = email;
+    }
+
     @Override
     public void actionPerformed(ActionEvent e) {
         // Need if statements to check if code is an integer
         int code = Integer.parseInt(verText.getText());
+        verificationInputBoundary.setCode(this.code);
+        verificationInputBoundary.setCredentials(username, password, email);
         verificationInputBoundary.verify("Email", code);
     }
 

src/main/java/use_cases/emoji_manager/ChatFrame.java

@@ -1,7 +1,7 @@
 package use_cases.emoji_manager;
 
+import emoji_manager.msg.Sender;
 import main.java.emoji_manager.msg.MsgType;
-import main.java.emoji_manager.msg.Sender;
 import main.java.emoji_manager.model.FontAndText;
 import main.java.emoji_manager.model.EmoInfo;
 

src/main/java/use_cases/user_login_use_cases/UserLoginInteractor.java

@@ -2,8 +2,9 @@
 
 import data_access.Database;
 import entities.user_entities.User;
+import use_cases.user_registration_use_cases.UserVerificationOutputBoundary;
 
-public class UserLoginInteractor implements UserLoginInputBoundary {
+public class UserLoginInteractor implements UserLoginInputBoundary{
     private String username;
     private String password;
     private User user;
@@ -34,4 +35,5 @@ public void setLoginCredentials(String username, String password) {
         this.username = username;
         this.password = password;
     }
+
 }

src/main/java/use_cases/user_login_use_cases/UserVerificationOutputBoundary.java

@@ -4,4 +4,6 @@ public interface UserExistsInputBoundary {
 
     void register(String username, String password, String email);
     void setCodeDeliveryMethod(String type);
+
+    void setOutputBoundary(UserExistsOutputBoundary existsOutputBoundary);
 }

src/main/java/use_cases/user_registration_use_cases/UserExistsInputBoundary.java

@@ -6,25 +6,22 @@
 import java.util.Random;
 
 public class UserExistsInteractor implements UserExistsInputBoundary{
-    private final int code;
     //May need to refactor this using facade design pattern since this class has too many responsibilities.
     Database database;
-    UserVerificationInputBoundary verificationInputBoundary;
     UserExistsOutputBoundary existsOutputBoundary;
 
     private ISendVerificationCode codeMailMan;
 
-    public UserExistsInteractor(Database database){
+    public UserExistsInteractor(Database database, UserExistsOutputBoundary existsOutputBoundary){
         this.database = database;
-        this.verificationInputBoundary = new UserVerificationInteractor(database);
-        this.code = new Random().nextInt(1321512);
-        verificationInputBoundary.setCode(code);
-        this.existsOutputBoundary = new UserVerificationScreen(verificationInputBoundary);
+        this.existsOutputBoundary = existsOutputBoundary;
     }
     @Override
     public void register(String username, String password, String email) {
         if(!database.UserExists(username, email)){
-            verificationInputBoundary.setCredentials(username, password, email);
+            int code = new Random().nextInt(12312341);
+            existsOutputBoundary.getCode(code);
+            existsOutputBoundary.getUserCredentials(username, password, email);
             existsOutputBoundary.getVerificationCredentials();
             codeMailMan.sendVerificationCode(email, code);
         }else{
@@ -36,4 +33,9 @@ public void register(String username, String password, String email) {
     public void setCodeDeliveryMethod(String type) {
         this.codeMailMan = new verificationMethodFactory().getVerificationMethod(type);
     }
+
+    @Override
+    public void setOutputBoundary(UserExistsOutputBoundary existsOutputBoundary) {
+        this.existsOutputBoundary = existsOutputBoundary;
+    }
 }

src/main/java/use_cases/user_registration_use_cases/UserExistsInteractor.java

@@ -3,4 +3,6 @@
 public interface UserExistsOutputBoundary {
     void getVerificationCredentials();
     void presentUserExistsMessage();
+    void getCode(int code);
+    void getUserCredentials(String username, String password, String email);
 }