Refactoring for mobile settings api

application/src/main/data/upgrade/3.6.4/schema_update.sql

@@ -157,11 +157,12 @@ DELETE FROM asset_profile WHERE name ='TbServiceQueue';
 CREATE TABLE IF NOT EXISTS mobile_app_settings (
     id uuid NOT NULL CONSTRAINT mobile_app_settings_pkey PRIMARY KEY,
     created_time bigint NOT NULL,
-    tenant_id uuid UNIQUE NOT NULL,
+    tenant_id uuid NOT NULL,
     use_default_app boolean,
     android_config VARCHAR(1000),
     ios_config VARCHAR(1000),
-    qr_code_config VARCHAR(100000)
+    qr_code_config VARCHAR(100000),
+    CONSTRAINT mobile_app_settings_tenant_id_unq_key UNIQUE (tenant_id)
 );
 
 -- MOBILE APP SETTINGS TABLE CREATE END

application/src/main/java/org/thingsboard/server/controller/MobileApplicationController.java

@@ -39,7 +39,7 @@ import org.thingsboard.server.common.data.security.model.JwtPair;
 import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.mobile.MobileAppSettingsService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
-import org.thingsboard.server.service.qr.MobileAppSecretService;
+import org.thingsboard.server.service.mobile.secret.MobileAppSecretService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
@@ -84,7 +84,7 @@ public class MobileApplicationController extends BaseController {
     public static final String ANDROID_APPLICATION_STORE_LINK = "https://play.google.com/store/apps/details?id=org.thingsboard.demo.app";
     public static final String APPLE_APPLICATION_STORE_LINK = "https://apps.apple.com/us/app/thingsboard-live/id1594355695";
     public static final String SECRET = "secret";
-    public static final String SECRET_PARAM_DESCRIPTION = "A string value representing short-live secret key";
+    public static final String SECRET_PARAM_DESCRIPTION = "A string value representing short-lived secret key";
     public static final String DEFAULT_APP_DOMAIN = "demo.thingsboard.io";
     public static final String DEEP_LINK_PATTERN = "https://%s/api/noauth/qr?secret=%s&ttl=%s";
 
@@ -164,7 +164,7 @@ public class MobileApplicationController extends BaseController {
             notes = "Returns the token of the User based on the provided secret key.")
     @GetMapping(value = "/api/noauth/qr/{secret}")
     public JwtPair getUserTokenByMobileSecret(@Parameter(description = SECRET_PARAM_DESCRIPTION)
-                                @PathVariable(SECRET) String secret) throws ThingsboardException {
+                                              @PathVariable(SECRET) String secret) throws ThingsboardException {
         checkParameter(SECRET, secret);
         return mobileAppSecretService.getJwtPair(secret);
     }
@@ -184,4 +184,5 @@ public class MobileApplicationController extends BaseController {
                     .build();
         }
     }
+
 }

application/src/main/java/org/thingsboard/server/service/qr/MobileAppSecretService.java → application/src/main/java/org/thingsboard/server/service/mobile/secret/MobileAppSecretService.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.qr;
+package org.thingsboard.server.service.mobile.secret;
 
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.security.model.JwtPair;

application/src/main/java/org/thingsboard/server/service/qr/MobileAppSecretServiceImpl.java → application/src/main/java/org/thingsboard/server/service/mobile/secret/MobileAppSecretServiceImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.qr;
+package org.thingsboard.server.service.mobile.secret;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

application/src/main/java/org/thingsboard/server/service/qr/MobileSecretCaffeineCache.java → application/src/main/java/org/thingsboard/server/service/mobile/secret/MobileSecretCaffeineCache.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.qr;
+package org.thingsboard.server.service.mobile.secret;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cache.CacheManager;

application/src/main/java/org/thingsboard/server/service/qr/MobileSecretEvictEvent.java → application/src/main/java/org/thingsboard/server/service/mobile/secret/MobileSecretEvictEvent.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.qr;
+package org.thingsboard.server.service.mobile.secret;
 
 import lombok.Data;
 

application/src/main/java/org/thingsboard/server/service/qr/MobileSecretRedisCache.java → application/src/main/java/org/thingsboard/server/service/mobile/secret/MobileSecretRedisCache.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.qr;
+package org.thingsboard.server.service.mobile.secret;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.redis.connection.RedisConnectionFactory;

