From 101e46d547e03cad99e03538058c5c3efbb406b8 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Tue, 22 Oct 2024 17:17:06 +0300
Subject: [PATCH] updated QrCodeSettings to have custom app store links

---
 .../controller/QrCodeSettingsController.java      |  4 ++--
 .../mobile/qrCodeSettings/QrCodeSettings.java     |  4 ++--
 .../dao/mobile/QrCodeSettingServiceImpl.java      | 15 +++++++++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/QrCodeSettingsController.java b/application/src/main/java/org/thingsboard/server/controller/QrCodeSettingsController.java
index 547cdc738f..988b5a9f10 100644
--- a/application/src/main/java/org/thingsboard/server/controller/QrCodeSettingsController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/QrCodeSettingsController.java
@@ -179,12 +179,12 @@ public class QrCodeSettingsController extends BaseController {
         QrCodeSettings qrCodeSettings = qrCodeSettingService.findQrCodeSettings(TenantId.SYS_TENANT_ID);
         boolean useDefaultApp = qrCodeSettings.isUseDefaultApp();
         if (userAgent.contains("Android")) {
-            String googlePlayLink = useDefaultApp ? qrCodeSettings.getDefaultGooglePlayLink() : getStoreLink(qrCodeSettings.getMobileAppBundleId(), ANDROID);
+            String googlePlayLink = useDefaultApp ? qrCodeSettings.getGooglePlayLink() : getStoreLink(qrCodeSettings.getMobileAppBundleId(), ANDROID);
             return ResponseEntity.status(HttpStatus.FOUND)
                     .header("Location", googlePlayLink)
                     .build();
         } else if (userAgent.contains("iPhone") || userAgent.contains("iPad")) {
-            String appStoreLink = useDefaultApp ? qrCodeSettings.getDefaultAppStoreLink() : getStoreLink(qrCodeSettings.getMobileAppBundleId(), IOS);
+            String appStoreLink = useDefaultApp ? qrCodeSettings.getAppStoreLink() : getStoreLink(qrCodeSettings.getMobileAppBundleId(), IOS);
             return ResponseEntity.status(HttpStatus.FOUND)
                     .header("Location", appStoreLink)
                     .build();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/qrCodeSettings/QrCodeSettings.java b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/qrCodeSettings/QrCodeSettings.java
index 550da0e539..0af5e53e5a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/qrCodeSettings/QrCodeSettings.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/qrCodeSettings/QrCodeSettings.java
@@ -44,10 +44,10 @@ public class QrCodeSettings extends BaseData<QrCodeSettingsId> implements HasTen
     private QRCodeConfig qrCodeConfig;
 
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    private String defaultGooglePlayLink;
+    private String googlePlayLink;
 
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    private String defaultAppStoreLink;
+    private String appStoreLink;
 
     public QrCodeSettings() {
     }
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 d217c1c463..b97fdeafd0 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
@@ -31,6 +31,8 @@ import org.thingsboard.server.dao.service.DataValidator;
 
 import java.util.Map;
 
+import static org.thingsboard.server.common.data.oauth2.PlatformType.ANDROID;
+import static org.thingsboard.server.common.data.oauth2.PlatformType.IOS;
 import static org.thingsboard.server.dao.service.Validator.validateId;
 
 @Service
@@ -112,8 +114,17 @@ public class QrCodeSettingServiceImpl extends AbstractCachedEntityService<Tenant
             qrCodeSettings.setMobileAppBundleId(qrCodeSettings.getMobileAppBundleId());
         }
         if (qrCodeSettings.isUseDefaultApp()) {
-            qrCodeSettings.setDefaultGooglePlayLink(googlePlayLink);
-            qrCodeSettings.setDefaultAppStoreLink(appStoreLink);
+            qrCodeSettings.setGooglePlayLink(googlePlayLink);
+            qrCodeSettings.setAppStoreLink(appStoreLink);
+        } else {
+            MobileApp androidApp = mobileAppService.findByBundleIdAndPlatformType(qrCodeSettings.getTenantId(), qrCodeSettings.getMobileAppBundleId(), ANDROID);
+            MobileApp iosApp = mobileAppService.findByBundleIdAndPlatformType(qrCodeSettings.getTenantId(), qrCodeSettings.getMobileAppBundleId(), IOS);
+            if (androidApp != null && androidApp.getStoreInfo() != null && androidApp.getStoreInfo().isEnabled()) {
+                qrCodeSettings.setGooglePlayLink(androidApp.getStoreInfo().getStoreLink());
+            }
+            if (iosApp != null && iosApp.getStoreInfo() != null && iosApp.getStoreInfo().isEnabled()) {
+                qrCodeSettings.setAppStoreLink(iosApp.getStoreInfo().getStoreLink());
+            }
         }
         return qrCodeSettings;
     }