From 328a82835e09eceb4fadac38c0727c0c391e38de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kilian=20Sch=C3=BCttler?= Date: Fri, 2 Feb 2024 10:26:38 +0100 Subject: [PATCH] RED-7384: don't attempt to migrate id's that don't change, since... --- .../migration/RedactionLogToEntityLogMigrationService.java | 6 +++++- .../redaction/v1/server/MigrationIntegrationTest.java | 2 -- 2 files changed, 5 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 eda5eb0c..25219f29 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 @@ -62,7 +62,6 @@ public class RedactionLogToEntityLogMigrationService { List entitiesToMigrate = calculateMigrationEntitiesFromRedactionLog(redactionLog, document, dossierTemplateId); MigratedIds migratedIds = entitiesToMigrate.stream().collect(new MigratedIdsCollector()); - MigratedIds idsToMigrateInDb = entitiesToMigrate.stream().filter(MigrationEntity::hasManualChangesOrComments).collect(new MigratedIdsCollector()); EntityLog entityLog = new EntityLog(); entityLog.setAnalysisNumber(redactionLog.getAnalysisNumber()); @@ -84,6 +83,11 @@ public class RedactionLogToEntityLogMigrationService { throw new AssertionError(message); } + MigratedIds idsToMigrateInDb = entitiesToMigrate.stream() + .filter(MigrationEntity::hasManualChangesOrComments) + .filter(m -> !m.getOldId().equals(m.getNewId())) + .collect(new MigratedIdsCollector()); + return new MigratedEntityLog(idsToMigrateInDb, entityLog); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/MigrationIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/MigrationIntegrationTest.java index ddcafe79..00b593d3 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/MigrationIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/MigrationIntegrationTest.java @@ -169,8 +169,6 @@ public class MigrationIntegrationTest extends BuildDocumentIntegrationTest { redactionStorageService.storeObject(TEST_DOSSIER_ID, TEST_FILE_ID, FileType.ENTITY_LOG, migratedEntityLog.getEntityLog()); assertEquals(mergedRedactionLog.getRedactionLogEntry().size(), migratedEntityLog.getEntityLog().getEntityLogEntry().size()); - assertEquals(mergedRedactionLog.getRedactionLogEntry().stream().filter(MigrationIntegrationTest::hasManualChanges).count(), - migratedEntityLog.getMigratedIds().getMappings().size()); EntityLog entityLog = migratedEntityLog.getEntityLog(); assertEquals(mergedRedactionLog.getAnalysisNumber(), entityLog.getAnalysisNumber()); assertEquals(mergedRedactionLog.getAnalysisVersion(), entityLog.getAnalysisVersion());