dao/src/main/java/org/thingsboard/server/dao/mobile/BaseMobileAppSettingsService.java

@@ -17,7 +17,6 @@ package org.thingsboard.server.dao.mobile;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.event.TransactionalEventListener;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -28,9 +27,10 @@ import org.thingsboard.server.common.data.mobile.IosConfig;
 import org.thingsboard.server.common.data.mobile.MobileAppSettings;
 import org.thingsboard.server.common.data.mobile.QRCodeConfig;
 import org.thingsboard.server.dao.entity.AbstractCachedEntityService;
-import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.service.DataValidator;
 
+import java.util.Map;
+
 import static org.thingsboard.server.dao.service.Validator.validateId;
 
 @Service
@@ -51,16 +51,12 @@ public class BaseMobileAppSettingsService extends AbstractCachedEntityService<Te
             MobileAppSettings savedMobileAppSettings = mobileAppSettingsDao.save(tenantId, mobileAppSettings);
             publishEvictEvent(new MobileAppSettingsEvictEvent(tenantId));
             return savedMobileAppSettings;
-        } catch (Exception exception) {
-            if (mobileAppSettings != null) {
-                handleEvictEvent(new MobileAppSettingsEvictEvent(tenantId));
-            }
-            ConstraintViolationException e = extractConstraintViolationException(exception).orElse(null);
-            if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("mobile_app_settings_tenant_id_key")) {
-                throw new DataValidationException("Mobile application for specified tenant already exists!");
-            } else {
-                throw exception;
-            }
+        } catch (Exception e) {
+            handleEvictEvent(new MobileAppSettingsEvictEvent(tenantId));
+            checkConstraintViolation(e, Map.of(
+                    "mobile_app_settings_tenant_id_unq_key", "Mobile application for specified tenant already exists!"
+            ));
+            throw e;
         }
     }
 

dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppSettingsRedisCache.java

@@ -1,4 +1,4 @@
- /**
+/**
  * Copyright © 2016-2024 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

dao/src/main/java/org/thingsboard/server/dao/model/sql/MobileAppSettingsEntity.java

@@ -21,6 +21,7 @@ import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.id.MobileAppSettingsId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -35,6 +36,7 @@ import org.thingsboard.server.dao.util.mapping.JsonConverter;
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @Entity
 @Table(name = ModelConstants.MOBILE_APP_SETTINGS_TABLE_NAME)
@@ -59,16 +61,14 @@ public class MobileAppSettingsEntity extends BaseSqlEntity<MobileAppSettings> {
     private JsonNode qrCodeConfig;
 
     public MobileAppSettingsEntity(MobileAppSettings mobileAppSettings) {
-        if (mobileAppSettings.getId() != null) {
-            this.setId(mobileAppSettings.getId().getId());
-        }
+        this.setId(mobileAppSettings.getUuidId());
         this.setCreatedTime(mobileAppSettings.getCreatedTime());
         this.tenantId = mobileAppSettings.getTenantId().getId();
         this.useDefaultApp = mobileAppSettings.isUseDefaultApp();
         this.androidConfig = toJson(mobileAppSettings.getAndroidConfig());
         this.iosConfig = toJson(mobileAppSettings.getIosConfig());
         this.qrCodeConfig = toJson(mobileAppSettings.getQrCodeConfig());
-   }
+    }
 
     @Override
     public MobileAppSettings toData() {
@@ -81,4 +81,5 @@ public class MobileAppSettingsEntity extends BaseSqlEntity<MobileAppSettings> {
         mobileAppSettings.setQrCodeConfig(fromJson(qrCodeConfig, QRCodeConfig.class));
         return mobileAppSettings;
     }
+
 }

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

@@ -900,9 +900,10 @@ CREATE TABLE IF NOT EXISTS queue_stats (
 CREATE TABLE IF NOT EXISTS mobile_app_settings (
     id uuid NOT NULL CONSTRAINT mobile_app_settings_pkey PRIMARY KEY,
     created_time bigint NOT NULL,
-    tenant_id uuid UNIQUE NOT NULL,
+    tenant_id uuid NOT NULL,
     use_default_app boolean,
     android_config VARCHAR(1000),
     ios_config VARCHAR(1000),
-    qr_code_config VARCHAR(100000)
-);
+    qr_code_config VARCHAR(100000),
+    CONSTRAINT mobile_app_settings_tenant_id_unq_key UNIQUE (tenant_id)
+);