From 82c9884654533c4526070fe20ca0a3da84a071d3 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Wed, 10 Jan 2024 12:47:38 +0100 Subject: [PATCH] RED-7384: update dictionary before manual change merge --- .../v1/server/migration/MigrationMessageReceiver.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 c4d64299..e8222eac 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 @@ -51,6 +51,8 @@ public class MigrationMessageReceiver { log.info("Starting redactionLog to entityLog migration for dossierId {} and fileId {}", migrationRequest.getDossierId(), migrationRequest.getFileId()); // TODO: if an image is not found, try to copy the old one exactly (like with TextEntities) + dictionaryService.updateDictionary(migrationRequest.getDossierTemplateId(), migrationRequest.getDossierId()); + Document document = DocumentGraphMapper.toDocumentGraph(redactionStorageService.getDocumentData(migrationRequest.getDossierId(), migrationRequest.getFileId())); RedactionLog redactionLog = redactionStorageService.getRedactionLog(migrationRequest.getDossierId(), migrationRequest.getFileId()); @@ -60,7 +62,6 @@ public class MigrationMessageReceiver { redactionLog = legacyRedactionLogMergeService.mergeManualChanges(redactionLog, migrationRequest.getManualRedactions(), migrationRequest.getDossierTemplateId()); } - dictionaryService.updateDictionary(migrationRequest.getDossierTemplateId(), migrationRequest.getDossierId()); MigratedEntityLog migratedEntityLog = redactionLogToEntityLogMigrationService.migrate(redactionLog, document); redactionStorageService.storeObject(migrationRequest.getDossierId(), migrationRequest.getFileId(), FileType.ENTITY_LOG, migratedEntityLog.getEntityLog()); -- 2.47.2