Major changes: Refactored to make it aligned to clean architecture, need to improve UI to make it look better

Author: Madhavan7

src/main/java/data_access/Database.java

@@ -4,5 +4,5 @@
 import use_cases.user_registration_use_cases.UserExists;
 import use_cases.user_registration_use_cases.UserCreator;
 
-public abstract class Database implements UserCreator, UserRetriever, UserExists {
+public interface Database extends UserCreator, UserRetriever, UserExists {
 }

src/main/java/data_access/UserDatabase.java

@@ -10,7 +10,7 @@
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
-public class UserDatabase extends Database implements IRetrieveList, UserModificationGateway, UserChatGateway {
+public class UserDatabase implements Database, IRetrieveList, UserModificationGateway, UserChatGateway {
     File accounts;
     List<User> accountList;
     public UserDatabase(){

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

@@ -3,15 +3,15 @@
 import data_access.UserDatabase;
 import entities.chat.Chat;
 import interface_adapters.profile_modification_IA.UserAuthenticationI;
-import interface_adapters.login_interface_adapters.Login;
 import use_cases.user_attribute_modification_use_case.Changeable;
 import interface_adapters.app_screen_interface_adapters.UserAppScreenGateway;
+import use_cases.user_login_use_cases.Loginable;
 
 import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
 
-public abstract class User implements Serializable, Changeable, Login, UserAuthenticationI {
+public abstract class User implements Serializable, Changeable, Loginable, UserAuthenticationI {
     protected String username;
     protected String password;
     protected String email;

src/main/java/interface_adapters/user_registration_interface_adapters/UserRegistrationGateway.java

@@ -1,25 +1,20 @@
 package screens.login_screen;
-import data_access.Database;
-import use_cases.user_login_use_cases.UserLoginInteractor;
-import interface_adapters.login_interface_adapters.UserLoginGateway;
-import data_access.UserDatabase;
-import use_cases.user_login_use_cases.loginCredentialsRetriever;
+import use_cases.user_login_use_cases.UserLoginInputBoundary;
+import use_cases.user_registration_use_cases.UserVerificationOutputBoundary;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.File;
-/** This is the screen on which the user enters his credentials in order to login **/
-public class UserLoginUI implements ActionListener, loginCredentialsRetriever {
 
-    private JTextField credentialText;
-    private JLabel passwordLabel;
-    private JPasswordField passwordText;
+/** This is the screen on which the user enters his credentials in order to login **/
+public class UserLoginUI implements ActionListener, UserVerificationOutputBoundary {
 
-    private final Database database;
+    private final UserLoginInputBoundary loginInteractor;
+    JTextField credentialText;
+    JPasswordField passwordText;
 
-    public UserLoginUI(Database database){
-        this.database = database;
+    public UserLoginUI(UserLoginInputBoundary loginInteractor){
+        this.loginInteractor = loginInteractor;
     }
     @Override
     public void getLoginCredentials(){
@@ -38,7 +33,7 @@ public void getLoginCredentials(){
         loginPanel.add(credentialLabel);
         loginPanel.add(credentialText);
 
-        passwordLabel = new JLabel("Enter Password:");
+        JLabel passwordLabel = new JLabel("Enter Password:");
         passwordLabel.setBounds(10,55, 200, 25);
         passwordText = new JPasswordField();
         passwordText.setBounds(210, 55, 100, 25);
@@ -54,16 +49,27 @@ public void getLoginCredentials(){
 
     }
 
-    public static void main(String[] args){
-        Database testDB = new UserDatabase(new File("user_accounts"));
-        UserLoginUI screen = new UserLoginUI(testDB);
-        screen.getLoginCredentials();
+    @Override
+    public void cannotVerify() {
+        JFrame cannotVerifyFrame = new JFrame();
+        cannotVerifyFrame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        cannotVerifyFrame.setSize(300, 200);
+        JPanel cannotVerifyPanel = new JPanel();
+        cannotVerifyPanel.setLayout(null);
+        cannotVerifyFrame.add(cannotVerifyPanel);
+
+        JLabel accountExists = new JLabel("The verification code you have entered is incorrect, please try again");
+        accountExists.setBounds(10, 150, 200, 30);
+
+        cannotVerifyFrame.setVisible(true);
+        
     }
+
     @Override
     public void actionPerformed(ActionEvent e) {
-        UserLoginGateway properties = new UserLoginGateway(credentialText.getText(), passwordText.getText(), this.database);
-        UserLoginInteractor guard = new UserLoginInteractor(properties);
-        guard.allowLogin();
-
+        String username = credentialText.getText();
+        String password = passwordText.getText();
+        loginInteractor.setLoginCredentials(username, password);
+        loginInteractor.tryLogin();
     }
 }

src/main/java/interface_adapters/user_registration_interface_adapters/UserRegistrationPresenter.java

@@ -10,10 +10,14 @@
 /** This is the screen in which the user chooses to either register or login. **/
 public class LoginRegisterScreen implements ActionListener {
 
+    private final UserRegistrationUI registrationUI;
+    private final UserLoginUI loginUI;
     JButton login = new JButton("login");
     JButton register = new JButton("register");
 
-    public LoginRegisterScreen(){
+    public LoginRegisterScreen(UserRegistrationUI registrationUI, UserLoginUI loginUI){
+        this.registrationUI = registrationUI;
+        this.loginUI = loginUI;
         JFrame loginRegFrame = new JFrame();
         loginRegFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
         loginRegFrame.setSize(400, 200);
@@ -31,16 +35,14 @@ public LoginRegisterScreen(){
         loginRegFrame.setVisible(true);
 
     }
-    public static void main(String[] args){
+    /*public static void main(String[] args){
         LoginRegisterScreen screen = new LoginRegisterScreen();
-    }
+    }*/
     @Override
     public void actionPerformed(ActionEvent e) {
         if(e.getSource().equals(login)){
-            UserLoginUI loginUI = new UserLoginUI(new UserDatabase());
             loginUI.getLoginCredentials();
         }else{
-            UserRegistrationUI registrationUI = new UserRegistrationUI(new UserDatabase());
             registrationUI.getUserCredentials();
         }
     }

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

@@ -1,33 +1,26 @@
 package screens.user_registration_screen;
-
-import use_cases.user_registration_use_cases.UserRegistrationInteractor;
-import interface_adapters.user_registration_interface_adapters.UserRegistrationGateway;
+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 javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
-import java.util.Random;
+
 /** This is screen on which the User enters his credentials in order to login**/
 public class UserRegistrationUI implements ActionListener, userRegCredentialsRetriever {
-    private final UserDatabase database;
-    private JLabel registrationSuccess;
+    private final UserExistsInputBoundary verifyUser;
     private JTextField usernameText;
     private JTextField passwordText;
     private JTextField emailText;
-    private JButton register;
-    private static JButton phoneVerify = new JButton("Phone");
-    private static JButton emailVerify = new JButton("Email");
-    private final int code;
 
-    public UserRegistrationUI(UserDatabase database) {
-        this.database = database;
-        /*TODO: For now the code is 389 for testing purposes, but once UI.UserVerificationUI.sendVerificationCode() is
-            implemented this will be a random integer.
-        */
-        code = new Random().nextInt(1244254);
+    private JTextField deliveryText;
+
+    public UserRegistrationUI(UserExistsInputBoundary verifyUser) {
+        this.verifyUser = verifyUser;
     }
     @Override
     public void getUserCredentials(){
@@ -66,68 +59,37 @@ public void getUserCredentials(){
         emailText.setBounds(100, 80, 165, 25);
         registerPanel.add(emailText);
 
-        //The Button
-        register = new JButton("Register");
-        register.setBounds(100, 110, 165, 25);
-        register.addActionListener(this);
-        registerPanel.add(register);
+        //The textbox for entering verification path
+        JLabel deliveryLabel = new JLabel("Choose verification Path(0 for email, 1 for phone)");
+        deliveryLabel.setBounds(10, 115, 200, 25);
 
-        //Success/Failure Label
-        registrationSuccess = new JLabel("");
-        registrationSuccess.setBounds(10, 140, 350, 25);
-        registerPanel.add(registrationSuccess);
+        deliveryText = new JTextField(20);
+        deliveryText.setBounds(100, 110, 50, 25);
+        registerPanel.add(deliveryLabel);
+        registerPanel.add(deliveryText);
 
+        //The Button
+        JButton registerButton = new JButton("Register");
+        registerButton.setBounds(100, 140, 165, 25);
+        registerButton.addActionListener(this);
+        registerPanel.add(registerButton);
         registerFrame.setVisible(true);
     }
 
-    public void getPreferredDeliveryMethod(){
-        JFrame preference = new JFrame();
-        preference.setSize(400, 200);
-        JPanel preferancePanel = new JPanel();
-        preference.add(preferancePanel);
-
-        JLabel message = new JLabel("Send verification code via:");
-        message.setBounds(30, 120, 300, 20);
-        preferancePanel.add(message);
-
-        emailVerify.setBounds(30, 150, 140, 25);
-        emailVerify.addActionListener(this);
-        phoneVerify.setBounds(150, 150, 140, 25);
-        phoneVerify.addActionListener(this);
-        preferancePanel.add(emailVerify);
-        preferancePanel.add(phoneVerify);
-        preference.setVisible(true);
-
-    }
-
     public static void main(String[] args){
-        UserDatabase testDB = new UserDatabase(new File("user_accounts"));
-        System.out.println(testDB.UserExists("RandomUser", "[email protected]"));
-        System.out.println(testDB.getList().size());
-        UserRegistrationUI testUI = new UserRegistrationUI(testDB);
-
-        testUI.getUserCredentials();
+        Database testDB = new UserDatabase(new File("test20123"));
+        UserExistsInputBoundary interactor = new UserExistsInteractor(testDB);
+        new UserRegistrationUI(interactor).getUserCredentials();
     }
-
     @Override
     public void actionPerformed(ActionEvent e) {
+        //Need if statements for cases
         String username = usernameText.getText();
         String password = passwordText.getText();
         String email = emailText.getText();
+        String type = deliveryText.getText();
 
-        UserRegistrationGateway properties = new UserRegistrationGateway();
-        properties.setUsername(username);
-        properties.setPassword(password);
-        properties.setEmail(email);
-        properties.setUserExists(database.UserExists(username, email));
-        properties.setCode(code);
-        properties.setDatabase(this.database);
-        getPreferredDeliveryMethod();
-        //Not an error below, we just have not implemented sending code via phone yet.
-        if(e.getSource() == emailVerify || e.getSource() == phoneVerify){
-            properties.setPreference("Email");
-            UserRegistrationInteractor verifyUser = new UserRegistrationInteractor(properties);
-            verifyUser.registerUser();
-        }
+        verifyUser.setCodeDeliveryMethod(type);
+        verifyUser.register(username, password, email);
     }
 }