From 3da17789aa0ae1d29e641b33ff2e821815fafc31 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Mon, 20 Apr 2020 15:45:04 +0300 Subject: [PATCH] Test fixed. Increased limit for assigned edges --- .../install/SqlDatabaseUpgradeService.java | 4 ++-- .../server/dao/rule/BaseRuleChainService.java | 10 +------- .../resources/sql/schema-entities-hsql.sql | 23 ++++++++++++++++++- .../main/resources/sql/schema-entities.sql | 4 ++-- .../dao/service/BaseDashboardServiceTest.java | 5 ++-- 5 files changed, 30 insertions(+), 16 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java index 66440d0889..53156c9f5f 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java @@ -223,10 +223,10 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService conn.createStatement().execute("ALTER TABLE entity_view ADD edge_id varchar(31)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script } catch (Exception e) {} try { - conn.createStatement().execute("ALTER TABLE dashboard ADD assigned_edges varchar(1000000)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script + conn.createStatement().execute("ALTER TABLE dashboard ADD assigned_edges varchar(10000000)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script } catch (Exception e) {} try { - conn.createStatement().execute("ALTER TABLE rule_chain ADD assigned_edges varchar(1000000)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script + conn.createStatement().execute("ALTER TABLE rule_chain ADD assigned_edges varchar(10000000)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script } catch (Exception e) {} try { conn.createStatement().execute("ALTER TABLE rule_chain ADD type varchar(255) DEFAULT 'SYSTEM'"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java index 195ec8c4eb..f35553cc7c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java @@ -352,14 +352,6 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC return validRelations; } - @Override - public TextPageData findTenantRuleChains(TenantId tenantId, TextPageLink pageLink) { - Validator.validateId(tenantId, "Incorrect tenant id for search rule chain request."); - Validator.validatePageLink(pageLink, "Incorrect PageLink object for search rule chain request."); - List ruleChains = ruleChainDao.findRuleChainsByTenantId(tenantId.getId(), pageLink); - return new TextPageData<>(ruleChains, pageLink); - } - @Override public TextPageData findTenantRuleChainsByType(TenantId tenantId, RuleChainType type, TextPageLink pageLink) { Validator.validateId(tenantId, "Incorrect tenant id for search rule chain request."); @@ -555,7 +547,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC throw new DataValidationException("Rule chain name should be specified!"); } if (ruleChain.getType() == null) { - throw new DataValidationException("Rule chain type should be specified!"); + ruleChain.setType(RuleChainType.SYSTEM); } if (ruleChain.getTenantId() == null || ruleChain.getTenantId().isNullUid()) { throw new DataValidationException("Rule chain should be assigned to tenant!"); diff --git a/dao/src/main/resources/sql/schema-entities-hsql.sql b/dao/src/main/resources/sql/schema-entities-hsql.sql index 758aaafb10..23955242b0 100644 --- a/dao/src/main/resources/sql/schema-entities-hsql.sql +++ b/dao/src/main/resources/sql/schema-entities-hsql.sql @@ -42,6 +42,7 @@ CREATE TABLE IF NOT EXISTS asset ( id varchar(31) NOT NULL CONSTRAINT asset_pkey PRIMARY KEY, additional_info varchar, customer_id varchar(31), + edge_id varchar(31), name varchar(255), label varchar(255), search_text varchar(255), @@ -110,6 +111,7 @@ CREATE TABLE IF NOT EXISTS dashboard ( id varchar(31) NOT NULL CONSTRAINT dashboard_pkey PRIMARY KEY, configuration varchar(10000000), assigned_customers varchar(1000000), + assigned_edges varchar(10000000), search_text varchar(255), tenant_id varchar(31), title varchar(255) @@ -119,6 +121,7 @@ CREATE TABLE IF NOT EXISTS device ( id varchar(31) NOT NULL CONSTRAINT device_pkey PRIMARY KEY, additional_info varchar, customer_id varchar(31), + edge_id varchar(31), type varchar(255), name varchar(255), label varchar(255), @@ -217,11 +220,13 @@ CREATE TABLE IF NOT EXISTS rule_chain ( additional_info varchar, configuration varchar(10000000), name varchar(255), + type varchar(255), first_rule_node_id varchar(31), root boolean, debug_mode boolean, search_text varchar(255), - tenant_id varchar(31) + tenant_id varchar(31), + assigned_edges varchar(10000000) ); CREATE TABLE IF NOT EXISTS rule_node ( @@ -241,6 +246,7 @@ CREATE TABLE IF NOT EXISTS entity_view ( entity_type varchar(255), tenant_id varchar(31), customer_id varchar(31), + edge_id varchar(31), type varchar(255), name varchar(255), keys varchar(10000000), @@ -249,3 +255,18 @@ CREATE TABLE IF NOT EXISTS entity_view ( search_text varchar(255), additional_info varchar ); + +CREATE TABLE IF NOT EXISTS edge ( + id varchar(31) NOT NULL CONSTRAINT edge_pkey PRIMARY KEY, + additional_info varchar, + customer_id varchar(31), + root_rule_chain_id varchar(31), + configuration varchar(10000000), + type varchar(255), + name varchar(255), + label varchar(255), + routing_key varchar(255), + secret varchar(255), + search_text varchar(255), + tenant_id varchar(31) +); \ No newline at end of file diff --git a/dao/src/main/resources/sql/schema-entities.sql b/dao/src/main/resources/sql/schema-entities.sql index 07814e8963..01d6511b9c 100644 --- a/dao/src/main/resources/sql/schema-entities.sql +++ b/dao/src/main/resources/sql/schema-entities.sql @@ -111,7 +111,7 @@ CREATE TABLE IF NOT EXISTS dashboard ( id varchar(31) NOT NULL CONSTRAINT dashboard_pkey PRIMARY KEY, configuration varchar(10000000), assigned_customers varchar(1000000), - assigned_edges varchar(1000000), + assigned_edges varchar(10000000), search_text varchar(255), tenant_id varchar(31), title varchar(255) @@ -226,7 +226,7 @@ CREATE TABLE IF NOT EXISTS rule_chain ( debug_mode boolean, search_text varchar(255), tenant_id varchar(31), - assigned_edges varchar(1000000) + assigned_edges varchar(10000000) ); CREATE TABLE IF NOT EXISTS rule_node ( diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java index 3a38c80e53..d1e022139e 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java @@ -125,7 +125,7 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest { dashboard.setTenantId(tenantId); dashboard = dashboardService.saveDashboard(dashboard); Tenant tenant = new Tenant(); - tenant.setTitle("Test different tenant"); + tenant.setTitle("Test different tenant [dashboard]"); tenant = tenantService.saveTenant(tenant); Customer customer = new Customer(); customer.setTenantId(tenant.getId()); @@ -350,11 +350,12 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest { dashboard.setTenantId(tenantId); dashboard = dashboardService.saveDashboard(dashboard); Tenant tenant = new Tenant(); - tenant.setTitle("Test different tenant"); + tenant.setTitle("Test different tenant [edge]"); tenant = tenantService.saveTenant(tenant); Edge edge = new Edge(); edge.setTenantId(tenant.getId()); edge.setName("Test different edge"); + edge.setType("default"); edge = edgeService.saveEdge(edge); try { dashboardService.assignDashboardToEdge(tenantId, dashboard.getId(), edge.getId());