Changed method for user removing, added user as an entity to deleted entity event

application/src/main/java/org/thingsboard/server/service/entitiy/user/DefaultUserService.java

@@ -64,7 +64,7 @@ public class DefaultUserService extends AbstractTbEntityService implements TbUse
                 try {
                     mailService.sendActivationEmail(activateUrl, email);
                 } catch (ThingsboardException e) {
-                    userService.deleteUser(tenantId, savedUser.getId());
+                    userService.deleteUser(tenantId, savedUser);
                     throw e;
                 }
             }
@@ -82,7 +82,7 @@ public class DefaultUserService extends AbstractTbEntityService implements TbUse
         UserId userId = tbUser.getId();
 
         try {
-            userService.deleteUser(tenantId, userId);
+            userService.deleteUser(tenantId, tbUser);
             notificationEntityService.logEntityAction(tenantId, userId, tbUser, customerId, actionType, user, customerId.toString());
         } catch (Exception e) {
             notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.USER),

common/dao-api/src/main/java/org/thingsboard/server/dao/user/UserService.java

@@ -30,7 +30,7 @@ import org.thingsboard.server.dao.entity.EntityDaoService;
 import java.util.List;
 
 public interface UserService extends EntityDaoService {
-	
+
 	User findUserById(TenantId tenantId, UserId userId);
 
 	ListenableFuture<User> findUserByIdAsync(TenantId tenantId, UserId userId);
@@ -42,22 +42,22 @@ public interface UserService extends EntityDaoService {
 	User saveUser(TenantId tenantId, User user);
 
 	UserCredentials findUserCredentialsByUserId(TenantId tenantId, UserId userId);
-	
+
 	UserCredentials findUserCredentialsByActivateToken(TenantId tenantId, String activateToken);
 
 	UserCredentials findUserCredentialsByResetToken(TenantId tenantId, String resetToken);
 
 	UserCredentials saveUserCredentials(TenantId tenantId, UserCredentials userCredentials);
-	
+
 	UserCredentials activateUserCredentials(TenantId tenantId, String activateToken, String password);
-	
+
 	UserCredentials requestPasswordReset(TenantId tenantId, String email);
 
     UserCredentials requestExpiredPasswordReset(TenantId tenantId, UserCredentialsId userCredentialsId);
 
     UserCredentials replaceUserCredentials(TenantId tenantId, UserCredentials userCredentials);
 
-    void deleteUser(TenantId tenantId, UserId userId);
+    void deleteUser(TenantId tenantId, User user);
 
     PageData<User> findUsersByTenantId(TenantId tenantId, PageLink pageLink);
 

dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java

@@ -246,7 +246,8 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
 
     @Override
     @Transactional
-    public void deleteUser(TenantId tenantId, UserId userId) {
+    public void deleteUser(TenantId tenantId, User user) {
+        UserId userId = user.getId();
         log.trace("Executing deleteUser [{}]", userId);
         validateId(userId, INCORRECT_USER_ID + userId);
         UserCredentials userCredentials = userCredentialsDao.findByUserId(tenantId, userId.getId());
@@ -258,7 +259,8 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
         countService.publishCountEntityEvictEvent(tenantId, EntityType.USER);
         eventPublisher.publishEvent(DeleteEntityEvent.builder()
                 .tenantId(tenantId)
-                .entityId(userId).build());
+                .entityId(userId)
+                .entity(user).build());
     }
 
     @Override
@@ -443,7 +445,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
 
         @Override
         protected void removeEntity(TenantId tenantId, User entity) {
-            deleteUser(tenantId, new UserId(entity.getUuidId()));
+            deleteUser(tenantId, entity);
         }
     };
 
@@ -456,7 +458,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
 
         @Override
         protected void removeEntity(TenantId tenantId, User entity) {
-            deleteUser(tenantId, new UserId(entity.getUuidId()));
+            deleteUser(tenantId, entity);
         }
     };
 

dao/src/test/java/org/thingsboard/server/dao/service/UserServiceTest.java

@@ -135,7 +135,7 @@ public class UserServiceTest extends AbstractServiceTest {
         Assert.assertEquals("Joe", savedUser.getFirstName());
         Assert.assertEquals("Downs", savedUser.getLastName());
 
-        userService.deleteUser(tenantId, savedUser.getId());
+        userService.deleteUser(tenantId, savedUser);
     }
 
     @Test
@@ -188,7 +188,7 @@ public class UserServiceTest extends AbstractServiceTest {
         Assert.assertNotNull(foundUser);
         UserCredentials userCredentials = userService.findUserCredentialsByUserId(tenantId, foundUser.getId());
         Assert.assertNotNull(userCredentials);
-        userService.deleteUser(tenantId, foundUser.getId());
+        userService.deleteUser(tenantId, foundUser);
         userCredentials = userService.findUserCredentialsByUserId(tenantId, foundUser.getId());
         foundUser = userService.findUserById(tenantId, foundUser.getId());
         Assert.assertNull(foundUser);
@@ -301,7 +301,7 @@ public class UserServiceTest extends AbstractServiceTest {
         Assert.assertEquals(tenantAdminsEmail2, loadedTenantAdminsEmail2);
 
         for (User user : loadedTenantAdminsEmail1) {
-            userService.deleteUser(tenantId, user.getId());
+            userService.deleteUser(tenantId, user);
         }
 
         pageLink = new PageLink(4, 0, email1);
@@ -310,7 +310,7 @@ public class UserServiceTest extends AbstractServiceTest {
         Assert.assertEquals(0, pageData.getData().size());
 
         for (User user : loadedTenantAdminsEmail2) {
-            userService.deleteUser(tenantId, user.getId());
+            userService.deleteUser(tenantId, user);
         }
 
         pageLink = new PageLink(4, 0, email2);
@@ -440,7 +440,7 @@ public class UserServiceTest extends AbstractServiceTest {
         Assert.assertEquals(customerUsersEmail2, loadedCustomerUsersEmail2);
 
         for (User user : loadedCustomerUsersEmail1) {
-            userService.deleteUser(tenantId, user.getId());
+            userService.deleteUser(tenantId, user);
         }
 
         pageLink = new PageLink(4, 0, email1);
@@ -449,7 +449,7 @@ public class UserServiceTest extends AbstractServiceTest {
         Assert.assertEquals(0, pageData.getData().size());
 
         for (User user : loadedCustomerUsersEmail2) {
-            userService.deleteUser(tenantId, user.getId());
+            userService.deleteUser(tenantId, user);
         }
 
         pageLink = new PageLink(4, 0, email2);