delete user also delete deviceId

Author: while1618

backend/spring-boot/src/main/java/org/bugzkit/api/admin/service/impl/UserServiceImpl.java

@@ -6,6 +6,7 @@
 import org.bugzkit.api.admin.payload.request.PatchUserRequest;
 import org.bugzkit.api.admin.payload.request.UserRequest;
 import org.bugzkit.api.admin.service.UserService;
+import org.bugzkit.api.auth.repository.DeviceRepository;
 import org.bugzkit.api.auth.service.AccessTokenService;
 import org.bugzkit.api.auth.service.RefreshTokenService;
 import org.bugzkit.api.auth.util.AuthUtil;
@@ -31,6 +32,7 @@
 public class UserServiceImpl implements UserService {
   private final UserRepository userRepository;
   private final RoleRepository roleRepository;
+  private final DeviceRepository deviceRepository;
   private final AccessTokenService accessTokenService;
   private final RefreshTokenService refreshTokenService;
   private final PasswordEncoder passwordEncoder;
@@ -39,12 +41,14 @@ public class UserServiceImpl implements UserService {
   public UserServiceImpl(
       UserRepository userRepository,
       RoleRepository roleRepository,
+      DeviceRepository deviceRepository,
       AccessTokenService accessTokenService,
       RefreshTokenService refreshTokenService,
       PasswordEncoder passwordEncoder,
       UserMapper userMapper) {
     this.userRepository = userRepository;
     this.roleRepository = roleRepository;
+    this.deviceRepository = deviceRepository;
     this.accessTokenService = accessTokenService;
     this.refreshTokenService = refreshTokenService;
     this.passwordEncoder = passwordEncoder;
@@ -239,6 +243,7 @@ private void setRoles(User user, Set<RoleName> roleNames) {
   @Transactional
   public void delete(Long id) {
     deleteAuthTokens(id);
+    deviceRepository.deleteAllByUserId(id);
     userRepository.deleteById(id);
     log.info("Admin deleted user with id '{}'", id);
   }

backend/spring-boot/src/test/java/org/bugzkit/api/admin/integration/UserControllerIT.java

@@ -393,4 +393,39 @@ void deleteUser() throws Exception {
                 .cookie(new Cookie("accessToken", accessToken)))
         .andExpect(status().isNoContent());
   }
+
+  @Test
+  void deleteUser_withActiveSession() throws Exception {
+    final var userRequest =
+        UserRequest.builder()
+            .username("todelete")
+            .email("todelete@localhost")
+            .password("qwerty123")
+            .confirmPassword("qwerty123")
+            .active(true)
+            .lock(false)
+            .roleNames(Set.of(RoleName.USER))
+            .build();
+    final var createResponse =
+        mockMvc
+            .perform(
+                post(Path.ADMIN_USERS)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .cookie(new Cookie("accessToken", accessToken))
+                    .content(objectMapper.writeValueAsString(userRequest)))
+            .andExpect(status().isCreated())
+            .andReturn()
+            .getResponse()
+            .getContentAsString();
+    final var userId = objectMapper.readValue(createResponse, UserDTO.class).id();
+
+    IntegrationTestUtil.authTokens(mockMvc, objectMapper, "todelete");
+
+    mockMvc
+        .perform(
+            delete(Path.ADMIN_USERS + "/{id}", userId)
+                .contentType(MediaType.APPLICATION_JSON)
+                .cookie(new Cookie("accessToken", accessToken)))
+        .andExpect(status().isNoContent());
+  }
 }