From 57df0395416e9ff2e5dd225a371f6cbd79aed8fb Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Fri, 6 Dec 2024 19:03:30 +0200
Subject: [PATCH] fixed upgrade script for disabled android/ios configuration

---
 .../main/data/upgrade/basic/schema_update.sql  | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/application/src/main/data/upgrade/basic/schema_update.sql b/application/src/main/data/upgrade/basic/schema_update.sql
index ced110e65a..9aec87af00 100644
--- a/application/src/main/data/upgrade/basic/schema_update.sql
+++ b/application/src/main/data/upgrade/basic/schema_update.sql
@@ -143,7 +143,7 @@ $$
             LOOP
                 generatedBundleId := NULL;
                 -- migrate android config
-                IF (qrCodeRecord.android_config IS NOT NULL AND qrCodeRecord.android_config::jsonb -> 'appPackage' IS NOT NULL) THEN
+                IF (qrCodeRecord.android_config::jsonb ->> 'appPackage' IS NOT NULL) THEN
                     androidPkgName := qrCodeRecord.android_config::jsonb ->> 'appPackage';
                     SELECT id into androidAppId FROM mobile_app WHERE pkg_name = androidPkgName AND platform_type = 'ANDROID';
                     IF androidAppId IS NULL THEN
@@ -154,17 +154,16 @@ $$
                         generatedBundleId := uuid_generate_v4();
                         INSERT INTO mobile_app_bundle(id, created_time, tenant_id, title, android_app_id)
                         VALUES (generatedBundleId, (extract(epoch from now()) * 1000), qrCodeRecord.tenant_id, androidPkgName || ' (autogenerated)', androidAppId);
-                        UPDATE qr_code_settings SET mobile_app_bundle_id = generatedBundleId,
-                                                    android_enabled = (qrCodeRecord.android_config::jsonb ->> 'enabled')::boolean WHERE id = qrCodeRecord.id;
+                        UPDATE qr_code_settings SET mobile_app_bundle_id = generatedBundleId;
                     ELSE
                         UPDATE mobile_app SET store_info = qrCodeRecord.android_config::jsonb - 'appPackage' - 'enabled' WHERE id = androidAppId;
-                        UPDATE qr_code_settings SET mobile_app_bundle_id = (SELECT id FROM mobile_app_bundle WHERE mobile_app_bundle.android_app_id = androidAppId),
-                                                    android_enabled = (qrCodeRecord.android_config::jsonb ->> 'enabled')::boolean WHERE id = qrCodeRecord.id;
+                        UPDATE qr_code_settings SET mobile_app_bundle_id = (SELECT id FROM mobile_app_bundle WHERE mobile_app_bundle.android_app_id = androidAppId);
                     END IF;
                 END IF;
+                UPDATE qr_code_settings SET android_enabled = (qrCodeRecord.android_config::jsonb ->> 'enabled')::boolean WHERE id = qrCodeRecord.id;
 
                 -- migrate ios config
-                IF (qrCodeRecord.ios_config IS NOT NULL AND qrCodeRecord.ios_config::jsonb -> 'appId' IS NOT NULL) THEN
+                IF (qrCodeRecord.ios_config::jsonb ->> 'appId' IS NOT NULL) THEN
                     iosPkgName := substring(qrCodeRecord.ios_config::jsonb ->> 'appId', strpos(qrCodeRecord.ios_config::jsonb ->> 'appId', '.') + 1);
                     SELECT id INTO iosAppId FROM mobile_app WHERE pkg_name = iosPkgName AND platform_type = 'IOS';
                     IF iosAppId IS NULL THEN
@@ -176,17 +175,16 @@ $$
                             generatedBundleId := uuid_generate_v4();
                             INSERT INTO mobile_app_bundle(id, created_time, tenant_id, title, ios_app_id)
                             VALUES (generatedBundleId, (extract(epoch from now()) * 1000), qrCodeRecord.tenant_id, iosPkgName || ' (autogenerated)', iosAppId);
-                            UPDATE qr_code_settings SET mobile_app_bundle_id = generatedBundleId,
-                                                        ios_enabled = (qrCodeRecord.ios_config::jsonb ->> 'enabled')::boolean WHERE id = qrCodeRecord.id;
+                            UPDATE qr_code_settings SET mobile_app_bundle_id = generatedBundleId;
                         ELSE
                             UPDATE mobile_app_bundle SET ios_app_id = iosAppId WHERE id = generatedBundleId;
                         END IF;
                     ELSE
-                        UPDATE qr_code_settings SET mobile_app_bundle_id = (SELECT id FROM mobile_app_bundle WHERE mobile_app_bundle.ios_app_id = iosAppId),
-                                                    ios_enabled = (qrCodeRecord.ios_config::jsonb -> 'enabled')::boolean WHERE id = qrCodeRecord.id;
+                        UPDATE qr_code_settings SET mobile_app_bundle_id = (SELECT id FROM mobile_app_bundle WHERE mobile_app_bundle.ios_app_id = iosAppId);
                         UPDATE mobile_app SET store_info = qrCodeRecord.ios_config::jsonb - 'enabled' WHERE id = iosAppId;
                     END IF;
                 END IF;
+                UPDATE qr_code_settings SET ios_enabled = (qrCodeRecord.ios_config::jsonb -> 'enabled')::boolean WHERE id = qrCodeRecord.id;
             END LOOP;
             ALTER TABLE qr_code_settings RENAME CONSTRAINT mobile_app_settings_tenant_id_unq_key TO qr_code_settings_tenant_id_unq_key;
             ALTER TABLE qr_code_settings RENAME CONSTRAINT mobile_app_settings_pkey TO qr_code_settings_pkey;