Package implementation

parmism · parmism · commit f1905b3d9910 · 2022-11-20T15:15:47.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,14 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff
+# entities.userEntities.User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
 
-# AWS User-specific
+# AWS entities.userEntities.User-specific
 .idea/**/aws.xml
 
 # Generated files
diff --git a/src/main/java/TestUserDatabase2.csv b/src/main/java/TestUserDatabase2.csv
diff --git a/src/main/java/UserAccounts.csv b/src/main/java/UserAccounts.csv
diff --git a/src/main/java/UserModificationGateway.java b/src/main/java/UserModificationGateway.java
diff --git a/src/main/java/data_access/UserDatabase.java b/src/main/java/data_access/UserDatabase.java
@@ -1,8 +1,12 @@
+package data_access;
+
+import entities.userEntities.User;
+
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 public class UserDatabase implements UserExists, UserRetriever, UserCreator, IRetrieveList, UserModificationGateway,
-ConvHistGateway, MsgSenderGateway, UserChatGateway {
+        ConvHistGateway, MsgSenderGateway, UserChatGateway {
     File accounts;
     List<User> accountList;
     public UserDatabase(){
@@ -83,7 +87,7 @@ public List<User> getList() {
             /*
             while(true){
                 try{
-                    User user = (User) in.readObject();
+                    entities.userEntities.User user = (entities.userEntities.User) in.readObject();
                     users.add(user);}
                 catch(EOFException e){
                     break;
@@ -128,7 +132,7 @@ public void modifyUser(String oldUsername, User modified){
 //        String chatID = dsRequestModel.getChatID();
 //        Message message = dsRequestModel.getMessage();
 //
-//        // Find chat under specified User
+//        // Find chat under specified entities.userEntities.User
 //        Chat chat = this.getUser(userID).getChat(chatID);
 //
 //        chat.addMessage(message);
@@ -143,7 +147,7 @@ public void modifyUser(String oldUsername, User modified){
 //        String userID = dsRequestModel.getUserID();
 //        String chatID = dsRequestModel.getChatID();
 //
-//        // Find chat under specified User
+//        // Find chat under specified entities.userEntities.User
 //        Chat chat = this.getUser(userID).getChat(chatID);
 //
 //        return Chat.getConversationHistory();
@@ -156,7 +160,7 @@ public void modifyUser(String oldUsername, User modified){
 // also be used by ChatInteractor  (Chat entity is undefined here and at the moment user doesn't have chats)
 //    @Override
 //    public ArrayList<Chat> getUserChats(String username) {
-//        for (User user: accountList){
+//        for (entities.userEntities.User user: accountList){
 //            if (user.getUsername().equals(username)){
 //                return user.getChats();
 //            }
diff --git a/src/main/java/entities/userEntities/BasicUser.java b/src/main/java/entities/userEntities/BasicUser.java
@@ -1,3 +1,5 @@
+package entities.userEntities;
+
 public class BasicUser extends User{
     public BasicUser(String Username, String Password, String Email){
         super(Username, Password, Email);
diff --git a/src/main/java/entities/userEntities/User.java b/src/main/java/entities/userEntities/User.java
@@ -1,3 +1,7 @@
+package entities.userEntities;
+
+import interface_adapters.User.*;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 
@@ -34,7 +38,7 @@ public Boolean PasswordMatch(String attempt){
     }
 
     @Override
-//    from Changeable
+//    from interface_adapters.User.Changeable
     public void changeFeature(String feature, String newFeature){
         if (feature == "Username"){
             this.username = newFeature;
diff --git a/src/main/java/entities/userEntities/UserFactory.java b/src/main/java/entities/userEntities/UserFactory.java
@@ -1,3 +1,8 @@
+package entities.userEntities;
+
+import entities.userEntities.BasicUser;
+import entities.userEntities.User;
+
 public class UserFactory {
     //Following the factory design pattern, just in case in the future we decide to add various different types of Users
     public static User BirthUser(String Username, String Password, String Email, String type){
diff --git a/src/main/java/interface_adapters/Chat/ConvHistGateway.java b/src/main/java/interface_adapters/Chat/ConvHistGateway.java
@@ -1,3 +1,5 @@
+package interface_adapters.Chat;
+
 public interface ConvHistGateway {
 //    public ArrayList<Message> getConversationHistory(ConvHistDsRequestModel dsRequestModel);
 }
diff --git a/src/main/java/interface_adapters/Chat/MsgSenderGateway.java b/src/main/java/interface_adapters/Chat/MsgSenderGateway.java
@@ -1,4 +1,4 @@
-
+package interface_adapters.Chat;
 
 public interface MsgSenderGateway {
 //    public void saveMessage(MsgSenderDsRequestModel dsRequestModel);
diff --git a/src/main/java/interface_adapters/Chat/UserChatGateway.java b/src/main/java/interface_adapters/Chat/UserChatGateway.java
@@ -1,3 +1,5 @@
+package interface_adapters.Chat;
+
 import java.util.ArrayList;
 
 public interface UserChatGateway {
diff --git a/src/main/java/interface_adapters/User/Changeable.java b/src/main/java/interface_adapters/User/Changeable.java
@@ -1,3 +1,5 @@
+package interface_adapters.User;
+
 public interface Changeable {
     void changeFeature(String feature, String newFeature);
 }
diff --git a/src/main/java/interface_adapters/User/IRetrieveList.java b/src/main/java/interface_adapters/User/IRetrieveList.java
@@ -1,3 +1,7 @@
+package interface_adapters.User;
+
+import entities.userEntities.User;
+
 import java.util.List;
 
 public interface IRetrieveList {
diff --git a/src/main/java/interface_adapters/User/UserAuthenticationI.java b/src/main/java/interface_adapters/User/UserAuthenticationI.java
@@ -1,3 +1,5 @@
+package interface_adapters.User;
+
 public interface UserAuthenticationI {
     Boolean PasswordMatch(String attempt);
 }
diff --git a/src/main/java/interface_adapters/User/UserCreator.java b/src/main/java/interface_adapters/User/UserCreator.java
@@ -1,3 +1,4 @@
+package interface_adapters.User;
 
 public interface UserCreator {
     void createUser(String username, String password, String email, String type);
diff --git a/src/main/java/interface_adapters/User/UserExists.java b/src/main/java/interface_adapters/User/UserExists.java
@@ -1,3 +1,5 @@
+package interface_adapters.User;
+
 public interface UserExists {
     boolean UserExists(String username, String email);
     boolean UserExists(String username);
diff --git a/src/main/java/interface_adapters/User/UserModificationGateway.java b/src/main/java/interface_adapters/User/UserModificationGateway.java
@@ -0,0 +1,9 @@
+package interface_adapters.User;
+
+import entities.userEntities.User;
+
+// allows for the serialized data_access.UserDatabase to update when changes occur to user attributes.
+public interface UserModificationGateway {
+    public void modifyUser(String oldUsername, User modified);
+}
+
diff --git a/src/main/java/interface_adapters/User/UserRegPresenter.java b/src/main/java/interface_adapters/User/UserRegPresenter.java
@@ -1,3 +1,5 @@
+package interface_adapters.User;
+
 public interface UserRegPresenter {
     boolean UserExists();
 }
diff --git a/src/main/java/interface_adapters/User/UserRetriever.java b/src/main/java/interface_adapters/User/UserRetriever.java
@@ -1,3 +1,7 @@
+package interface_adapters.User;
+
+import entities.userEntities.User;
+
 public interface UserRetriever {
     User getUser(String username);
 }
diff --git a/src/test/java/UserDatabaseTest.java b/src/test/java/UserDatabaseTest.java
@@ -1,3 +1,5 @@
+import data_access.UserDatabase;
+import entities.userEntities.User;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -7,34 +9,34 @@
 public class UserDatabaseTest {
     @Test
     public void addingFilesRightEmailAndUser(){
-        File accounts = new File("TestUserDatabase2.csv");
+        File accounts = new File("data_access/TestUserDatabase2.csv");
         UserDatabase accountDatabase = new UserDatabase(accounts);
         accountDatabase.createUser("MadhavGopakumar", "123", "madhavgopan2000@gmail.com", "Basic");
         Assertions.assertTrue(accountDatabase.UserExists("MadhavGopakumar", "madhavgopan2000@gmail.com"));
     }
     @Test
     public void addingMultipleFiles(){
-        File accounts = new File("TestUserDatabase2.csv");
+        File accounts = new File("data_access/TestUserDatabase2.csv");
         UserDatabase accountDatabase = new UserDatabase(accounts);
         accountDatabase.createUser("MeenakshiGopakumar", "123", "meena@gmail.com", "Basic");
         Assertions.assertTrue(accountDatabase.UserExists("MeenakshiGopakumar", "meena@gmail.com"));
     }
     @Test
     public void rightEmailWrongUser(){
-        File accounts = new File("TestUserDatabase2.csv");
+        File accounts = new File("data_access/TestUserDatabase2.csv");
         UserDatabase accountDatabase = new UserDatabase(accounts);
         accountDatabase.createUser("MadhavGopakumar", "123", "madhavgopan2000@gmail.com", "Basic");
         Assertions.assertTrue(accountDatabase.UserExists("MadG", "madhavgopan2000@gmail.com"));
     }
     @Test
     public void rightUserWrongEmail(){
-        File accounts = new File("TestUserDatabase2.csv");
+        File accounts = new File("data_access/TestUserDatabase2.csv");
         UserDatabase accountDatabase = new UserDatabase(accounts);
         Assertions.assertTrue(accountDatabase.UserExists("MeenakshiGopakumar", "ma"));
     }
     @Test
     public void listedUsers(){
-        File accounts = new File("TestUserDatabase2.csv");
+        File accounts = new File("data_access/TestUserDatabase2.csv");
         UserDatabase accountDatabase = new UserDatabase(accounts);
         accountDatabase.createUser("MeenakshiGopakumar", "123", "meena@gmail.com", "Basic");
         List<User> lst = accountDatabase.getList();
@@ -44,7 +46,7 @@ public void listedUsers(){
 
     @Test
     public void userGot() {
-        File accounts = new File("TestUserDatabase2.csv");
+        File accounts = new File("data_access/TestUserDatabase2.csv");
         UserDatabase accountDatabase = new UserDatabase(accounts);
         accountDatabase.createUser("MeenakshiGopakumar", "123", "meena@gmail.com", "Basic");
         User user = accountDatabase.getUser("MeenakshiGopakumar");

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package entities.userEntities;`
	`2`	`+`
`1`	`3`	`public class BasicUser extends User{`
`2`	`4`	`public BasicUser(String Username, String Password, String Email){`
`3`	`5`	`super(Username, Password, Email);`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package interface_adapters.Chat;`
	`2`	`+`
`1`	`3`	`public interface ConvHistGateway {`
`2`	`4`	`// public ArrayList<Message> getConversationHistory(ConvHistDsRequestModel dsRequestModel);`
`3`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-`
	`1`	`+package interface_adapters.Chat;`
`2`	`2`
`3`	`3`	`public interface MsgSenderGateway {`
`4`	`4`	`// public void saveMessage(MsgSenderDsRequestModel dsRequestModel);`