Merge remote-tracking branch 'origin/main'

Author: amyyong11

src/main/java/data_access/Database.java

@@ -1,7 +1,7 @@
 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.UserExists;
 import use_cases.user_registration_use_cases.UserCreator;
 
 public abstract class Database implements UserCreator, UserRetriever, UserExists {

src/main/java/data_access/UserDatabase.java

@@ -2,13 +2,10 @@
 
 import entities.chat.Chat;
 import interface_adapters.User_search_IA.IRetrieveList;
-import interface_adapters.user_registration_interface_adapters.UserExists;
 import entities.user_entities.User;
 import interface_adapters.profile_modification_IA.UserModificationGateway;
-import use_cases.user_registration_use_cases.UserCreator;
 import entities.user_entities.UserFactory;
 import interface_adapters.Chat.UserChatGateway;
-import interface_adapters.User_search_IA.UserRetriever;
 
 import java.io.*;
 import java.util.ArrayList;

src/main/java/interface_adapters/User_search_IA/UserRetriever.java

@@ -1,6 +1,6 @@
 package interface_adapters.User_search_IA;
 
-import interface_adapters.user_registration_interface_adapters.UserExists;
+import use_cases.user_registration_use_cases.UserExists;
 import entities.user_entities.User;
 // gives access to user entity.
 public interface UserRetriever extends UserExists {

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

@@ -2,13 +2,14 @@
 
 import data_access.Database;
 import screens.login_screen.UserLoginUI;
-import use_cases.loginCredentialsRetriever;
+import use_cases.user_login_use_cases.loginCredentialsRetriever;
+import use_cases.user_registration_use_cases.userRegistrationOutputBoundary;
 
 import javax.swing.*;
 
-public class UserRegistrationPresenter {
-
-    public static void accountExistsMessage(){
+public class UserRegistrationPresenter implements userRegistrationOutputBoundary {
+    @Override
+    public void accountExistsMessage(){
         JFrame accountExistsFrame = new JFrame();
         accountExistsFrame.setSize(400, 100);
         accountExistsFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
@@ -20,8 +21,8 @@ public static void accountExistsMessage(){
         accountExistsPanel.add(errorMessage);
         accountExistsFrame.setVisible(true);
     }
-
-    public static void verificationSuccessMessage(String message){
+    @Override
+    public void verificationSuccessMessage(String message){
         JFrame verificationSuccessFrame = new JFrame();
         verificationSuccessFrame.setSize(400, 100);
         verificationSuccessFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
@@ -33,8 +34,8 @@ public static void verificationSuccessMessage(String message){
         verificationSuccessPanel.add(errorMessage);
         verificationSuccessFrame.setVisible(true);
     }
-
-    public static void registrationSuccessAction(Database database){
+    @Override
+    public void registrationSuccessAction(Database database){
         loginCredentialsRetriever loginUI = new UserLoginUI(database);
         loginUI.getLoginCredentials();
     }

src/main/java/interface_adapters/user_registration_interface_adapters/UserRegistrator.java

@@ -1,10 +1,9 @@
 package screens.login_screen;
 import data_access.Database;
-import interface_adapters.login_interface_adapters.UserLoginController;
+import use_cases.user_login_use_cases.UserLoginInteractor;
 import interface_adapters.login_interface_adapters.UserLoginGateway;
-import interface_adapters.User_search_IA.UserRetriever;
 import data_access.UserDatabase;
-import use_cases.loginCredentialsRetriever;
+import use_cases.user_login_use_cases.loginCredentialsRetriever;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -63,7 +62,7 @@ public static void main(String[] args){
     @Override
     public void actionPerformed(ActionEvent e) {
         UserLoginGateway properties = new UserLoginGateway(credentialText.getText(), passwordText.getText(), this.database);
-        UserLoginController guard = new UserLoginController(properties);
+        UserLoginInteractor guard = new UserLoginInteractor(properties);
         guard.allowLogin();
 
     }

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

@@ -1,6 +1,6 @@
 package screens.user_registration_screen;
 
-import interface_adapters.user_registration_interface_adapters.UserRegistrationController;
+import use_cases.user_registration_use_cases.UserRegistrationInteractor;
 import interface_adapters.user_registration_interface_adapters.UserRegistrationGateway;
 import data_access.UserDatabase;
 import use_cases.user_registration_use_cases.userRegCredentialsRetriever;
@@ -126,7 +126,7 @@ public void actionPerformed(ActionEvent e) {
         //Not an error below, we just have not implemented sending code via phone yet.
         if(e.getSource() == emailVerify || e.getSource() == phoneVerify){
             properties.setPreference("Email");
-            UserRegistrationController verifyUser = new UserRegistrationController(properties);
+            UserRegistrationInteractor verifyUser = new UserRegistrationInteractor(properties);
             verifyUser.registerUser();
         }
     }

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

@@ -0,0 +1,5 @@
+package use_cases.user_login_use_cases;
+
+public interface UserLoginInputBoundary {
+    void allowLogin();
+}

src/main/java/use_cases/user_login_use_cases/UserLoginInputBoundary.java

@@ -1,21 +1,24 @@
-package interface_adapters.login_interface_adapters;
+package use_cases.user_login_use_cases;
 
 import entities.user_entities.User;
 import interface_adapters.User_search_IA.UserRetriever;
+import interface_adapters.login_interface_adapters.UserLoginGateway;
+import use_cases.user_login_use_cases.UserLoginInputBoundary;
 
 import javax.swing.*;
 
-public class UserLoginController {
+public class UserLoginInteractor implements UserLoginInputBoundary {
     private final String credential;
     private final String password;
     private final UserRetriever database;
 
-    public UserLoginController(UserLoginGateway properties){
+    public UserLoginInteractor(UserLoginGateway properties){
         this.credential = properties.getCredential();
         this.password = properties.getPassword();
         this.database = properties.getDatabase();
     }
 
+    @Override
     public void allowLogin(){
         User user = database.getUser(this.credential);
         try{

src/main/java/interface_adapters/login_interface_adapters/UserLoginController.java renamed to src/main/java/use_cases/user_login_use_cases/UserLoginInteractor.java

@@ -1,4 +1,4 @@
-package use_cases;
+package use_cases.user_login_use_cases;
 
 public interface loginCredentialsRetriever {
     void getLoginCredentials();