Added additional methods to dao to remove only required relations

dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java

@@ -236,19 +236,20 @@ public class BaseRelationService implements RelationService {
     public void deleteEntityRelations(TenantId tenantId, EntityId entityId, RelationTypeGroup relationTypeGroup) {
         log.trace("Executing deleteEntityRelations [{}]", entityId);
         validate(entityId);
-        List<EntityRelation> inboundRelations;
+        List<EntityRelation> inboundRelations = relationTypeGroup == null
-        List<EntityRelation> outboundRelations;
+                    ? relationDao.findAllByTo(tenantId, entityId)
-        if (relationTypeGroup == null) {
+                    : relationDao.findAllByTo(tenantId, entityId, relationTypeGroup);
-            inboundRelations = relationDao.findAllByTo(tenantId, entityId);
+        List<EntityRelation> outboundRelations = relationTypeGroup == null
-            outboundRelations = relationDao.findAllByFrom(tenantId, entityId);
+                    ? relationDao.findAllByFrom(tenantId, entityId)
-        } else {
+                    : relationDao.findAllByFrom(tenantId, entityId, relationTypeGroup);
-            inboundRelations = relationDao.findAllByFrom(tenantId, entityId, relationTypeGroup);
-            outboundRelations = relationDao.findAllByTo(tenantId, entityId, relationTypeGroup);
-        }
 
         if (!inboundRelations.isEmpty()) {
             try {
-                relationDao.deleteInboundRelations(tenantId, entityId);
+                if (relationTypeGroup == null) {
+                    relationDao.deleteInboundRelations(tenantId, entityId);
+                } else {
+                    relationDao.deleteInboundRelations(tenantId, entityId, relationTypeGroup);
+                }
             } catch (ConcurrencyFailureException e) {
                 log.debug("Concurrency exception while deleting relations [{}]", inboundRelations, e);
             }
@@ -259,7 +260,11 @@ public class BaseRelationService implements RelationService {
         }
 
         if (!outboundRelations.isEmpty()) {
-            relationDao.deleteOutboundRelations(tenantId, entityId);
+            if (relationTypeGroup == null) {
+                relationDao.deleteOutboundRelations(tenantId, entityId);
+            } else {
+                relationDao.deleteOutboundRelations(tenantId, entityId, relationTypeGroup);
+            }
 
             for (EntityRelation relation : outboundRelations) {
                 eventPublisher.publishEvent(EntityRelationEvent.from(relation));

dao/src/main/java/org/thingsboard/server/dao/relation/RelationDao.java

@@ -64,8 +64,12 @@ public interface RelationDao {
 
     void deleteOutboundRelations(TenantId tenantId, EntityId entity);
 
+    void deleteOutboundRelations(TenantId tenantId, EntityId entity, RelationTypeGroup relationTypeGroup);
+
     void deleteInboundRelations(TenantId tenantId, EntityId entity);
 
+    void deleteInboundRelations(TenantId tenantId, EntityId entity, RelationTypeGroup relationTypeGroup);
+
     ListenableFuture<Boolean> deleteOutboundRelationsAsync(TenantId tenantId, EntityId entity);
 
     List<EntityRelation> findRuleNodeToRuleChainRelations(RuleChainType ruleChainType, int limit);

dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java

@@ -34,10 +34,7 @@ import org.thingsboard.server.dao.relation.RelationDao;
 import org.thingsboard.server.dao.sql.JpaAbstractDaoListeningExecutorService;
 import org.thingsboard.server.dao.util.SqlDao;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -205,6 +202,15 @@ public class JpaRelationDao extends JpaAbstractDaoListeningExecutorService imple
         }
     }
 
+    @Override
+    public void deleteOutboundRelations(TenantId tenantId, EntityId entity, RelationTypeGroup relationTypeGroup) {
+        try {
+            relationRepository.deleteByFromIdAndFromTypeAndRelationTypeGroupIn(entity.getId(), entity.getEntityType().name(), Collections.singletonList(relationTypeGroup.name()));
+        } catch (ConcurrencyFailureException e) {
+            log.debug("Concurrency exception while deleting relations [{}]", entity, e);
+        }
+    }
+
     @Override
     public void deleteInboundRelations(TenantId tenantId, EntityId entity) {
         try {
@@ -214,6 +220,15 @@ public class JpaRelationDao extends JpaAbstractDaoListeningExecutorService imple
         }
     }
 
+    @Override
+    public void deleteInboundRelations(TenantId tenantId, EntityId entity, RelationTypeGroup relationTypeGroup) {
+        try {
+            relationRepository.deleteByToIdAndToTypeAndRelationTypeGroupIn(entity.getId(), entity.getEntityType().name(), Collections.singletonList(relationTypeGroup.name()));
+        } catch (ConcurrencyFailureException e) {
+            log.debug("Concurrency exception while deleting relations [{}]", entity, e);
+        }
+    }
+
     @Override
     public ListenableFuture<Boolean> deleteOutboundRelationsAsync(TenantId tenantId, EntityId entity) {
         return service.submit(

dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java

@@ -82,4 +82,9 @@ public interface RelationRepository
     @Query("DELETE FROM RelationEntity r where r.toId = :toId and r.toType = :toType and r.relationTypeGroup in :relationTypeGroups")
     void deleteByToIdAndToTypeAndRelationTypeGroupIn(@Param("toId") UUID toId, @Param("toType") String toType, @Param("relationTypeGroups") List<String> relationTypeGroups);
 
+    @Transactional
+    @Modifying
+    @Query("DELETE FROM RelationEntity r where r.fromId = :fromId and r.fromType = :fromType and r.relationTypeGroup in :relationTypeGroups")
+    void deleteByFromIdAndFromTypeAndRelationTypeGroupIn(@Param("fromId") UUID fromId, @Param("fromType") String fromType, @Param("relationTypeGroups") List<String> relationTypeGroups);
+
 }

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

@@ -138,14 +138,21 @@ public abstract class BaseRelationServiceTest extends AbstractServiceTest {
 
         EntityRelation relationA = new EntityRelation(parentId, childId, EntityRelation.CONTAINS_TYPE);
         EntityRelation relationB = new EntityRelation(childId, subChildId, EntityRelation.CONTAINS_TYPE);
+        EntityRelation relationC = new EntityRelation(parentId, childId, EntityRelation.MANAGES_TYPE, RelationTypeGroup.EDGE);
+        EntityRelation relationD = new EntityRelation(childId, subChildId, EntityRelation.MANAGES_TYPE, RelationTypeGroup.EDGE);
 
         saveRelation(relationA);
         saveRelation(relationB);
+        saveRelation(relationC);
+        saveRelation(relationD);
 
         relationService.deleteEntityCommonRelations(SYSTEM_TENANT_ID, childId);
 
         Assert.assertFalse(relationService.checkRelation(SYSTEM_TENANT_ID, parentId, childId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON));
         Assert.assertFalse(relationService.checkRelation(SYSTEM_TENANT_ID, childId, subChildId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON));
+
+        Assert.assertTrue(relationService.checkRelation(SYSTEM_TENANT_ID, parentId, childId, EntityRelation.MANAGES_TYPE, RelationTypeGroup.EDGE));
+        Assert.assertTrue(relationService.checkRelation(SYSTEM_TENANT_ID, childId, subChildId, EntityRelation.MANAGES_TYPE, RelationTypeGroup.EDGE));
     }
 
     @Test