From 6579807bb68cee2de3aa0c6037346ad8ab210270 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Wed, 15 Jun 2022 11:44:23 +0300
Subject: [PATCH] Bug fixes and no more tenant id in the git repo

---
 .../sync/ie/exporting/impl/DefaultEntityExportService.java   | 4 +++-
 .../service/sync/ie/exporting/impl/DeviceExportService.java  | 5 ++++-
 .../sync/vc/DefaultEntitiesVersionControlService.java        | 3 +++
 .../org/thingsboard/server/common/data/ExportableEntity.java | 3 +++
 4 files changed, 13 insertions(+), 2 deletions(-)

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 1a1aec32c0..4d5d7952d8 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
@@ -70,11 +70,13 @@ public class DefaultEntityExportService<I extends EntityId, E extends Exportable
             throw new IllegalArgumentException(entityId.getEntityType() + " [" + entityId.getId() + "] not found");
         }
 
-        entity.setId(entity.getExternalId() != null ? entity.getExternalId() : entity.getId());
         exportData.setEntity(entity);
         exportData.setEntityType(entityId.getEntityType());
         setAdditionalExportData(ctx, entity, exportData);
 
+        entity.setId(entity.getExternalId() != null ? entity.getExternalId() : entity.getId());
+        entity.setTenantId(null);
+
         return exportData;
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DeviceExportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DeviceExportService.java
index f3a8141e0d..244f691349 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DeviceExportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DeviceExportService.java
@@ -41,7 +41,10 @@ public class DeviceExportService extends BaseEntityExportService<DeviceId, Devic
         device.setCustomerId(getExternalIdOrElseInternal(ctx, device.getCustomerId()));
         device.setDeviceProfileId(getExternalIdOrElseInternal(ctx, device.getDeviceProfileId()));
         if (ctx.getSettings().isExportCredentials()) {
-            exportData.setCredentials(deviceCredentialsService.findDeviceCredentialsByDeviceId(ctx.getTenantId(), device.getId()));
+            var credentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(ctx.getTenantId(), device.getId());
+            credentials.setId(null);
+            credentials.setDeviceId(null);
+            exportData.setCredentials(credentials);
         }
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java b/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
index 6a6d2e2e6c..69be12d580 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
@@ -244,6 +244,9 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
             return result;
         } catch (LoadEntityException e) {
             return onError(e.getData(), e.getCause());
+        } catch (Exception e) {
+            log.info("[{}] Failed to process request [{}] due to: ", user.getTenantId(), request, e);
+            throw e;
         }
     }
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ExportableEntity.java b/common/data/src/main/java/org/thingsboard/server/common/data/ExportableEntity.java
index c6d13013b1..64834c8b15 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ExportableEntity.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ExportableEntity.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data;
 
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.HasId;
+import org.thingsboard.server.common.data.id.TenantId;
 
 public interface ExportableEntity<I extends EntityId> extends HasId<I>, HasName {
 
@@ -28,4 +29,6 @@ public interface ExportableEntity<I extends EntityId> extends HasId<I>, HasName
     long getCreatedTime();
     void setCreatedTime(long createdTime);
 
+    void setTenantId(TenantId tenantId);
+
 }