-
-
-
{{role}}
+
Update User Role
+
\ No newline at end of file
+
+
Cancel
+
From 889f5cc59d7615ab79e2d3c2f024e91dd37fda17 Mon Sep 17 00:00:00 2001
From: SamuelNguyen2121 <2032373@champlaincollege.qc.ca>
Date: Sat, 21 Oct 2023 16:52:27 -0400
Subject: [PATCH 7/7] Fixed backend PR mistakes
---
.../businesslayer/UserService.java | 2 +-
.../authservice/datalayer/user/UserRepo.java | 1 -
.../User/RolesChangeRequestDTO.java | 3 ++-
.../User/UserControllerIntegrationTest.java | 22 +++++++++----------
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/auth-service/src/main/java/com/petclinic/authservice/businesslayer/UserService.java b/auth-service/src/main/java/com/petclinic/authservice/businesslayer/UserService.java
index 8c391b806e..4928b32f37 100644
--- a/auth-service/src/main/java/com/petclinic/authservice/businesslayer/UserService.java
+++ b/auth-service/src/main/java/com/petclinic/authservice/businesslayer/UserService.java
@@ -63,5 +63,5 @@ public interface UserService {
void updatePassword(String newPassword, String token);
void processResetPassword(UserResetPwdWithTokenRequestModel resetRequest);
- UserPasswordLessDTO updateUserRole(String id, RolesChangeRequestDTO roles, String token);
+ UserPasswordLessDTO updateUserRole(String userId, RolesChangeRequestDTO roles, String token);
}
diff --git a/auth-service/src/main/java/com/petclinic/authservice/datalayer/user/UserRepo.java b/auth-service/src/main/java/com/petclinic/authservice/datalayer/user/UserRepo.java
index 2f86e56833..10a830a499 100644
--- a/auth-service/src/main/java/com/petclinic/authservice/datalayer/user/UserRepo.java
+++ b/auth-service/src/main/java/com/petclinic/authservice/datalayer/user/UserRepo.java
@@ -26,7 +26,6 @@
public interface UserRepo extends JpaRepository
{
Optional findByEmail(String email);
- User findUserById(long id);
Optional findByUsername(String username);
diff --git a/auth-service/src/main/java/com/petclinic/authservice/presentationlayer/User/RolesChangeRequestDTO.java b/auth-service/src/main/java/com/petclinic/authservice/presentationlayer/User/RolesChangeRequestDTO.java
index afde7a6c0e..7c59f390a5 100644
--- a/auth-service/src/main/java/com/petclinic/authservice/presentationlayer/User/RolesChangeRequestDTO.java
+++ b/auth-service/src/main/java/com/petclinic/authservice/presentationlayer/User/RolesChangeRequestDTO.java
@@ -6,11 +6,12 @@
import lombok.NoArgsConstructor;
import java.util.List;
+import java.util.Set;
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder(toBuilder = true)
public class RolesChangeRequestDTO {
- List roles;
+ Set roles;
}
diff --git a/auth-service/src/test/java/com/petclinic/authservice/presentationlayer/User/UserControllerIntegrationTest.java b/auth-service/src/test/java/com/petclinic/authservice/presentationlayer/User/UserControllerIntegrationTest.java
index 455d4cd37d..a4020e1b1c 100644
--- a/auth-service/src/test/java/com/petclinic/authservice/presentationlayer/User/UserControllerIntegrationTest.java
+++ b/auth-service/src/test/java/com/petclinic/authservice/presentationlayer/User/UserControllerIntegrationTest.java
@@ -26,10 +26,7 @@
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
-import java.util.Base64;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
import java.util.stream.Collectors;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
@@ -648,7 +645,7 @@ void deleteUser_ShouldThrowNotFoundException(){
@Test
void updateUserRole_validUserId() {
RolesChangeRequestDTO updatedUser = RolesChangeRequestDTO.builder()
- .roles(Collections.singletonList("OWNER"))
+ .roles(Collections.singleton("OWNER"))
.build();
String token = jwtTokenUtil.generateToken(userRepo.findAll().get(0));
@@ -666,16 +663,19 @@ void updateUserRole_validUserId() {
.value(dto -> {
assertNotNull(dto);
List actualRoleNames = dto.getRoles().stream()
- .map(Role::getName) // Assuming the Role object has a getName() method
+ .map(Role::getName)
.toList();
- assertEquals(updatedUser.getRoles(), actualRoleNames);
+
+ Set actualRolesSet = new HashSet<>(actualRoleNames);
+
+ assertEquals(updatedUser.getRoles(), actualRolesSet);
});
}
@Test
void updateUserRole_InvalidUserId() {
RolesChangeRequestDTO updatedUser = RolesChangeRequestDTO.builder()
- .roles(Collections.singletonList("OWNER"))
+ .roles(Collections.singleton("OWNER"))
.build();
String token = jwtTokenUtil.generateToken(userRepo.findAll().get(0));
String invalidUserId = "invalidId";
@@ -694,7 +694,7 @@ void updateUserRole_InvalidUserId() {
@Test
void updateUserRole_NoCookie() {
RolesChangeRequestDTO updatedUser = RolesChangeRequestDTO.builder()
- .roles(Collections.singletonList("OWNER"))
+ .roles(Collections.singleton("OWNER"))
.build();
webTestClient
@@ -711,7 +711,7 @@ void updateUserRole_NoCookie() {
void updateUserRole_cannotChangeOwnRoles() {
String userId = "validUserId";
RolesChangeRequestDTO updatedUser = RolesChangeRequestDTO.builder()
- .roles(Collections.singletonList("OWNER"))
+ .roles(Collections.singleton("OWNER"))
.build();
String token = jwtTokenUtil.generateToken(userRepo.findAll().get(0));
@@ -730,7 +730,7 @@ void updateUserRole_cannotChangeOwnRoles() {
@Test
void updateUserRole_invalidRole() {
RolesChangeRequestDTO updatedUser = RolesChangeRequestDTO.builder()
- .roles(Collections.singletonList("NOT_OWNER"))
+ .roles(Collections.singleton("NOT_OWNER"))
.build();
String token = jwtTokenUtil.generateToken(userRepo.findAll().get(0));