Refactored code to make it adhere to clean architecture

Author: Madhavan7

src/main/java/data_access/Database.java

@@ -0,0 +1,8 @@
+package data_access;
+
+import interface_adapters.User_search_IA.UserRetriever;
+import interface_adapters.user_registration_interface_adapters.UserExists;
+import use_cases.user_registration_use_cases.UserCreator;
+
+public abstract class Database implements UserCreator, UserRetriever, UserExists {
+}

src/main/java/data_access/UserDatabase.java

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

src/main/java/interface_adapters/user_registration_interface_adapters/UserRegistrationController.java

@@ -1,5 +1,6 @@
 package interface_adapters.user_registration_interface_adapters;
 
+import data_access.Database;
 import interface_adapters.User_search_IA.UserRetriever;
 import screens.login_screen.UserLoginUI;
 import use_cases.user_registration_use_cases.verificationMethodFactory;
@@ -15,20 +16,12 @@ public class UserRegistrationController implements UserVerifier, ActionListener,
     private final String email;
     private String preference;
     private boolean userExists = false;
-    private UserCreator database;
+    private Database database;
     Random random;
     private final int code;
     private JTextField verificationCodeText;
     private JLabel success;
 
-    /*public UserRegistrationController(int code, String Username, String Password, String email, UserDatabase database){
-        this.code = code;
-        this.username = Username;
-        this.password = Password;
-        this.email = email;
-        this.database = database;
-    }*/
-
     public UserRegistrationController(UserRegistrationGateway properties){
         this.username = properties.getUsername();
         this.password = properties.getPassword();
@@ -73,48 +66,20 @@ public void verify(String email){
     public void registerUser() {
         if(this.userExists){
             System.out.println("An account with this username or email already exists");
-            accountExistsMessage();
+            UserRegistrationPresenter.accountExistsMessage();
         }else{
             this.verify(email);
         }
     }
-
-    public static void accountExistsMessage(){
-        JFrame accountExistsFrame = new JFrame();
-        accountExistsFrame.setSize(400, 100);
-        accountExistsFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-        JPanel accountExistsPanel = new JPanel();
-        accountExistsPanel.setLayout(null);
-        accountExistsFrame.add(accountExistsPanel);
-        JLabel errorMessage = new JLabel("An account with this username or email already exists");
-        errorMessage.setBounds(10,20, 350, 20);
-        accountExistsPanel.add(errorMessage);
-        accountExistsFrame.setVisible(true);
-    }
-
-    public static void verificationSuccessMessage(String message){
-        JFrame verificationSuccessFrame = new JFrame();
-        verificationSuccessFrame.setSize(400, 100);
-        verificationSuccessFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-        JPanel verificationSuccessPanel = new JPanel();
-        verificationSuccessPanel.setLayout(null);
-        verificationSuccessFrame.add(verificationSuccessPanel);
-        JLabel errorMessage = new JLabel(message);
-        errorMessage.setBounds(10,20, 350, 20);
-        verificationSuccessPanel.add(errorMessage);
-        verificationSuccessFrame.setVisible(true);
-    }
-
     @Override
     public void actionPerformed(ActionEvent e) {
         int verCode = Integer.parseInt(verificationCodeText.getText());
         if(verCode == this.code){
             database.createUser(this.username, this.password, this.email, "Basic");
-            verificationSuccessMessage("Verification successful");
-            UserLoginUI loginUI = new UserLoginUI((UserRetriever) database);
-            loginUI.getLoginCredentials();
+            UserRegistrationPresenter.verificationSuccessMessage("Verification successful");
+            UserRegistrationPresenter.registrationSuccessAction(this.database);
         }else{
-            verificationSuccessMessage("Could not verify please try again");
+            UserRegistrationPresenter.verificationSuccessMessage("verification unsuccessful");
         }
     }
 }

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

@@ -1,12 +1,13 @@
 package interface_adapters.user_registration_interface_adapters;
+import data_access.Database;
 import use_cases.user_registration_use_cases.UserCreator;
 public class UserRegistrationGateway {
     private String username;
     private String password;
     private String email;
     private boolean userExists = false;
     private int code;
-    private UserCreator database;
+    private Database database;
 
     private String preference;
 
@@ -46,11 +47,11 @@ public void setCode(int code){
         this.code = code;
     }
 
-    public void setDatabase(UserCreator database) {
+    public void setDatabase(Database database) {
         this.database = database;
     }
 
-    public UserCreator getDatabase(){
+    public Database getDatabase(){
         return this.database;
     }
 

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

@@ -0,0 +1,41 @@
+package interface_adapters.user_registration_interface_adapters;
+
+import data_access.Database;
+import screens.login_screen.UserLoginUI;
+import use_cases.loginCredentialsRetriever;
+
+import javax.swing.*;
+
+public class UserRegistrationPresenter {
+
+    public static void accountExistsMessage(){
+        JFrame accountExistsFrame = new JFrame();
+        accountExistsFrame.setSize(400, 100);
+        accountExistsFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        JPanel accountExistsPanel = new JPanel();
+        accountExistsPanel.setLayout(null);
+        accountExistsFrame.add(accountExistsPanel);
+        JLabel errorMessage = new JLabel("An account with this username or email already exists");
+        errorMessage.setBounds(10,20, 350, 20);
+        accountExistsPanel.add(errorMessage);
+        accountExistsFrame.setVisible(true);
+    }
+
+    public static void verificationSuccessMessage(String message){
+        JFrame verificationSuccessFrame = new JFrame();
+        verificationSuccessFrame.setSize(400, 100);
+        verificationSuccessFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        JPanel verificationSuccessPanel = new JPanel();
+        verificationSuccessPanel.setLayout(null);
+        verificationSuccessFrame.add(verificationSuccessPanel);
+        JLabel errorMessage = new JLabel(message);
+        errorMessage.setBounds(10,20, 350, 20);
+        verificationSuccessPanel.add(errorMessage);
+        verificationSuccessFrame.setVisible(true);
+    }
+
+    public static void registrationSuccessAction(Database database){
+        loginCredentialsRetriever loginUI = new UserLoginUI(database);
+        loginUI.getLoginCredentials();
+    }
+}

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

@@ -1,25 +1,28 @@
 package screens.login_screen;
+import data_access.Database;
 import interface_adapters.login_interface_adapters.UserLoginController;
 import interface_adapters.login_interface_adapters.UserLoginGateway;
 import interface_adapters.User_search_IA.UserRetriever;
 import data_access.UserDatabase;
+import use_cases.loginCredentialsRetriever;
 
 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 {
+public class UserLoginUI implements ActionListener, loginCredentialsRetriever {
 
     private JTextField credentialText;
     private JLabel passwordLabel;
     private JPasswordField passwordText;
 
-    private UserRetriever database;
+    private final Database database;
 
-    public UserLoginUI(UserRetriever database){
+    public UserLoginUI(Database database){
         this.database = database;
     }
+    @Override
     public void getLoginCredentials(){
         JFrame loginFrame = new JFrame();
         loginFrame.setSize(400, 400);
@@ -53,7 +56,7 @@ public void getLoginCredentials(){
     }
 
     public static void main(String[] args){
-        UserRetriever testDB = new UserDatabase(new File("user_accounts"));
+        Database testDB = new UserDatabase(new File("user_accounts"));
         UserLoginUI screen = new UserLoginUI(testDB);
         screen.getLoginCredentials();
     }

src/main/java/screens/user_registration_screen/LoginRegisterScreen.java

@@ -1,9 +1,7 @@
 package screens.user_registration_screen;
 
 import data_access.UserDatabase;
-import interface_adapters.login_interface_adapters.Login;
 import screens.login_screen.UserLoginUI;
-import screens.user_registration_screen.UserRegistrationUI;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -43,7 +41,7 @@ public void actionPerformed(ActionEvent e) {
             loginUI.getLoginCredentials();
         }else{
             UserRegistrationUI registrationUI = new UserRegistrationUI(new UserDatabase());
-            registrationUI.GetUserCredentials();
+            registrationUI.getUserCredentials();
         }
     }
 }

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

@@ -3,14 +3,15 @@
 import interface_adapters.user_registration_interface_adapters.UserRegistrationController;
 import interface_adapters.user_registration_interface_adapters.UserRegistrationGateway;
 import data_access.UserDatabase;
+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 {
+public class UserRegistrationUI implements ActionListener, userRegCredentialsRetriever {
     private final UserDatabase database;
     private JLabel registrationSuccess;
     private JTextField usernameText;
@@ -28,7 +29,8 @@ public UserRegistrationUI(UserDatabase database) {
         */
         code = new Random().nextInt(1244254);
     }
-    void GetUserCredentials(){
+    @Override
+    public void getUserCredentials(){
         //Front end related objects
         JFrame registerFrame = new JFrame();
         registerFrame.setSize(500, 300);
@@ -104,7 +106,7 @@ public static void main(String[] args){
         System.out.println(testDB.getList().size());
         UserRegistrationUI testUI = new UserRegistrationUI(testDB);
 
-        testUI.GetUserCredentials();
+        testUI.getUserCredentials();
     }
 
     @Override

src/main/java/use_cases/loginCredentialsRetriever.java

@@ -0,0 +1,5 @@
+package use_cases;
+
+public interface loginCredentialsRetriever {
+    void getLoginCredentials();
+}

src/main/java/use_cases/user_registration_use_cases/userRegCredentialsRetriever.java

@@ -0,0 +1,5 @@
+package use_cases.user_registration_use_cases;
+
+public interface userRegCredentialsRetriever {
+    void getUserCredentials();
+}