From b76909ce05cb2e8ce1069860c370e108ee3f1307 Mon Sep 17 00:00:00 2001
From: Andrii Landiak <andriylandiak@gmail.com>
Date: Fri, 20 Jun 2025 15:15:15 +0300
Subject: [PATCH] Fix ota save when saving url

---
 .../sync/ie/importing/impl/OtaPackageImportService.java      | 5 +++++
 .../dao/service/validator/OtaPackageDataValidator.java       | 1 +
 2 files changed, 6 insertions(+)

diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/OtaPackageImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/OtaPackageImportService.java
index 16b204411e..fd8a7822eb 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/OtaPackageImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/OtaPackageImportService.java
@@ -19,6 +19,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.OtaPackage;
+import org.thingsboard.server.common.data.OtaPackageInfo;
 import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.sync.ie.OtaPackageExportData;
@@ -60,6 +61,10 @@ public class OtaPackageImportService extends BaseEntityImportService<OtaPackageI
 
     @Override
     protected OtaPackage saveOrUpdate(EntitiesImportCtx ctx, OtaPackage otaPackage, OtaPackageExportData exportData, IdProvider idProvider, CompareResult compareResult) {
+        if (otaPackage.hasUrl()) {
+            OtaPackageInfo info = new OtaPackageInfo(otaPackage);
+            return (OtaPackage) otaPackageService.saveOtaPackageInfo(info, info.hasUrl());
+        }
         return otaPackageService.saveOtaPackage(otaPackage);
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/validator/OtaPackageDataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/OtaPackageDataValidator.java
index 47911a8966..c4d3f7255d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/OtaPackageDataValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/OtaPackageDataValidator.java
@@ -103,4 +103,5 @@ public class OtaPackageDataValidator extends BaseOtaPackageDataValidator<OtaPack
         }
         return otaPackageOld;
     }
+
 }