dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
imbeacon 2023-08-11 07:56:08 +03:00
parent 328d53dffc
commit e7543d78d4
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -57,7 +57,7 @@ public interface UserService extends EntityDaoService {
UserCredentials replaceUserCredentials(TenantId tenantId, UserCredentials userCredentials); 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); PageData<User> findUsersByTenantId(TenantId tenantId, PageLink pageLink);

10
dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
View File

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

12
dao/src/test/java/org/thingsboard/server/dao/service/UserServiceTest.java
View File

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