9-feature-1-user-registration

.gitignore

@@ -7,7 +7,6 @@
 .idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
-
 # AWS entities.userEntities.User-specific
 .idea/**/aws.xml
 

src/main/java/entities/userEntities/BasicUser.java → src/main/java/Entities/user_entities/BasicUser.java

@@ -1,6 +1,6 @@
-package entities.userEntities;
+package Entities.user_entities;
 
-public class BasicUser extends User{
+public class BasicUser extends User {
     public BasicUser(String Username, String Password, String Email){
         super(Username, Password, Email);
     }

src/main/java/entities/userEntities/User.java → src/main/java/Entities/user_entities/User.java

@@ -1,22 +1,16 @@
-package entities.userEntities;
-
-import interface_adapters.User.*;
-
+package Entities.user_entities;
+import UseCase.Changeable;
 import java.io.Serializable;
-import java.util.ArrayList;
-
-public abstract class User implements Serializable, Changeable, UserAuthenticationI {
+public abstract class User implements Serializable, Changeable {
     protected String username;
     protected String password;
     protected String email;
     boolean verified = false;
     boolean online = false;
-//    protected ArrayList<Chat> chats;
     public User(String username, String password, String email){
         this.username = username;
         this.password = password;
         this.email = email;
-//        this.chats = new ArrayList<Chat>();
     }
     public String getEmail(){
         return this.email;
@@ -28,17 +22,8 @@ private String getPassword(){
         return this.password;
     }
 
-//    public ArrayList<Chat> getChats() {
-//        return this.chats;
-//    }
-
-    @Override
-    public Boolean PasswordMatch(String attempt){
-        return (this.getPassword().equals(attempt));
-    }
-
     @Override
-//    from interface_adapters.User.Changeable
+//    from UseCase.Changeable
     public void changeFeature(String feature, String newFeature){
         if (feature == "Username"){
             this.username = newFeature;

src/main/java/entities/userEntities/UserFactory.java → src/main/java/Entities/user_entities/UserFactory.java

@@ -1,7 +1,4 @@
-package entities.userEntities;
-
-import entities.userEntities.BasicUser;
-import entities.userEntities.User;
+package Entities.user_entities;
 
 public class UserFactory {
     //Following the factory design pattern, just in case in the future we decide to add various different types of Users

src/main/java/data_access/UserDatabase.java

@@ -1,7 +1,12 @@
 package data_access;
 
-import entities.userEntities.User;
-import entities.userEntities.UserFactory;
+import interface_adapters.IRetrieveList;
+import interface_adapters.user_registration_interface_adapters.UserExists;
+import entities.user_entities.User;
+import entities.user_entities.UserFactory;
+import use_cases.user_login_use_case.UserCreator;
+import interface_adapters.UserRetriever;
+
 import interface_adapters.Chat.ConvHistGateway;
 import interface_adapters.Chat.MsgSenderGateway;
 import interface_adapters.Chat.UserChatGateway;
@@ -10,6 +15,7 @@
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
+
 public class UserDatabase implements UserExists, UserRetriever, UserCreator, IRetrieveList, UserModificationGateway,
         ConvHistGateway, MsgSenderGateway, UserChatGateway {
     File accounts;
@@ -41,14 +47,9 @@ public boolean UserExists(String username, String email) {
 
     @Override
     public boolean UserExists(String username) {
-        for(User user: this.accountList){
-            if(user.getUsername().equals(username)){
-                return true;
-            }
-        }
-        return false;
+        return UserExists(username, "");
     }
-
+    
     // Creates a new user with a username and password, and an email address
     // The order is username, password, email address, verification status, status
     //
@@ -89,14 +90,6 @@ public List<User> getList() {
             ObjectInputStream in = new ObjectInputStream(fileIn)) {
 
             users = (ArrayList<User>) in.readObject();
-            /*
-            while(true){
-                try{
-                    entities.userEntities.User user = (entities.userEntities.User) in.readObject();
-                    users.add(user);}
-                catch(EOFException e){
-                    break;
-                }*/
             return users;
         }catch(EOFException e){
             return users;
@@ -172,5 +165,4 @@ public void modifyUser(String oldUsername, User modified){
 //        }
 //        throw new RuntimeException("Invalid username: user does not exist");
 //    }
-
 }

src/main/java/entities/user_entities/BasicUser.java

@@ -1,7 +1,6 @@
 package entities.user_entities;
 
-import entities.user_entities.User;
-public class BasicUser extends User{
+public class BasicUser extends User {
     public BasicUser(String Username, String Password, String Email){
         super(Username, Password, Email);
     }

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

@@ -1,5 +1,4 @@
 package entities.user_entities;
-
 import use_cases.user_attribute_modification_use_case.Changeable;
 
 import java.io.Serializable;
@@ -25,7 +24,7 @@ private String getPassword(){
     }
 
     @Override
-//    from Changeable
+//    from UseCase.Changeable
     public void changeFeature(String feature, String newFeature){
         if (feature == "Username"){
             this.username = newFeature;

src/main/java/interface_adapters/User/IRetrieveList.java

@@ -1,6 +1,6 @@
 package interface_adapters.User;
 
-import entities.userEntities.User;
+import entities.user_entities.User;
 
 import java.util.List;
 

src/main/java/interface_adapters/User/UserModificationGateway.java

@@ -1,6 +1,6 @@
 package interface_adapters.User;
 
-import entities.userEntities.User;
+import entities.user_entities.User;
 
 // allows for the serialized data_access.UserDatabase to update when changes occur to user attributes.
 public interface UserModificationGateway {

src/main/java/interface_adapters/User/UserRetriever.java

@@ -1,6 +1,6 @@
 package interface_adapters.User;
 
-import entities.userEntities.User;
+import entities.user_entities.User;
 
 public interface UserRetriever {
     User getUser(String username);

src/main/java/interface_adapters/user_registration_interface_adapters/UserExists.java

@@ -2,4 +2,5 @@
 
 public interface UserExists {
     boolean UserExists(String username, String password);
+    boolean UserExists(String username);
 }

src/main/java/screens/Profile_screen/UserSearchUI.java

@@ -2,15 +2,14 @@
  * Provides the UI elements
  */
 import data_access.UserDatabase;
-import entities.userEntities.User;
+import entities.user_entities.User;
 import interface_adapters.User_search_IA.UserPresenter;
 import use_cases.user_profile_display_use_case.UserReader;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.File;
 
 
 public class UserSearchUI implements UserPresenter {

src/main/java/screens/profile_update_screen/UserModificationUI.java

@@ -2,7 +2,7 @@
  * Provides the UI elements
  */
 import data_access.UserDatabase;
-import entities.userEntities.User;
+import entities.user_entities.User;
 import interface_adapters.profile_modification_IA.ChangeController;
 
 import javax.swing.*;

src/main/java/use_cases/chat_initiation_use_case/CheckUsername_Interactor.java

@@ -1,6 +1,8 @@
 package use_cases.chat_initiation_use_case;
 
 
+import data_access.UserDatabase;
+
 /**
  * CheckUsernameInteractor responsible checking if a username exist in our userdata base
  */

src/main/java/use_cases/user_profile_display_use_case/UserReader.java

@@ -1,8 +1,6 @@
 package use_cases.user_profile_display_use_case;
 
-import entities.userEntities.User;
-
-import java.io.File;
+import entities.user_entities.User;
 
 public class UserReader {
     public String[] UserReader(User user) {

src/test/java/UserDatabaseTest.java

@@ -1,5 +1,5 @@
+import entities.user_entities.User;
 import data_access.UserDatabase;
-import entities.userEntities.User;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -9,44 +9,45 @@
 public class UserDatabaseTest {
     @Test
     public void addingFilesRightEmailAndUser(){
-        File accounts = new File("data_access/TestUserDatabase2.csv");
+        File accounts = new File("Test3");
         UserDatabase accountDatabase = new UserDatabase(accounts);
         accountDatabase.createUser("MadhavGopakumar", "123", "[email protected]", "Basic");
         Assertions.assertTrue(accountDatabase.UserExists("MadhavGopakumar", "[email protected]"));
     }
     @Test
     public void addingMultipleFiles(){
-        File accounts = new File("data_access/TestUserDatabase2.csv");
+        File accounts = new File("Test3");
         UserDatabase accountDatabase = new UserDatabase(accounts);
         accountDatabase.createUser("MeenakshiGopakumar", "123", "[email protected]", "Basic");
         Assertions.assertTrue(accountDatabase.UserExists("MeenakshiGopakumar", "[email protected]"));
     }
     @Test
     public void rightEmailWrongUser(){
-        File accounts = new File("data_access/TestUserDatabase2.csv");
+        File accounts = new File("Test3");
         UserDatabase accountDatabase = new UserDatabase(accounts);
         accountDatabase.createUser("MadhavGopakumar", "123", "[email protected]", "Basic");
         Assertions.assertTrue(accountDatabase.UserExists("MadG", "[email protected]"));
     }
     @Test
     public void rightUserWrongEmail(){
-        File accounts = new File("data_access/TestUserDatabase2.csv");
+        File accounts = new File("Test3");
         UserDatabase accountDatabase = new UserDatabase(accounts);
         Assertions.assertTrue(accountDatabase.UserExists("MeenakshiGopakumar", "ma"));
     }
     @Test
     public void listedUsers(){
-        File accounts = new File("data_access/TestUserDatabase2.csv");
+        File accounts = new File("Test3");
         UserDatabase accountDatabase = new UserDatabase(accounts);
         accountDatabase.createUser("MeenakshiGopakumar", "123", "[email protected]", "Basic");
         List<User> lst = accountDatabase.getList();
         String email = lst.get(0).getEmail();
+        System.out.println(email);
         Assertions.assertTrue(email.equals("[email protected]"));
     }
 
     @Test
     public void userGot() {
-        File accounts = new File("data_access/TestUserDatabase2.csv");
+        File accounts = new File("Test3");
         UserDatabase accountDatabase = new UserDatabase(accounts);
         accountDatabase.createUser("MeenakshiGopakumar", "123", "[email protected]", "Basic");
         User user = accountDatabase.getUser("MeenakshiGopakumar");