From 64a3c6402dcfb671336de9ee4b9923a50f5d11e0 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Thu, 25 May 2023 12:39:39 +0300
Subject: [PATCH] Execute update of the rule nodes on each upgrade of the
 system

---
 .../server/install/ThingsboardInstallService.java         | 1 +
 .../server/service/install/update/DataUpdateService.java  | 1 +
 .../service/install/update/DefaultDataUpdateService.java  | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
index 1821d35d36..9ce5356d02 100644
--- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
+++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
@@ -268,6 +268,7 @@ public class ThingsboardInstallService {
                     entityDatabaseSchemaService.createOrUpdateViewsAndFunctions();
                     entityDatabaseSchemaService.createOrUpdateDeviceInfoView(persistToTelemetry);
                     log.info("Updating system data...");
+                    dataUpdateService.upgradeRuleNodes();
                     systemDataLoaderService.updateSystemWidgets();
                     installScripts.loadSystemLwm2mResources();
                 }
diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/DataUpdateService.java b/application/src/main/java/org/thingsboard/server/service/install/update/DataUpdateService.java
index ae573b829a..289e3b1c94 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/update/DataUpdateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/DataUpdateService.java
@@ -19,4 +19,5 @@ public interface DataUpdateService {
 
     void updateData(String fromVersion) throws Exception;
 
+    void upgradeRuleNodes();
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
index 2c63b9987d..d0f3bbdeb3 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
@@ -209,16 +209,16 @@ public class DefaultDataUpdateService implements DataUpdateService {
                     log.info("Skipping edge events migration");
                 }
                 break;
-            case "3.5.0":
-                log.info("Updating data from version 3.5.0 to 3.5.1 ...");
-                upgradeRuleNodes();
+            case "3.5.1":
+                log.info("Updating data from version 3.5.1 to 3.5.2 ...");
                 break;
             default:
                 throw new RuntimeException("Unable to update data, unsupported fromVersion: " + fromVersion);
         }
     }
 
-    private void upgradeRuleNodes() {
+    @Override
+    public void upgradeRuleNodes() {
         try {
             log.info("Lookup rule nodes to upgrade ...");
             var nodeClassToVersionMap = getNodeClassToVersionMap();