Merge branch 'develop' of github.com:savvato-software/tribe-app-backe…

…nd into develop
savvato-software · Sep 19, 2024 · 7dd8d2b · 7dd8d2b
2 parents 94ed747 + a9a8ab4
commit 7dd8d2b
Showing 10 changed files with 460 additions and 529 deletions.
diff --git a/src/test/java/com/savvato/tribeapp/constants/AbstractTestConstants.java b/src/test/java/com/savvato/tribeapp/constants/AbstractTestConstants.java
diff --git a/src/test/java/com/savvato/tribeapp/constants/UserTestConstants.java b/src/test/java/com/savvato/tribeapp/constants/UserTestConstants.java
@@ -1,11 +1,14 @@
 package com.savvato.tribeapp.constants;
 
 import com.savvato.tribeapp.controllers.dto.UserRequest;
+import com.savvato.tribeapp.dto.UserDTO;
+import com.savvato.tribeapp.dto.UserRoleDTO;
 import com.savvato.tribeapp.dto.UsernameDTO;
 import com.savvato.tribeapp.entities.User;
 import com.savvato.tribeapp.entities.UserRole;
 
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
 
 public interface UserTestConstants {
@@ -140,4 +143,36 @@ static UserRequest getUserRequestFor(User user) {
 
         return rtn;
     }
+
+    static UserDTO getUserDTO(User user) {
+        UserDTO userDTO = UserDTO.builder()
+                .id(user.getId())
+                .name(user.getName())
+                .password(user.getPassword())
+                .phone(user.getPhone())
+                .email(user.getEmail())
+                .enabled(user.getEnabled())
+                .created(user.getCreated().toString())
+                .lastUpdated(user.getLastUpdated().toString())
+                .roles(getUserRoleDTOSet(user))
+                .build();
+        return userDTO;
+    }
+    static Set<UserRoleDTO> getUserRoleDTOSet(User user) {
+        Set<UserRole> userRole = user.getRoles();
+        Set<UserRoleDTO> rtn = new HashSet<>();
+        Iterator<UserRole> iterator = userRole.iterator();
+        while (iterator.hasNext()) {
+            UserRole ur = iterator.next();
+            Long id = ur.getId();
+            String name = ur.getName();
+            UserRoleDTO userRoleDTO = UserRoleDTO.builder()
+                    .id(id)
+                    .name(name)
+                    .build();
+            rtn.add(userRoleDTO);
+        }
+        return rtn;
+    }
+
 }
diff --git a/src/test/java/com/savvato/tribeapp/integration/controllers/PermissionsAPIIT.java b/src/test/java/com/savvato/tribeapp/integration/controllers/PermissionsAPIIT.java
@@ -9,7 +9,6 @@
 import com.savvato.tribeapp.controllers.dto.PermissionsRequest;
 import com.savvato.tribeapp.dto.UserDTO;
 import com.savvato.tribeapp.dto.GenericResponseDTO;
-import com.savvato.tribeapp.dto.UserRoleDTO;
 import com.savvato.tribeapp.entities.User;
 import com.savvato.tribeapp.entities.UserRole;
 import com.savvato.tribeapp.services.*;
@@ -94,17 +93,7 @@ public void getAllUsersWhenFound() throws Exception {
         Mockito.when(userPrincipalService.getUserPrincipalByEmail(Mockito.anyString()))
                 .thenReturn(new UserPrincipal(user));
         String auth = AuthServiceImpl.generateAccessToken(user);
-        UserDTO userDTO =
-                UserDTO.builder()
-                        .id(user.getId())
-                        .name(user.getName())
-                        .email(user.getEmail())
-                        .roles(getUserRoleDTOSet(user))
-                        .password(user.getPassword())
-                        .created(user.getCreated().toString())
-                        .lastUpdated(user.getLastUpdated().toString())
-                        .enabled(user.getEnabled())
-                        .build();
+        UserDTO userDTO = UserTestConstants.getUserDTO(user);
         List<UserDTO> expectedUserList = List.of(userDTO);
         when(userService.getAllUsers()).thenReturn(expectedUserList);
         MvcResult result =
@@ -124,23 +113,6 @@ public void getAllUsersWhenFound() throws Exception {
         assertThat(actualUserList).usingRecursiveComparison().isEqualTo(expectedUserList);
     }
 
-    private Set<UserRoleDTO> getUserRoleDTOSet(User user) {
-        Set<UserRole> userRole = user.getRoles();
-        Set<UserRoleDTO> rtn = new HashSet<>();
-        Iterator<UserRole> iterator = userRole.iterator();
-        while (iterator.hasNext()) {
-            UserRole ur = iterator.next();
-            Long id = ur.getId();
-            String name = ur.getName();
-            UserRoleDTO userRoleDTO = UserRoleDTO.builder()
-                    .id(id)
-                    .name(name)
-                    .build();
-            rtn.add(userRoleDTO);
-        }
-        return rtn;
-    }
-
     @Test
     public void getAllUsersWhenNoneFound() throws Exception {
         Mockito.when(userPrincipalService.getUserPrincipalByEmail(Mockito.anyString()))