From 8c9bb7a0db8589539380cea2f934abe089d93974 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Thu, 10 Oct 2024 14:08:12 +0300
Subject: [PATCH] constraint rename, EntityType enum fix

---
 application/src/main/data/upgrade/3.8.0/schema_update.sql   | 1 +
 .../org/thingsboard/server/controller/BaseController.java   | 6 +++---
 .../java/org/thingsboard/server/common/data/EntityType.java | 2 +-
 .../server/dao/mobile/QrCodeSettingServiceImpl.java         | 2 +-
 dao/src/main/resources/sql/schema-entities.sql              | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/application/src/main/data/upgrade/3.8.0/schema_update.sql b/application/src/main/data/upgrade/3.8.0/schema_update.sql
index fd72773b09..f296937154 100644
--- a/application/src/main/data/upgrade/3.8.0/schema_update.sql
+++ b/application/src/main/data/upgrade/3.8.0/schema_update.sql
@@ -140,6 +140,7 @@ $$
                     UPDATE qr_code_settings SET mobile_app_bundle_id = (SELECT id FROM mobile_app_bundle WHERE mobile_app_bundle.ios_app_id = iosAppId) WHERE id = qrCodeRecord.id;
                 END IF;
             END LOOP;
+            ALTER TABLE qr_code_settings RENAME CONSTRAINT mobile_app_settings_tenant_id_unq_key TO qr_code_settings_tenant_id_unq_key;
         END IF;
         ALTER TABLE qr_code_settings DROP COLUMN IF EXISTS android_config, DROP COLUMN IF EXISTS ios_config;
     END;
diff --git a/application/src/main/java/org/thingsboard/server/controller/BaseController.java b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
index d2f0884ba6..5999be7428 100644
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
@@ -201,10 +201,10 @@ import static org.thingsboard.server.dao.service.Validator.validateId;
 @TbCoreComponent
 public abstract class BaseController {
 
-    public static final String DASHBOARD_ID = "dashboardId";
+    protected static final String DASHBOARD_ID = "dashboardId";
 
-    public static final String HOME_DASHBOARD_ID = "homeDashboardId";
-    public static final String HOME_DASHBOARD_HIDE_TOOLBAR = "homeDashboardHideToolbar";
+    protected static final String HOME_DASHBOARD_ID = "homeDashboardId";
+    protected static final String HOME_DASHBOARD_HIDE_TOOLBAR = "homeDashboardHideToolbar";
 
     protected final Logger log = org.slf4j.LoggerFactory.getLogger(getClass());
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
index 89b434047b..579fa863ba 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
@@ -61,7 +61,7 @@ public enum EntityType {
     OAUTH2_CLIENT(35),
     DOMAIN(36),
     MOBILE_APP(37),
-    MOBILE_APP_BUNDLE(37);
+    MOBILE_APP_BUNDLE(38);
 
     @Getter
     private final int protoNumber; // Corresponds to EntityTypeProto
diff --git a/dao/src/main/java/org/thingsboard/server/dao/mobile/QrCodeSettingServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/mobile/QrCodeSettingServiceImpl.java
index 0dc672585c..4cebb26451 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/mobile/QrCodeSettingServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/mobile/QrCodeSettingServiceImpl.java
@@ -60,7 +60,7 @@ public class QrCodeSettingServiceImpl extends AbstractCachedEntityService<Tenant
         } catch (Exception e) {
             handleEvictEvent(new QrCodeSettingsEvictEvent(tenantId));
             checkConstraintViolation(e, Map.of(
-                    "mobile_app_settings_tenant_id_unq_key", "Mobile application for specified tenant already exists!"
+                    "qr_code_settings_tenant_id_unq_key", "Mobile application for specified tenant already exists!"
             ));
             throw e;
         }
diff --git a/dao/src/main/resources/sql/schema-entities.sql b/dao/src/main/resources/sql/schema-entities.sql
index 22a9fcd7c7..972726a24c 100644
--- a/dao/src/main/resources/sql/schema-entities.sql
+++ b/dao/src/main/resources/sql/schema-entities.sql
@@ -911,5 +911,5 @@ CREATE TABLE IF NOT EXISTS qr_code_settings (
     use_default_app boolean,
     mobile_app_bundle_id uuid,
     qr_code_config VARCHAR(100000),
-    CONSTRAINT mobile_app_settings_tenant_id_unq_key UNIQUE (tenant_id)
+    CONSTRAINT qr_code_settings_tenant_id_unq_key UNIQUE (tenant_id)
 );