Merge pull request #55 from CSC207-2022F-UofT/54-change-user-type-param-for-search

Changed CommonUserDsRequestModel to UserLoginResponse Model for search use case.

Author: winstonc03

src/data/Users.csv

@@ -1,3 +1,3 @@
 username,password,isAdmin,flashcardSetsIds
 testUser,456r2t17yuihjn@,false,0,1
-jempio,ilovejempio,false,3,4,5,6,7,8
+jempio,ilovejempio,false,1,2,

src/main/java/searchTestMain.java

@@ -1,9 +1,11 @@
 import dataAccess.*;
 import entityRequestModels.CommonUserDsRequestModel;
+import loginAndSignupUseCase.UserLoginResponseModel;
 import search_use_case.*;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 
 import com.formdev.flatlaf.FlatDarculaLaf;
 
@@ -22,9 +24,8 @@ public static void main(String[] args) throws IOException {
         SearchOutputBoundary search_presenter = new SearchPresenter();
         SearchInputBoundary search_interactor = new SearchInteractor(search_presenter, dbGateway);
         SearchController search_controller = new SearchController(search_interactor);
-        ArrayList<Integer> setIDs = new ArrayList<>();
-        CommonUserDsRequestModel user = new CommonUserDsRequestModel("jemp", "pio",
-                true, setIDs);
+        UserLoginResponseModel user = new UserLoginResponseModel("jempio",
+                true, new HashMap<>());
 
         DBGateway gateway = new DBGateway(flashcardGateway, flashcardSetGateway, null);
 

src/main/java/search_use_case/SearchController.java

@@ -1,6 +1,6 @@
 package search_use_case;
 
-import entityRequestModels.CommonUserDsRequestModel;
+import loginAndSignupUseCase.UserLoginResponseModel;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -28,7 +28,7 @@ public SearchController(SearchInputBoundary userInput){
      * @param user  the current user
      * @return  a response model with the result set
      */
-    public SearchResponseModel create(String search_input, ArrayList<String> tags, CommonUserDsRequestModel user) throws IOException {
+    public SearchResponseModel create(String search_input, ArrayList<String> tags, UserLoginResponseModel user) throws IOException {
         SearchRequestModel requestModel = new SearchRequestModel(search_input, tags, user);
 
         return userInput.create(requestModel);

src/main/java/search_use_case/SearchInteractor.java

@@ -3,6 +3,7 @@
 import dataAccess.*;
 import entityRequestModels.CommonUserDsRequestModel;
 import entityRequestModels.FlashcardSetDsRequestModel;
+import loginAndSignupUseCase.UserLoginResponseModel;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -42,7 +43,7 @@ public SearchResponseModel create(SearchRequestModel requestModel) throws IOExce
         ArrayList<Integer> flashcard_set_ids = new ArrayList<>();
 
         // populate result_set with all possible flashcards from database
-        CommonUserDsRequestModel curr_user = requestModel.getUser();
+        UserLoginResponseModel curr_user = requestModel.getUser();
 
         Collection<CommonUserDsRequestModel> all_users = gateway.getUserGateway().getAllUsers();
         for (CommonUserDsRequestModel user : all_users){

src/main/java/search_use_case/SearchRequestModel.java

@@ -1,5 +1,6 @@
 package search_use_case;
 import entityRequestModels.CommonUserDsRequestModel;
+import loginAndSignupUseCase.UserLoginResponseModel;
 
 import java.util.ArrayList;
 
@@ -15,15 +16,15 @@ public class SearchRequestModel {
 
     private final String search_input;
     private final ArrayList<String> tags;
-    private final CommonUserDsRequestModel user;
+    private final UserLoginResponseModel user;
 
     /**
      *  creates a SearchRequestModel
      * @param search_input the user input
      * @param tags  the selected tags
      * @param user  the current user
      */
-    public SearchRequestModel(String search_input, ArrayList<String> tags, CommonUserDsRequestModel user){
+    public SearchRequestModel(String search_input, ArrayList<String> tags, UserLoginResponseModel user){
         this.search_input = search_input;
         this.tags = tags;
         this.user = user;
@@ -49,7 +50,7 @@ ArrayList<String> getTags(){
      *
      * @return the current user
      */
-    CommonUserDsRequestModel getUser(){
+    UserLoginResponseModel getUser(){
         return user;
     }
 

src/main/java/search_use_case/SearchScreen.java

@@ -2,6 +2,7 @@
 
 import dataAccess.DBGateway;
 import entityRequestModels.CommonUserDsRequestModel;
+import loginAndSignupUseCase.UserLoginResponseModel;
 import quizUseCase.QuizController;
 import studyMode.StudySessionController;
 
@@ -26,7 +27,7 @@ public class SearchScreen extends JFrame implements ActionListener{
      * @param gateway to handle study and quiz controllers in the results
      * @param curr_user the current user
      */
-    public SearchScreen(SearchController search_controller, DBGateway gateway, CommonUserDsRequestModel curr_user){
+    public SearchScreen(SearchController search_controller, DBGateway gateway, UserLoginResponseModel curr_user){
         super("Search Flashcards");
 
         ArrayList<String> selected_tags = new ArrayList<>();