From c5b83bf6e0f696f78006c954d387f51653b93178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kilian=20Sch=C3=BCttler?= <kilian.schuettler@knecon.com>
Date: Tue, 26 Mar 2024 12:40:16 +0100
Subject: [PATCH] RED-8854: Recategorization from formula/image/logo to
 signature is not displayed in report

---
 .../v1/server/migration/MigrationMessageReceiver.java        | 2 +-
 .../migration/RedactionLogToEntityLogMigrationService.java   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/MigrationMessageReceiver.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/MigrationMessageReceiver.java
index b9b8e9ae..70bf33df 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/MigrationMessageReceiver.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/MigrationMessageReceiver.java
@@ -57,7 +57,7 @@ public class MigrationMessageReceiver {
 
         if (redactionLog.getAnalysisVersion() == 0) {
             redactionLog = legacyVersion0MigrationService.mergeDuplicateAnnotationIds(redactionLog);
-        } else if (migrationRequest.getManualRedactions() != null) {
+        } else {
             redactionLog = legacyRedactionLogMergeService.addManualAddEntriesAndRemoveSkippedImported(redactionLog,
                                                                                                       migrationRequest.getManualRedactions(),
                                                                                                       migrationRequest.getDossierTemplateId());
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/RedactionLogToEntityLogMigrationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/RedactionLogToEntityLogMigrationService.java
index dc5e1fac..80f9b21b 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/RedactionLogToEntityLogMigrationService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/migration/RedactionLogToEntityLogMigrationService.java
@@ -72,7 +72,7 @@ public class RedactionLogToEntityLogMigrationService {
                 .collect(new MigratedIdsCollector());
 
         log.info("applying manual changes to migrated entities for file {}", fileId);
-        applyManualChanges(entitiesToMigrate, manualRedactions);
+        applyProcessedManualChanges(entitiesToMigrate, manualRedactions);
 
         EntityLog entityLog = new EntityLog();
         entityLog.setAnalysisNumber(redactionLog.getAnalysisNumber());
@@ -117,7 +117,7 @@ public class RedactionLogToEntityLogMigrationService {
     }
 
 
-    private void applyManualChanges(List<MigrationEntity> entitiesToMigrate, ManualRedactions manualRedactions) {
+    private void applyProcessedManualChanges(List<MigrationEntity> entitiesToMigrate, ManualRedactions manualRedactions) {
 
         if (manualRedactions == null) {
             return;
@@ -130,6 +130,7 @@ public class RedactionLogToEntityLogMigrationService {
                                                                                    manualRedactions.getLegalBasisChanges(),
                                                                                    manualRedactions.getRecategorizations())
                 .flatMap(Collection::stream)
+                .filter(manualChange -> manualChange.getProcessedDate() != null)
                 .collect(Collectors.groupingBy(BaseAnnotation::getAnnotationId));
 
         entitiesToMigrate.forEach(migrationEntity -> migrationEntity.applyManualChanges(manualChangesPerAnnotationId.getOrDefault(migrationEntity.getOldId(),