From 2dad98b2f7a7fadcebb9742dddf96281b12e8aa5 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Fri, 17 Jun 2022 11:54:20 +0300
Subject: [PATCH] Improvement to the Rule Chain diff

---
 .../impl/BaseEntityImportService.java          | 18 +++++-------------
 .../importing/impl/RuleChainImportService.java | 13 +++++++++----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
index 01a341bb4c..783772719c 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
@@ -86,7 +86,6 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo
     @Transactional(rollbackFor = Exception.class)
     @Override
     public EntityImportResult<E> importEntity(EntitiesImportCtx ctx, D exportData) throws ThingsboardException {
-//        TbStopWatch sw = TbStopWatch.create("find");
         EntityImportResult<E> importResult = new EntityImportResult<>();
         importResult.setEntityType(getEntityType());
         IdProvider idProvider = new IdProvider(ctx, importResult);
@@ -107,10 +106,9 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo
 
         E prepared = prepare(ctx, entity, existingEntity, exportData, idProvider);
 
-        boolean saveOrUpdate = existingEntity == null || compare(prepared, existingEntity);
+        boolean saveOrUpdate = existingEntity == null || compare(ctx, exportData, prepared, existingEntity);
 
         if (saveOrUpdate) {
-//        sw.startNew("prepareAndSave");
             E savedEntity = saveOrUpdate(ctx, prepared, exportData, idProvider);
             boolean created = existingEntity == null;
             importResult.setCreated(created);
@@ -123,14 +121,8 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo
             importResult.setUpdatedRelatedEntities(updateRelatedEntitiesIfUnmodified(ctx, prepared, exportData, idProvider));
         }
 
-//        sw.startNew("afterSaved");
         processAfterSaved(ctx, importResult, exportData, idProvider);
 
-//        sw.stop();
-//        for (var task : sw.getTaskInfo()) {
-//            log.info("[{}][{}] Executed: {} in {}ms", exportData.getEntityType(), exportData.getEntity().getId(), task.getTaskName(), task.getTimeMillis());
-//        }
-//        log.info("[{}][{}] Total time: {}ms", exportData.getEntityType(), exportData.getEntity().getId(), sw.getTotalTimeMillis());
         return importResult;
     }
 
@@ -145,16 +137,16 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo
 
     protected abstract E prepare(EntitiesImportCtx ctx, E entity, E oldEntity, D exportData, IdProvider idProvider);
 
-    protected boolean compare(E prepared, E existing) {
+    protected boolean compare(EntitiesImportCtx ctx, D exportData, E prepared, E existing) {
         var newCopy = deepCopy(prepared);
         var existingCopy = deepCopy(existing);
         cleanupForComparison(newCopy);
         cleanupForComparison(existingCopy);
         var result = !newCopy.equals(existingCopy);
         if (result) {
-            log.info("[{}] Found update.", prepared.getId());
-            log.info("[{}] From: {}", prepared.getId(), newCopy);
-            log.info("[{}] To: {}", prepared.getId(), existingCopy);
+            log.debug("[{}] Found update.", prepared.getId());
+            log.debug("[{}] From: {}", prepared.getId(), newCopy);
+            log.debug("[{}] To: {}", prepared.getId(), existingCopy);
         }
         return result;
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/RuleChainImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/RuleChainImportService.java
index 26a6a8d4dd..e29a93347e 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/RuleChainImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/RuleChainImportService.java
@@ -87,6 +87,7 @@ public class RuleChainImportService extends BaseEntityImportService<RuleChainId,
                 .forEach(ruleChainConnectionInfo -> {
                     ruleChainConnectionInfo.setTargetRuleChainId(idProvider.getInternalId(ruleChainConnectionInfo.getTargetRuleChainId(), false));
                 });
+        //TODO: lookup rule node id based on external rule node id.
         ruleChain.setFirstRuleNodeId(null);
         return ruleChain;
     }
@@ -100,10 +101,14 @@ public class RuleChainImportService extends BaseEntityImportService<RuleChainId,
     }
 
     @Override
-    protected boolean compare(RuleChain prepared, RuleChain existing) {
-        //Always update, since we don't fetch the metadata.
-        //TODO: improve and fetch the metadata of existing entity.
-        return true;
+    protected boolean compare(EntitiesImportCtx ctx, RuleChainExportData exportData, RuleChain prepared, RuleChain existing) {
+        boolean different = super.compare(ctx, exportData, prepared, existing);
+        if (!different) {
+            RuleChainMetaData newMD = exportData.getMetaData();
+            RuleChainMetaData existingMD = ruleChainService.loadRuleChainMetaData(ctx.getTenantId(), prepared.getId());
+            different = newMD.equals(existingMD);
+        }
+        return different;
     }
 
     @Override