Skip to content

Commit 08ebc3e

Browse files
committed
Updated to work correctly with all changes to main
1 parent e867684 commit 08ebc3e

File tree

10 files changed

+294
-170
lines changed

10 files changed

+294
-170
lines changed

src/main/java/login_and_signup_use_case/UserRegisterRequestModel.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ public String getRepeatPassword() {
4747
public String getAdminKeyEntered() {
4848
return adminKeyEntered;
4949
}
50-
// public void setAdmin(boolean isAdmin) {
51-
// this.isAdmin = isAdmin;
52-
// }
53-
54-
5550

5651
}
5752

src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/UserDataMapper.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package login_and_signup_use_case.login_and_signup_use_case_screens;
22

3-
import java.time.LocalDateTime;
43
import java.util.ArrayList;
54

65
/**
@@ -25,7 +24,7 @@ class UserDataMapper {
2524
public UserDataMapper() {
2625
}
2726

28-
public UserDataMapper(String name, String password, boolean isAdmin, ArrayList<Integer> flashcardSetIds, LocalDateTime creationTime) {
27+
public UserDataMapper(String name, String password, boolean isAdmin, ArrayList<Integer> flashcardSetIds) {
2928
super();
3029
this.name = name;
3130
this.password = password;
@@ -37,10 +36,6 @@ public String getName() {
3736
return name;
3837
}
3938

40-
public void setName(String name) {
41-
this.name = name;
42-
}
43-
4439
public String getPassword() {
4540
return password;
4641
}
@@ -53,9 +48,5 @@ public void setPassword(String password) {
5348

5449
public void setIsAdmin(boolean isAdmin){this.isAdmin = isAdmin;}
5550

56-
public ArrayList<Integer> getFlashcardSetIds(){
57-
return flashcardSetIds;
58-
}
59-
6051
}
6152

src/test/java/login_and_sign_up_use_case/UserLoginInteractorTest.java

Lines changed: 0 additions & 144 deletions
This file was deleted.

src/test/java/login_and_sign_up_use_case/InMemoryUser.java renamed to src/test/java/login_and_sign_up_use_case_test/InMemoryUser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package login_and_sign_up_use_case;
1+
package login_and_sign_up_use_case_test;
22

33
import data_access.IUserDataAccess;
44
import data_access.entity_request_models.CommonUserDsRequestModel;

0 commit comments

Comments
 (0)