There was design problems with user verification, so I changed the design to include a controller object

Author: Madhavan7

src/main/java/Controllers/UserRegistrationUseCase.java

@@ -1,5 +1,5 @@
 package Controllers;
 
 public interface UserRegistrationUseCase {
-    void registerUser(String username, String password, String email);
+    void registerUser();
 }

src/main/java/UI/UserVerificationUI.java renamed to src/main/java/UI/UserRegistrationController.java

@@ -1,25 +1,33 @@
 package UI;
 
+import Controllers.UserRegistrationUseCase;
 import UseCase.UserVerifier;
 import UseCase.verificationMethodFactory;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Random;
-public class UserVerificationUI implements UserVerifier, ActionListener {
+public class UserRegistrationController implements UserVerifier, ActionListener, UserRegistrationUseCase {
+    private final String username;
+    private final String password;
+    private final String email;
+    private UserDatabase database;
     Random random;
     private final int code;
     private JTextField verificationCodeText;
     private JLabel success;
 
-    public UserVerificationUI(int code){
+    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;
     }
 
     //Asks for the verification code from the user, and matches it with this.code to potentially verify the user
     public void verify(String email){
-        //Creating the UI to input the verification code
         JFrame verificationFrame = new JFrame();
         verificationFrame.setSize(400, 200);
         verificationFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@@ -50,6 +58,14 @@ public void verify(String email){
         mailMan.deliverCode();
     }
 
+    public void registerUser() {
+        if(database.UserExists(this.username, this.email)){
+            System.out.println("A user with this username or email already exists");
+        }else{
+            this.verify(email);
+        }
+    }
+
     //For testing purposes
     /*public static void main(String[] args){
         UI.UserVerificationUI ver = new UI.UserVerificationUI(389);
@@ -59,11 +75,11 @@ public void verify(String email){
     @Override
     public void actionPerformed(ActionEvent e) {
         int verCode = Integer.parseInt(verificationCodeText.getText());
-        if(code == verCode){
-            //TODO: Going to change below to a label, and will link to LoginUI
-            success.setText("verified!");
+        if(verCode == this.code){
+            database.createUser(this.username, this.password, this.email, "Basic");
+            System.out.println("Verification successful");
         }else{
-            success.setText("Try again");
+            System.out.println("Could not verify please try again");
         }
     }
 }

src/main/java/UI/UserRegistrationUI.java

@@ -1,12 +1,11 @@
 package UI;
 
-import Controllers.UserRegistrationUseCase;
 import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 
-public class UserRegistrationUI implements UserRegistrationUseCase, ActionListener {
+public class UserRegistrationUI implements ActionListener {
     private final UserDatabase database;
     private JLabel registrationSuccess;
     private JTextField usernameText;
@@ -73,17 +72,21 @@ void GetUserCredentials(){
 
         registerFrame.setVisible(true);
     }
-    @Override
-    public void registerUser(String username, String password, String email) {
+    /*@Override*/
+    /*public void registerUser(String username, String password, String email) {
         if(database.UserExists(username, email)){
             registrationSuccess.setText("The username or password is already in use, please try again");
         }else{
-            database.createUser(username, password, email, "Basic");
-            registrationSuccess.setText("Your account has been created, please verify to login");
-            UserVerificationUI verifyUser = new UserVerificationUI(code);
-            verifyUser.verify(email);
+            registrationSuccess.setText("Please verify to create your account");
+            UserVerificationUI verifyUser = new UserVerificationUI(code, email);
+            if(verifyUser.verify(email)){
+                database.createUser(username, password, email, "Basic");
+                registrationSuccess.setText("Your account is now created");
+            }else{
+                registrationSuccess.setText("You could not be verified, please try again");
+            };
         }
-    }
+    }*/
     //For Testing purposes
     public static void main(String[] args){
         UserDatabase testDB = new UserDatabase(new File("Test5"));
@@ -99,7 +102,7 @@ public void actionPerformed(ActionEvent e) {
         String username = usernameText.getText();
         String password = passwordText.getText();
         String email = emailText.getText();
-        this.registerUser(username, password, email);
-
+        UserRegistrationController verifyUser = new UserRegistrationController(code, username, password, email, database);
+        verifyUser.registerUser();
     }
 }