From 6c166b90773092db02c702e24cd7739abddbec8e Mon Sep 17 00:00:00 2001
From: Andrew Shvayka <ashvayka@thingsboard.io>
Date: Wed, 12 Jan 2022 11:20:18 +0200
Subject: [PATCH] Restore alarm relations update script. Add Bootstrap upgrade
 script

# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
---
 .../install/SqlDatabaseUpgradeService.java    | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
index c98e46d86e..6f142bab4c 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
@@ -1,12 +1,12 @@
 /**
  * Copyright © 2016-2021 The Thingsboard Authors
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -475,14 +475,30 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                     log.info("Updating schema ...");
                     schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.3.2", SCHEMA_UPDATE_SQL);
                     loadSql(schemaUpdateFile, conn);
-                    log.info("Updating server`s public key from HexDec to Base64 in profile for LWM2M...");
-                    schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.3.2", "schema_update_lwm2m_bootstrap.sql");
-                    loadSql(schemaUpdateFile, conn);
-                    conn.createStatement().execute("call update_profile_bootstrap();");
-                    log.info("Server`s public key from HexDec to Base64 in profile for LWM2M updated.");
-                    log.info("Updating client`s public key and secret key from HexDec to Base64 for LWM2M...");
-                    conn.createStatement().execute("call update_device_credentials_to_base64_and_bootstrap();");
-                    log.info("Client`s public key and secret key from HexDec to Base64 for LWM2M updated.");
+                    try {
+                        conn.createStatement().execute("insert into entity_alarm(tenant_id, entity_id, created_time, type, customer_id, alarm_id)" +
+                                " select tenant_id, originator_id, created_time, type, customer_id, id from alarm;");
+                        conn.createStatement().execute("insert into entity_alarm(tenant_id, entity_id, created_time, type, customer_id, alarm_id)" +
+                                " select a.tenant_id, r.from_id, created_time, type, customer_id, id" +
+                                " from alarm a inner join relation r on r.relation_type_group = 'ALARM' and r.relation_type = 'ANY' and a.id = r.to_id ON CONFLICT DO NOTHING;");
+                        conn.createStatement().execute("delete from relation r where r.relation_type_group = 'ALARM';");
+                    } catch (Exception e) {
+                        log.error("Failed to update alarm relations!!!", e);
+                    }
+
+                    log.info("Updating lwm2m device profiles ...");
+                    try {
+                        schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.3.2", "schema_update_lwm2m_bootstrap.sql");
+                        loadSql(schemaUpdateFile, conn);
+                        log.info("Updating server`s public key from HexDec to Base64 in profile for LWM2M...");
+                        conn.createStatement().execute("call update_profile_bootstrap();");
+                        log.info("Server`s public key from HexDec to Base64 in profile for LWM2M updated.");
+                        log.info("Updating client`s public key and secret key from HexDec to Base64 for LWM2M...");
+                        conn.createStatement().execute("call update_device_credentials_to_base64_and_bootstrap();");
+                        log.info("Client`s public key and secret key from HexDec to Base64 for LWM2M updated.");
+                    } catch (Exception e) {
+                        log.error("Failed to update lwm2m profiles!!!", e);
+                    }
                     log.info("Updating schema settings...");
                     conn.createStatement().execute("UPDATE tb_schema_settings SET schema_version = 3003003;");
                     log.info("Schema updated.");