Upgrade script implementation

application/src/main/data/upgrade/3.1.1/schema_update_before.sql

@@ -15,30 +15,32 @@
 --
 
 CREATE TABLE IF NOT EXISTS device_profile (
-  id uuid NOT NULL CONSTRAINT device_profile_pkey PRIMARY KEY,
-  created_time bigint NOT NULL,
-  name varchar(255),
-  type varchar(255),
-  profile_data varchar,
-  description varchar,
-  search_text varchar(255),
-  is_default boolean,
-  tenant_id uuid,
-  default_rule_chain_id uuid,
-  CONSTRAINT device_profile_name_unq_key UNIQUE (tenant_id, name)
+    id uuid NOT NULL CONSTRAINT device_profile_pkey PRIMARY KEY,
+    created_time bigint NOT NULL,
+    name varchar(255),
+    type varchar(255),
+    transport_type varchar(255),
+    profile_data jsonb,
+    description varchar,
+    search_text varchar(255),
+    is_default boolean,
+    tenant_id uuid,
+    default_rule_chain_id uuid,
+    CONSTRAINT device_profile_name_unq_key UNIQUE (tenant_id, name),
+    CONSTRAINT fk_default_rule_chain_device_profile FOREIGN KEY (default_rule_chain_id) REFERENCES rule_chain(id)
 );
 
 CREATE TABLE IF NOT EXISTS tenant_profile (
-  id uuid NOT NULL CONSTRAINT tenant_profile_pkey PRIMARY KEY,
-  created_time bigint NOT NULL,
-  name varchar(255),
-  profile_data varchar,
-  description varchar,
-  search_text varchar(255),
-  is_default boolean,
-  isolated_tb_core boolean,
-  isolated_tb_rule_engine boolean,
-  CONSTRAINT tenant_profile_name_unq_key UNIQUE (name)
+    id uuid NOT NULL CONSTRAINT tenant_profile_pkey PRIMARY KEY,
+    created_time bigint NOT NULL,
+    name varchar(255),
+    profile_data jsonb,
+    description varchar,
+    search_text varchar(255),
+    is_default boolean,
+    isolated_tb_core boolean,
+    isolated_tb_rule_engine boolean,
+    CONSTRAINT tenant_profile_name_unq_key UNIQUE (name)
 );
 
 CREATE OR REPLACE PROCEDURE update_tenant_profiles()
@@ -71,9 +73,9 @@ CREATE OR REPLACE PROCEDURE update_device_profiles()
     LANGUAGE plpgsql AS
 $$
 BEGIN
-    UPDATE device as d SET device_profile_id = p.id, device_data = '{"configuration":{"type":"DEFAULT"}}'
+    UPDATE device as d SET device_profile_id = p.id, device_data = '{"configuration":{"type":"DEFAULT"}, "transportConfiguration":{"type":"DEFAULT"}}'
         FROM
-           (SELECT id, tenant_id from device_profile WHERE is_default = true) as p
-                WHERE d.device_profile_id IS NULL AND p.tenant_id = d.tenant_id;
+           (SELECT id, tenant_id, name from device_profile) as p
+                WHERE d.device_profile_id IS NULL AND p.tenant_id = d.tenant_id AND d.type = p.name;
 END;
 $$;

application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java

@@ -20,11 +20,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.dashboard.DashboardService;
 import org.thingsboard.server.dao.device.DeviceProfileService;
+import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.service.install.sql.SqlDbHelper;
 
@@ -39,6 +41,7 @@ import java.sql.SQLException;
 import java.sql.SQLSyntaxErrorException;
 import java.sql.SQLWarning;
 import java.sql.Statement;
+import java.util.List;
 
 import static org.thingsboard.server.service.install.DatabaseHelper.ADDITIONAL_INFO;
 import static org.thingsboard.server.service.install.DatabaseHelper.ASSIGNED_CUSTOMERS;
@@ -87,6 +90,9 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
     @Autowired
     private TenantService tenantService;
 
+    @Autowired
+    private DeviceService deviceService;
+
     @Autowired
     private DeviceProfileService deviceProfileService;
 
