From c60758965582ff5bd7cf17f1df48c147f65f258c Mon Sep 17 00:00:00 2001
From: Dmytro Skarzhynets <d.skarzh@protonmail.com>
Date: Wed, 3 May 2023 13:14:43 +0300
Subject: [PATCH] Fix: move enrichment nodes upgrade script to 3.5.1 version

---
 .../server/install/ThingsboardInstallService.java     | 11 ++++++-----
 .../install/update/DefaultDataUpdateService.java      |  4 ++--
 2 files changed, 8 insertions(+), 7 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 b7b159671e..98ce0f5b67 100644
--- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
+++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
@@ -247,17 +247,18 @@ public class ThingsboardInstallService {
                         case "3.4.4":
                             log.info("Upgrading ThingsBoard from version 3.4.4 to 3.5.0 ...");
                             databaseEntitiesUpgradeService.upgradeDatabase("3.4.4");
-                            dataUpdateService.updateData("3.4.4");
-                            log.info("Updating system data...");
-                            systemDataLoaderService.updateSystemWidgets();
                             if (!getEnv("SKIP_DEFAULT_NOTIFICATION_CONFIGS_CREATION", false)) {
                                 systemDataLoaderService.createDefaultNotificationConfigs();
                             } else {
                                 log.info("Skipping default notification configs creation");
                             }
                             installScripts.loadSystemLwm2mResources();
-                            break;
-                        //TODO update CacheCleanupService on the next version upgrade
+                        case "3.5.0":
+                            log.info("Upgrading ThingsBoard from version 3.5.0 to 3.5.1 ...");
+                            log.info("Updating system data...");
+                            dataUpdateService.updateData("3.5.0");
+                            systemDataLoaderService.updateSystemWidgets();
+                            //TODO update CacheCleanupService on the next version upgrade
                         default:
                             throw new RuntimeException("Unable to upgrade ThingsBoard, unsupported fromVersion: " + upgradeFromVersion);
 
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 c1c334aef3..315c2e71e1 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
@@ -206,8 +206,8 @@ public class DefaultDataUpdateService implements DataUpdateService {
                     log.info("Skipping edge events migration");
                 }
                 break;
-            case "3.4.4":
-                log.info("Updating data from version 3.4.4 to 3.5.0 ...");
+            case "3.5.0":
+                log.info("Updating data from version 3.5.0 to 3.5.1 ...");
                 log.info("Starting enrichment rule nodes update ...");
                 updateEnrichmentRuleNodes();
                 log.info("Finished enrichment rule nodes update!");