From 07d248c1579b07b666092a9ee2843bbc0fdd6802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kilian=20Sch=C3=BCttler?= <kilian.schuettler@knecon.com>
Date: Thu, 11 Apr 2024 14:08:45 +0200
Subject: [PATCH] RED-7384: fix imported stuff

---
 .../v1/server/migration/MigrationMapper.java   | 18 +++++++++++++-----
 .../v1/server/model/MigrationEntity.java       |  4 ++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/MigrationMapper.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/MigrationMapper.java
index c9909086..0b4f034b 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/MigrationMapper.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/MigrationMapper.java
@@ -1,9 +1,9 @@
 package com.iqser.red.service.redaction.v1.server.migration;
 
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ChangeType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualChange;
@@ -70,13 +70,21 @@ public class MigrationMapper {
 
     public static Set<com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine> getMigratedEngines(RedactionLogEntry entry) {
 
-        if (entry.getEngines() == null) {
-            return Collections.emptySet();
+        Set<com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine> engines = new HashSet<>();
+
+        if (entry.isImported()) {
+            engines.add(com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine.IMPORTED);
         }
-        return entry.getEngines()
+
+        if (entry.getEngines() == null) {
+            return engines;
+        }
+        entry.getEngines()
                 .stream()
                 .map(MigrationMapper::toEntityLogEngine)
-                .collect(Collectors.toSet());
+                .forEach(engines::add);
+
+        return engines;
     }
 
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/MigrationEntity.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/MigrationEntity.java
index 8a1a1cab..6d7a55d1 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/MigrationEntity.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/MigrationEntity.java
@@ -210,6 +210,10 @@ public final class MigrationEntity {
             entityLogEntry.setState(EntryState.IGNORED);
         }
 
+        if (redactionLogEntry.isImported() && redactionLogEntry.getValue() == null) {
+            entityLogEntry.setValue("Imported Redaction");
+        }
+
         return entityLogEntry;
     }