From fe4ec688b0960e9ad2793587dc2d70745988aa22 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Wed, 15 Jun 2022 12:02:28 +0300
Subject: [PATCH] Put external Id into Context

---
 .../sync/ie/exporting/impl/DefaultEntityExportService.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DefaultEntityExportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DefaultEntityExportService.java
index 4d5d7952d8..4f748ba9d8 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DefaultEntityExportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DefaultEntityExportService.java
@@ -74,7 +74,9 @@ public class DefaultEntityExportService<I extends EntityId, E extends Exportable
         exportData.setEntityType(entityId.getEntityType());
         setAdditionalExportData(ctx, entity, exportData);
 
-        entity.setId(entity.getExternalId() != null ? entity.getExternalId() : entity.getId());
+        var externalId = entity.getExternalId() != null ? entity.getExternalId() : entity.getId();
+        ctx.putExternalId(entityId, externalId);
+        entity.setId(externalId);
         entity.setTenantId(null);
 
         return exportData;