@@ -348,7 +354,14 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                         do {
                             pageData = tenantService.findTenants(pageLink);
                             for (Tenant tenant : pageData.getData()) {
+                                List<EntitySubtype> deviceTypes = deviceService.findDeviceTypesByTenantId(tenant.getId()).get();
                                 deviceProfileService.findOrCreateDefaultDeviceProfile(tenant.getId());
+                                for (EntitySubtype deviceType : deviceTypes) {
+                                    try {
+                                        deviceProfileService.createDeviceProfile(tenant.getId(), deviceType.getType());
+                                    } catch (Exception e) {
+                                    }
+                                }
                             }
                             pageLink = pageLink.nextPageLink();
                         } while (pageData.hasNext());

application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java

@@ -326,7 +326,7 @@ public abstract class AbstractWebTest {
         deviceProfileData.setTransportConfiguration(transportConfiguration);
         deviceProfile.setProfileData(deviceProfileData);
         deviceProfile.setDefault(false);
-        deviceProfile.setDefaultRuleChainId(new RuleChainId(Uuids.timeBased()));
+        deviceProfile.setDefaultRuleChainId(null);
         return deviceProfile;
     }
 

application/src/test/java/org/thingsboard/server/controller/ControllerSqlTestSuite.java

@@ -28,7 +28,8 @@ import java.util.Arrays;
 @ClasspathSuite.ClassnameFilters({
 //        "org.thingsboard.server.controller.sql.WebsocketApiSqlTest",
 //        "org.thingsboard.server.controller.sql.EntityQueryControllerSqlTest",
-        "org.thingsboard.server.controller.sql.*Test",
+        "org.thingsboard.server.controller.sql.DeviceProfileControllerSqlTest",
+//        "org.thingsboard.server.controller.sql.*Test",
         })
 public class ControllerSqlTestSuite {
 

common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceProfileService.java

@@ -41,6 +41,8 @@ public interface DeviceProfileService {
 
     DeviceProfile createDefaultDeviceProfile(TenantId tenantId);
 
+    DeviceProfile createDeviceProfile(TenantId tenantId, String profileName);
+
     DeviceProfile findDefaultDeviceProfile(TenantId tenantId);
 
     DeviceProfileInfo findDefaultDeviceProfileInfo(TenantId tenantId);

dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java

@@ -165,11 +165,21 @@ public class DeviceProfileServiceImpl extends AbstractEntityService implements D
     @Override
     public DeviceProfile createDefaultDeviceProfile(TenantId tenantId) {
         log.trace("Executing createDefaultDeviceProfile tenantId [{}]", tenantId);
+        return doCreateDefaultDeviceProfile(tenantId, "Default", true);
+    }
+
+    @Override
+    public DeviceProfile createDeviceProfile(TenantId tenantId, String profileName) {
+        log.trace("Executing createDefaultDeviceProfile tenantId [{}], profileName [{}]", tenantId, profileName);
+        return doCreateDefaultDeviceProfile(tenantId, profileName, false);
+    }
+
+    private DeviceProfile doCreateDefaultDeviceProfile(TenantId tenantId, String profileName, boolean defaultProfile) {
         validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
         DeviceProfile deviceProfile = new DeviceProfile();
         deviceProfile.setTenantId(tenantId);
-        deviceProfile.setDefault(true);
-        deviceProfile.setName("Default");
+        deviceProfile.setDefault(defaultProfile);
+        deviceProfile.setName(profileName);
         deviceProfile.setType(DeviceProfileType.DEFAULT);
         deviceProfile.setTransportType(DeviceTransportType.DEFAULT);
         deviceProfile.setDescription("Default device profile");

dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java

@@ -18,6 +18,7 @@ package org.thingsboard.server.dao.rule;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.BaseData;
@@ -358,12 +359,21 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     }
 
     private void checkRuleNodesAndDelete(TenantId tenantId, RuleChainId ruleChainId) {
+        try{
+            ruleChainDao.removeById(tenantId, ruleChainId.getId());
+        } catch (Exception t) {
+            ConstraintViolationException e = extractConstraintViolationException(t).orElse(null);
+            if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("fk_default_rule_chain_device_profile")) {
+                throw new DataValidationException("The rule chain referenced by the device profiles cannot be deleted!");
+            } else {
+                throw t;
+            }
+        }
         List<EntityRelation> nodeRelations = getRuleChainToNodeRelations(tenantId, ruleChainId);
         for (EntityRelation relation : nodeRelations) {
             deleteRuleNode(tenantId, relation.getTo());
         }
         deleteEntityRelations(tenantId, ruleChainId);
-        ruleChainDao.removeById(tenantId, ruleChainId.getId());
     }
 
     private List<EntityRelation> getRuleChainToNodeRelations(TenantId tenantId, RuleChainId ruleChainId) {

dao/src/main/resources/sql/schema-entities-hsql.sql

@@ -121,6 +121,30 @@ CREATE TABLE IF NOT EXISTS dashboard (
     title varchar(255)
 );
 
+CREATE TABLE IF NOT EXISTS rule_chain (
+    id uuid NOT NULL CONSTRAINT rule_chain_pkey PRIMARY KEY,
+    created_time bigint NOT NULL,
+    additional_info varchar,
+    configuration varchar(10000000),
+    name varchar(255),
+    first_rule_node_id uuid,
+    root boolean,
+    debug_mode boolean,
+    search_text varchar(255),
+    tenant_id uuid
+);
+
+CREATE TABLE IF NOT EXISTS rule_node (
+    id uuid NOT NULL CONSTRAINT rule_node_pkey PRIMARY KEY,
+    created_time bigint NOT NULL,
+    rule_chain_id uuid,
+    additional_info varchar,
+    configuration varchar(10000000),
+    type varchar(255),
+    name varchar(255),
+    debug_mode boolean,
+    search_text varchar(255)
+);
 
 CREATE TABLE IF NOT EXISTS device_profile (
     id uuid NOT NULL CONSTRAINT device_profile_pkey PRIMARY KEY,
@@ -134,7 +158,8 @@ CREATE TABLE IF NOT EXISTS device_profile (
     is_default boolean,
     tenant_id uuid,
     default_rule_chain_id uuid,
-    CONSTRAINT device_profile_name_unq_key UNIQUE (tenant_id, name)
+    CONSTRAINT device_profile_name_unq_key UNIQUE (tenant_id, name),
+    CONSTRAINT fk_default_rule_chain_device_profile FOREIGN KEY (default_rule_chain_id) REFERENCES rule_chain(id)
 );
 
 CREATE TABLE IF NOT EXISTS device (
@@ -262,31 +287,6 @@ CREATE TABLE IF NOT EXISTS widgets_bundle (
     title varchar(255)
 );
 
-CREATE TABLE IF NOT EXISTS rule_chain (
-    id uuid NOT NULL CONSTRAINT rule_chain_pkey PRIMARY KEY,
-    created_time bigint NOT NULL,
-    additional_info varchar,
-    configuration varchar(10000000),
-    name varchar(255),
-    first_rule_node_id uuid,
-    root boolean,
-    debug_mode boolean,
-    search_text varchar(255),
-    tenant_id uuid
-);
-
-CREATE TABLE IF NOT EXISTS rule_node (
-    id uuid NOT NULL CONSTRAINT rule_node_pkey PRIMARY KEY,
-    created_time bigint NOT NULL,
-    rule_chain_id uuid,
-    additional_info varchar,
-    configuration varchar(10000000),
-    type varchar(255),
-    name varchar(255),
-    debug_mode boolean,
-    search_text varchar(255)
-);
-
 CREATE TABLE IF NOT EXISTS entity_view (
     id uuid NOT NULL CONSTRAINT entity_view_pkey PRIMARY KEY,
     created_time bigint NOT NULL,

dao/src/main/resources/sql/schema-entities.sql

@@ -139,6 +139,31 @@ CREATE TABLE IF NOT EXISTS dashboard (
     title varchar(255)
 );
 
+CREATE TABLE IF NOT EXISTS rule_chain (
+    id uuid NOT NULL CONSTRAINT rule_chain_pkey PRIMARY KEY,
+    created_time bigint NOT NULL,
+    additional_info varchar,
+    configuration varchar(10000000),
+    name varchar(255),
+    first_rule_node_id uuid,
+    root boolean,
+    debug_mode boolean,
+    search_text varchar(255),
+    tenant_id uuid
+);
+
+CREATE TABLE IF NOT EXISTS rule_node (
+    id uuid NOT NULL CONSTRAINT rule_node_pkey PRIMARY KEY,
+    created_time bigint NOT NULL,
+    rule_chain_id uuid,
+    additional_info varchar,
+    configuration varchar(10000000),
+    type varchar(255),
+    name varchar(255),
+    debug_mode boolean,
+    search_text varchar(255)
+);
+
 CREATE TABLE IF NOT EXISTS device_profile (
     id uuid NOT NULL CONSTRAINT device_profile_pkey PRIMARY KEY,
     created_time bigint NOT NULL,
@@ -151,7 +176,8 @@ CREATE TABLE IF NOT EXISTS device_profile (
     is_default boolean,
     tenant_id uuid,
     default_rule_chain_id uuid,
-    CONSTRAINT device_profile_name_unq_key UNIQUE (tenant_id, name)
+    CONSTRAINT device_profile_name_unq_key UNIQUE (tenant_id, name),
+    CONSTRAINT fk_default_rule_chain_device_profile FOREIGN KEY (default_rule_chain_id) REFERENCES rule_chain(id)
 );
 
 CREATE TABLE IF NOT EXISTS device (
@@ -286,31 +312,6 @@ CREATE TABLE IF NOT EXISTS widgets_bundle (
     title varchar(255)
 );
 
-CREATE TABLE IF NOT EXISTS rule_chain (
-    id uuid NOT NULL CONSTRAINT rule_chain_pkey PRIMARY KEY,
-    created_time bigint NOT NULL,
-    additional_info varchar,
-    configuration varchar(10000000),
-    name varchar(255),
-    first_rule_node_id uuid,
-    root boolean,
-    debug_mode boolean,
-    search_text varchar(255),
-    tenant_id uuid
-);
-
-CREATE TABLE IF NOT EXISTS rule_node (
-    id uuid NOT NULL CONSTRAINT rule_node_pkey PRIMARY KEY,
-    created_time bigint NOT NULL,
-    rule_chain_id uuid,
-    additional_info varchar,
-    configuration varchar(10000000),
-    type varchar(255),
-    name varchar(255),
-    debug_mode boolean,
-    search_text varchar(255)
-);
-
 CREATE TABLE IF NOT EXISTS entity_view (
     id uuid NOT NULL CONSTRAINT entity_view_pkey PRIMARY KEY,
     created_time bigint NOT NULL,

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

@@ -41,6 +41,7 @@ import org.thingsboard.server.common.data.id.HasId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UUIDBased;
+import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.dao.audit.AuditLogLevelFilter;
@@ -208,7 +209,7 @@ public abstract class AbstractServiceTest {
         deviceProfileData.setTransportConfiguration(transportConfiguration);
         deviceProfile.setProfileData(deviceProfileData);
         deviceProfile.setDefault(false);
-        deviceProfile.setDefaultRuleChainId(new RuleChainId(Uuids.timeBased()));
+        deviceProfile.setDefaultRuleChainId(null);
         return deviceProfile;
     }
 

dao/src/test/resources/sql/hsql/drop-all-tables.sql

@@ -18,9 +18,9 @@ DROP TABLE IF EXISTS ts_kv_latest;
 DROP TABLE IF EXISTS user_credentials;
 DROP TABLE IF EXISTS widget_type;
 DROP TABLE IF EXISTS widgets_bundle;
-DROP TABLE IF EXISTS rule_node;
-DROP TABLE IF EXISTS rule_chain;
 DROP TABLE IF EXISTS entity_view;
 DROP TABLE IF EXISTS device_profile;
 DROP TABLE IF EXISTS tenant_profile;
+DROP TABLE IF EXISTS rule_node;
+DROP TABLE IF EXISTS rule_chain;
 DROP FUNCTION IF EXISTS to_uuid;

dao/src/test/resources/sql/psql/drop-all-tables.sql

@@ -18,9 +18,9 @@ DROP TABLE IF EXISTS ts_kv_dictionary;
 DROP TABLE IF EXISTS user_credentials;
 DROP TABLE IF EXISTS widget_type;
 DROP TABLE IF EXISTS widgets_bundle;
-DROP TABLE IF EXISTS rule_node;
-DROP TABLE IF EXISTS rule_chain;
 DROP TABLE IF EXISTS entity_view;
 DROP TABLE IF EXISTS device_profile;
 DROP TABLE IF EXISTS tenant_profile;
+DROP TABLE IF EXISTS rule_node;
+DROP TABLE IF EXISTS rule_chain;
 DROP TABLE IF EXISTS tb_schema_settings;