From 9dbe3d4d6b8effbc2c031ed29692509c09f9be04 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Tue, 14 Apr 2020 12:53:22 +0300 Subject: [PATCH] Fixed fetch or SYSTEM rule chains --- .../shared/rulechain/TenantRuleChainManager.java | 3 ++- .../server/controller/RuleChainController.java | 2 +- .../server/dao/rule/RuleChainService.java | 2 -- .../dao/service/BaseRuleChainServiceTest.java | 13 +++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/TenantRuleChainManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/TenantRuleChainManager.java index cfe862af49..95307d1065 100644 --- a/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/TenantRuleChainManager.java +++ b/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/TenantRuleChainManager.java @@ -21,6 +21,7 @@ import org.thingsboard.server.actors.service.DefaultActorService; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.PageDataIterable.FetchFunction; import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.common.data.rule.RuleChainType; public class TenantRuleChainManager extends RuleChainManager { @@ -48,6 +49,6 @@ public class TenantRuleChainManager extends RuleChainManager { @Override protected FetchFunction getFetchEntitiesFunction() { - return link -> service.findTenantRuleChains(tenantId, link); + return link -> service.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, link); } } diff --git a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java index 513c4f9d4a..a2d95abf15 100644 --- a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java +++ b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java @@ -243,7 +243,7 @@ public class RuleChainController extends BaseController { RuleChainType type = RuleChainType.valueOf(typeStr); return checkNotNull(ruleChainService.findTenantRuleChainsByType(tenantId, type, pageLink)); } else { - return checkNotNull(ruleChainService.findTenantRuleChains(tenantId, pageLink)); + return checkNotNull(ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, pageLink)); } } catch (Exception e) { throw handleException(e); diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java index 3e7b466703..8cb77d541b 100644 --- a/common/dao-api/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java +++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java @@ -61,8 +61,6 @@ public interface RuleChainService { List getRuleNodeRelations(TenantId tenantId, RuleNodeId ruleNodeId); - TextPageData findTenantRuleChains(TenantId tenantId, TextPageLink pageLink); - TextPageData findTenantRuleChainsByType(TenantId tenantId, RuleChainType type, TextPageLink pageLink); void deleteRuleChainById(TenantId tenantId, RuleChainId ruleChainId); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRuleChainServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseRuleChainServiceTest.java index e6c6eaa699..1c5c9658a6 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRuleChainServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseRuleChainServiceTest.java @@ -29,6 +29,7 @@ import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.rule.RuleChainMetaData; +import org.thingsboard.server.common.data.rule.RuleChainType; import org.thingsboard.server.common.data.rule.RuleNode; import org.thingsboard.server.dao.exception.DataValidationException; @@ -143,7 +144,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { TextPageLink pageLink = new TextPageLink(16); TextPageData pageData = null; do { - pageData = ruleChainService.findTenantRuleChains(tenantId, pageLink); + pageData = ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, pageLink); loadedRuleChains.addAll(pageData.getData()); if (pageData.hasNext()) { pageLink = pageData.getNextPageLink(); @@ -158,7 +159,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { ruleChainService.deleteRuleChainsByTenantId(tenantId); pageLink = new TextPageLink(31); - pageData = ruleChainService.findTenantRuleChains(tenantId, pageLink); + pageData = ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); @@ -194,7 +195,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { TextPageLink pageLink = new TextPageLink(19, name1); TextPageData pageData = null; do { - pageData = ruleChainService.findTenantRuleChains(tenantId, pageLink); + pageData = ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, pageLink); loadedRuleChainsName1.addAll(pageData.getData()); if (pageData.hasNext()) { pageLink = pageData.getNextPageLink(); @@ -209,7 +210,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { List loadedRuleChainsName2 = new ArrayList<>(); pageLink = new TextPageLink(4, name2); do { - pageData = ruleChainService.findTenantRuleChains(tenantId, pageLink); + pageData = ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, pageLink); loadedRuleChainsName2.addAll(pageData.getData()); if (pageData.hasNext()) { pageLink = pageData.getNextPageLink(); @@ -226,7 +227,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { } pageLink = new TextPageLink(4, name1); - pageData = ruleChainService.findTenantRuleChains(tenantId, pageLink); + pageData = ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertEquals(0, pageData.getData().size()); @@ -235,7 +236,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { } pageLink = new TextPageLink(4, name2); - pageData = ruleChainService.findTenantRuleChains(tenantId, pageLink); + pageData = ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertEquals(0, pageData.getData().size()); }