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 entitiesToMigrate, ManualRedactions manualRedactions) { + private void applyProcessedManualChanges(List 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(),