added password to field UserLoginResponseModel

Author: lucasprates74

src/data/FlashcardSets.csv

@@ -1,3 +1,4 @@
 title,description,isPrivate,flashcardSetId,ownerUsername,flashcardIds
 test set 1,for testing study use case,false,0,testUser,0,1,2,3
 empty test set,for testing study use case with empty set,true,1,testUser
+my flashcard set,for presentation,false,2,lucas,4

src/data/Flashcards.csv

@@ -3,3 +3,4 @@ test card 1,the first test card,2022-11-13T15:32:26.666982800,0,0
 test card 2,the second test card,2022-11-13T15:32:27.666982800,1,0
 test card 3,the third test card,2022-11-13T15:32:28.666982800,2,0
 alphabetical order checker,to test if alphabetical order is working,2022-11-13T15:32:29.666982800,3,0
+my new flashcard,my test definition,2022-11-21T14:27:10.045791,4,2

src/data/Users.csv

@@ -1,4 +1,6 @@
 username,password,isAdmin,flashcardSetIds
 jempio,ilovejempio,false
 ducas,badpassword,false
+lucas,password,false,2
+adminUser,password,true
 testUser,password,false,0,1

src/main/java/MainPage/HomePage.java

@@ -3,14 +3,18 @@
 import create_flashcardset_use_case.*;
 import dataAccess.*;
 import entities.FlashcardSetFactory;
+import loginAndSignupUseCase.UserLoginInputBoundary;
+import loginAndSignupUseCase.UserLoginInteractor;
+import loginAndSignupUseCase.UserLoginOutputBoundary;
 import loginAndSignupUseCase.UserLoginResponseModel;
+import loginAndSignupUseCase.loginAndSignupUseCaseScreens.UserLoginController;
+import loginAndSignupUseCase.loginAndSignupUseCaseScreens.UserLoginPresenter;
 import loginAndSignupUseCase.loginAndSignupUseCaseScreens.WelcomeScreen;
 import search_use_case.*;
 
 import javax.swing.*;
 import java.awt.*;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Map;
 
 public class HomePage extends JFrame {
@@ -94,30 +98,21 @@ public HomePage(UserLoginResponseModel user) throws IOException {
     }
 
 
-    private void refresh() {
+    private void refresh(UserLoginResponseModel user) {
         try {
-//            UserLoginOutputBoundary presenter = new UserLoginPresenter();
-//            UserLoginInputBoundary interactor = new UserLoginInteractor(
-//                    gateway, presenter);
-//            UserLoginController userLoginController = new UserLoginController(interactor);
-//            setVisible(false);
-//            dispose();
-//            new LoginScreen(userLoginController).setVisible(true);
-//
-//            UserLoginResponseModel user = userLoginController.create(user.getSignedInUsername(),
-//                    user.getPassword());
-//            this.dispose();
+            UserLoginOutputBoundary presenter = new UserLoginPresenter();
+            UserLoginInputBoundary interactor = new UserLoginInteractor(
+                    gateway, presenter);
+            UserLoginController userLoginController = new UserLoginController(interactor);
+            setVisible(false);
+            dispose();
+
+            user = userLoginController.create(user.getSignedInUsername(),
+                    user.getPassword());
+            this.dispose();
             new HomePage(user);
         } catch (Exception e) {
             JOptionPane.showMessageDialog(this, e.getMessage());
         }
     }
-    public static void main(String[] args) throws IOException {
-        Map<Integer, String[]> map = new HashMap<>();
-        for (int i = 1; i < 4; i++) {
-            map.put(i, new String[]{"test set " + i, "test description " + i});
-        }
-        UserLoginResponseModel user = new UserLoginResponseModel("Lucas", false, map);
-        new HomePage(user);
-    }
 }

src/main/java/loginAndSignupUseCase/UserLoginInteractor.java

@@ -30,6 +30,7 @@ public UserLoginResponseModel login(UserLoginRequestModel userLoginRequestModel)
 
 
         UserLoginResponseModel accountResponseModel = new UserLoginResponseModel(tempUser.getUsername(),
+                tempUser.getPassword(),
                 tempUser.getIsAdmin(), flashcardSets);
         return userLoginOutputBoundary.prepareSuccessView(accountResponseModel);
     }

src/main/java/loginAndSignupUseCase/UserLoginResponseModel.java

@@ -1,17 +1,19 @@
 package loginAndSignupUseCase;
 
-import java.util.HashMap;
 import java.util.Map;
 
 public class UserLoginResponseModel {
-    String username;
+    private final String username;
 
-    boolean isAdmin;
+    private final String password;
+    private final boolean isAdmin;
 
-    Map<Integer, String[]> flashcardSets;
+    private final Map<Integer, String[]> flashcardSets;
 
-    public UserLoginResponseModel(String loggedInUsername, boolean isAdmin, Map<Integer, String[]> flashcardSets){
+    public UserLoginResponseModel(String loggedInUsername, String password,
+                                  boolean isAdmin, Map<Integer, String[]> flashcardSets){
         this.username = loggedInUsername;
+        this.password = password;
         this.isAdmin = isAdmin;
         this.flashcardSets = flashcardSets;
     }
@@ -24,4 +26,8 @@ public String getSignedInUsername() {
     public Map<Integer, String[]> getFlashcardSets(){
         return flashcardSets;
     }
+
+    public String getPassword() {
+        return password;
+    }
 }

src/main/java/loginAndSignupUseCase/loginAndSignupUseCaseScreens/UserLoginController.java

@@ -17,7 +17,7 @@ public UserLoginController(UserLoginInputBoundary loginGateway) {
      * @param password The password used to log in
      * @return The response given by the interactor object.
      */
-    UserLoginResponseModel create(String username, String password) {
+    public UserLoginResponseModel create(String username, String password) {
         UserLoginRequestModel requestModel = new UserLoginRequestModel(username, password);
         return userInput.login(requestModel);
     }

src/main/java/searchTestMain.java

@@ -22,7 +22,7 @@ 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);
-        UserLoginResponseModel user = new UserLoginResponseModel("jempio",
+        UserLoginResponseModel user = new UserLoginResponseModel("jempio", "ilovejempio",
                 true, new HashMap<>());
 
         DBGateway gateway = new DBGateway(flashcardGateway, flashcardSetGateway, null);