From a72d96c646ae4dde1fc67a15a31eb2cc60ee05b6 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Tue, 2 Apr 2024 14:53:24 +0200 Subject: [PATCH] RED-7384: also migrate annotation Ids with unprocessed manual changes --- .../RedactionLogToEntityLogMigrationService.java | 8 +++++++- .../redaction/v1/server/model/MigrationEntity.java | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) 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 b69af59e..c151aa60 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 @@ -101,8 +101,14 @@ public class RedactionLogToEntityLogMigrationService { throw new AssertionError(message); } + Set entitiesWithUnprocessedChanges = manualRedactions.buildAll() + .stream() + .filter(manualRedaction -> manualRedaction.getProcessedDate() == null) + .map(BaseAnnotation::getAnnotationId) + .collect(Collectors.toSet()); + MigratedIds idsToMigrateInDb = entitiesToMigrate.stream() - .filter(migrationEntity -> migrationEntity.hasManualChangesOrComments(entitiesWithComments)) + .filter(migrationEntity -> migrationEntity.hasManualChangesOrComments(entitiesWithComments, entitiesWithUnprocessedChanges)) .filter(m -> !m.getOldId().equals(m.getNewId())) .collect(new MigratedIdsCollector()); 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 a3041e01..8a1a1cab 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 @@ -347,11 +347,11 @@ public final class MigrationEntity { } - public boolean hasManualChangesOrComments(Set entitiesWithComments) { + public boolean hasManualChangesOrComments(Set entitiesWithComments, Set entitiesWithUnprocessedChanges) { return !(redactionLogEntry.getManualChanges() == null || redactionLogEntry.getManualChanges().isEmpty()) || // !(redactionLogEntry.getComments() == null || redactionLogEntry.getComments().isEmpty()) // - || hasManualChanges() || entitiesWithComments.contains(oldId); + || hasManualChanges() || entitiesWithComments.contains(oldId) || entitiesWithUnprocessedChanges.contains(oldId); } -- 2.47.2