From 46262e870938cb5f9557cbaf1f705481ed817361 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Thu, 13 Mar 2025 16:37:28 +0200
Subject: [PATCH] fixed entity relation cleanup method

---
 .../thingsboard/server/service/entitiy/EntityServiceTest.java | 4 ++++
 .../thingsboard/server/dao/relation/BaseRelationService.java  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/application/src/test/java/org/thingsboard/server/service/entitiy/EntityServiceTest.java b/application/src/test/java/org/thingsboard/server/service/entitiy/EntityServiceTest.java
index 18687cedba..1e7f5384b5 100644
--- a/application/src/test/java/org/thingsboard/server/service/entitiy/EntityServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/entitiy/EntityServiceTest.java
@@ -282,6 +282,10 @@ public class EntityServiceTest extends AbstractControllerTest {
         data.forEach(entityData -> Assert.assertNotNull(entityData.getLatest().get(EntityKeyType.ENTITY_FIELD).get("phone")));
 
         countByQueryAndCheck(query, 5);
+
+        // delete user
+        userService.deleteUser(tenantId, users.get(0));
+        countByQueryAndCheck(query, 4);
     }
 
     private void createTestUserRelations(TenantId tenantId, List<User> users) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java
index a0e75e062c..87f7e44a1f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java
@@ -236,6 +236,7 @@ public class BaseRelationService implements RelationService {
         return Futures.transform(future, deletedEvent -> {
             if (deletedEvent != null) {
                 handleEvictEvent(EntityRelationEvent.from(deletedEvent));
+                eventPublisher.publishEvent(new RelationActionEvent(tenantId, deletedEvent, ActionType.RELATION_DELETED));
             }
             return deletedEvent != null;
         }, MoreExecutors.directExecutor());
@@ -267,6 +268,7 @@ public class BaseRelationService implements RelationService {
 
         for (EntityRelation relation : inboundRelations) {
             eventPublisher.publishEvent(EntityRelationEvent.from(relation));
+            eventPublisher.publishEvent(new RelationActionEvent(tenantId, relation, ActionType.RELATION_DELETED));
         }
 
         List<EntityRelation> outboundRelations;
@@ -278,6 +280,7 @@ public class BaseRelationService implements RelationService {
 
         for (EntityRelation relation : outboundRelations) {
             eventPublisher.publishEvent(EntityRelationEvent.from(relation));
+            eventPublisher.publishEvent(new RelationActionEvent(tenantId, relation, ActionType.RELATION_DELETED));
         }
     }