Commit 3da17789aa0ae1d29e641b33ff2e821815fafc31

Authored by Volodymyr Babak
1 parent 539a1f20

Test fixed. Increased limit for assigned edges

... ... @@ -223,10 +223,10 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
223 223 conn.createStatement().execute("ALTER TABLE entity_view ADD edge_id varchar(31)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
224 224 } catch (Exception e) {}
225 225 try {
226   - conn.createStatement().execute("ALTER TABLE dashboard ADD assigned_edges varchar(1000000)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
  226 + conn.createStatement().execute("ALTER TABLE dashboard ADD assigned_edges varchar(10000000)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
227 227 } catch (Exception e) {}
228 228 try {
229   - conn.createStatement().execute("ALTER TABLE rule_chain ADD assigned_edges varchar(1000000)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
  229 + conn.createStatement().execute("ALTER TABLE rule_chain ADD assigned_edges varchar(10000000)"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
230 230 } catch (Exception e) {}
231 231 try {
232 232 conn.createStatement().execute("ALTER TABLE rule_chain ADD type varchar(255) DEFAULT 'SYSTEM'"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
... ...
... ... @@ -353,14 +353,6 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
353 353 }
354 354
355 355 @Override
356   - public TextPageData<RuleChain> findTenantRuleChains(TenantId tenantId, TextPageLink pageLink) {
357   - Validator.validateId(tenantId, "Incorrect tenant id for search rule chain request.");
358   - Validator.validatePageLink(pageLink, "Incorrect PageLink object for search rule chain request.");
359   - List<RuleChain> ruleChains = ruleChainDao.findRuleChainsByTenantId(tenantId.getId(), pageLink);
360   - return new TextPageData<>(ruleChains, pageLink);
361   - }
362   -
363   - @Override
364 356 public TextPageData<RuleChain> findTenantRuleChainsByType(TenantId tenantId, RuleChainType type, TextPageLink pageLink) {
365 357 Validator.validateId(tenantId, "Incorrect tenant id for search rule chain request.");
366 358 Validator.validatePageLink(pageLink, "Incorrect PageLink object for search rule chain request.");
... ... @@ -555,7 +547,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
555 547 throw new DataValidationException("Rule chain name should be specified!");
556 548 }
557 549 if (ruleChain.getType() == null) {
558   - throw new DataValidationException("Rule chain type should be specified!");
  550 + ruleChain.setType(RuleChainType.SYSTEM);
559 551 }
560 552 if (ruleChain.getTenantId() == null || ruleChain.getTenantId().isNullUid()) {
561 553 throw new DataValidationException("Rule chain should be assigned to tenant!");
... ...
... ... @@ -42,6 +42,7 @@ CREATE TABLE IF NOT EXISTS asset (
42 42 id varchar(31) NOT NULL CONSTRAINT asset_pkey PRIMARY KEY,
43 43 additional_info varchar,
44 44 customer_id varchar(31),
  45 + edge_id varchar(31),
45 46 name varchar(255),
46 47 label varchar(255),
47 48 search_text varchar(255),
... ... @@ -110,6 +111,7 @@ CREATE TABLE IF NOT EXISTS dashboard (
110 111 id varchar(31) NOT NULL CONSTRAINT dashboard_pkey PRIMARY KEY,
111 112 configuration varchar(10000000),
112 113 assigned_customers varchar(1000000),
  114 + assigned_edges varchar(10000000),
113 115 search_text varchar(255),
114 116 tenant_id varchar(31),
115 117 title varchar(255)
... ... @@ -119,6 +121,7 @@ CREATE TABLE IF NOT EXISTS device (
119 121 id varchar(31) NOT NULL CONSTRAINT device_pkey PRIMARY KEY,
120 122 additional_info varchar,
121 123 customer_id varchar(31),
  124 + edge_id varchar(31),
122 125 type varchar(255),
123 126 name varchar(255),
124 127 label varchar(255),
... ... @@ -217,11 +220,13 @@ CREATE TABLE IF NOT EXISTS rule_chain (
217 220 additional_info varchar,
218 221 configuration varchar(10000000),
219 222 name varchar(255),
  223 + type varchar(255),
220 224 first_rule_node_id varchar(31),
221 225 root boolean,
222 226 debug_mode boolean,
223 227 search_text varchar(255),
224   - tenant_id varchar(31)
  228 + tenant_id varchar(31),
  229 + assigned_edges varchar(10000000)
225 230 );
226 231
227 232 CREATE TABLE IF NOT EXISTS rule_node (
... ... @@ -241,6 +246,7 @@ CREATE TABLE IF NOT EXISTS entity_view (
241 246 entity_type varchar(255),
242 247 tenant_id varchar(31),
243 248 customer_id varchar(31),
  249 + edge_id varchar(31),
244 250 type varchar(255),
245 251 name varchar(255),
246 252 keys varchar(10000000),
... ... @@ -249,3 +255,18 @@ CREATE TABLE IF NOT EXISTS entity_view (
249 255 search_text varchar(255),
250 256 additional_info varchar
251 257 );
  258 +
  259 +CREATE TABLE IF NOT EXISTS edge (
  260 + id varchar(31) NOT NULL CONSTRAINT edge_pkey PRIMARY KEY,
  261 + additional_info varchar,
  262 + customer_id varchar(31),
  263 + root_rule_chain_id varchar(31),
  264 + configuration varchar(10000000),
  265 + type varchar(255),
  266 + name varchar(255),
  267 + label varchar(255),
  268 + routing_key varchar(255),
  269 + secret varchar(255),
  270 + search_text varchar(255),
  271 + tenant_id varchar(31)
  272 +);
\ No newline at end of file
... ...
... ... @@ -111,7 +111,7 @@ CREATE TABLE IF NOT EXISTS dashboard (
111 111 id varchar(31) NOT NULL CONSTRAINT dashboard_pkey PRIMARY KEY,
112 112 configuration varchar(10000000),
113 113 assigned_customers varchar(1000000),
114   - assigned_edges varchar(1000000),
  114 + assigned_edges varchar(10000000),
115 115 search_text varchar(255),
116 116 tenant_id varchar(31),
117 117 title varchar(255)
... ... @@ -226,7 +226,7 @@ CREATE TABLE IF NOT EXISTS rule_chain (
226 226 debug_mode boolean,
227 227 search_text varchar(255),
228 228 tenant_id varchar(31),
229   - assigned_edges varchar(1000000)
  229 + assigned_edges varchar(10000000)
230 230 );
231 231
232 232 CREATE TABLE IF NOT EXISTS rule_node (
... ...
... ... @@ -125,7 +125,7 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest {
125 125 dashboard.setTenantId(tenantId);
126 126 dashboard = dashboardService.saveDashboard(dashboard);
127 127 Tenant tenant = new Tenant();
128   - tenant.setTitle("Test different tenant");
  128 + tenant.setTitle("Test different tenant [dashboard]");
129 129 tenant = tenantService.saveTenant(tenant);
130 130 Customer customer = new Customer();
131 131 customer.setTenantId(tenant.getId());
... ... @@ -350,11 +350,12 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest {
350 350 dashboard.setTenantId(tenantId);
351 351 dashboard = dashboardService.saveDashboard(dashboard);
352 352 Tenant tenant = new Tenant();
353   - tenant.setTitle("Test different tenant");
  353 + tenant.setTitle("Test different tenant [edge]");
354 354 tenant = tenantService.saveTenant(tenant);
355 355 Edge edge = new Edge();
356 356 edge.setTenantId(tenant.getId());
357 357 edge.setName("Test different edge");
  358 + edge.setType("default");
358 359 edge = edgeService.saveEdge(edge);
359 360 try {
360 361 dashboardService.assignDashboardToEdge(tenantId, dashboard.getId(), edge.getId());
... ...