From fbb7d5c415b734834ba4bd9caf8031a7930f7644 Mon Sep 17 00:00:00 2001
From: Andrii Landiak <andriylandiak@gmail.com>
Date: Thu, 12 Jun 2025 16:46:02 +0300
Subject: [PATCH] Minor improvement to correctly save ota if using the same
 device

---
 .../sync/ie/importing/impl/DeviceProfileImportService.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DeviceProfileImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DeviceProfileImportService.java
index e66d2d1267..c867286285 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DeviceProfileImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DeviceProfileImportService.java
@@ -45,8 +45,8 @@ public class DeviceProfileImportService extends BaseEntityImportService<DevicePr
         deviceProfile.setDefaultRuleChainId(idProvider.getInternalId(deviceProfile.getDefaultRuleChainId()));
         deviceProfile.setDefaultEdgeRuleChainId(idProvider.getInternalId(deviceProfile.getDefaultEdgeRuleChainId()));
         deviceProfile.setDefaultDashboardId(idProvider.getInternalId(deviceProfile.getDefaultDashboardId()));
-        deviceProfile.setFirmwareId(idProvider.getInternalId(deviceProfile.getFirmwareId()));
-        deviceProfile.setSoftwareId(idProvider.getInternalId(deviceProfile.getSoftwareId()));
+        deviceProfile.setFirmwareId(idProvider.getInternalId(deviceProfile.getFirmwareId(), false));
+        deviceProfile.setSoftwareId(idProvider.getInternalId(deviceProfile.getSoftwareId(), false));
         return deviceProfile;
     }
 
@@ -55,6 +55,9 @@ public class DeviceProfileImportService extends BaseEntityImportService<DevicePr
         DeviceProfile saved = deviceProfileService.saveDeviceProfile(deviceProfile);
         if (ctx.isFinalImportAttempt() || ctx.getCurrentImportResult().isUpdatedAllExternalIds()) {
             importCalculatedFields(ctx, saved, exportData, idProvider);
+            saved.setFirmwareId(idProvider.getInternalId(deviceProfile.getFirmwareId()));
+            saved.setSoftwareId(idProvider.getInternalId(deviceProfile.getSoftwareId()));
+            saved = deviceProfileService.saveDeviceProfile(saved);
         }
         return saved;
     }