From d2ffb099876943aac4e2d47553f0e624cdc7c401 Mon Sep 17 00:00:00 2001 From: Timo Date: Wed, 21 Jul 2021 16:01:16 +0300 Subject: [PATCH] redaction-log preview generation and removal of manual redactions from redaction-log --- .../v1/server/controller/RedactionController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java index 047538cf..901104d0 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java @@ -164,7 +164,13 @@ public class RedactionController implements RedactionResource { dictionaryService.updateDictionary(redactionRequest.getDossierTemplateId(), redactionRequest.getDossierId()); var redactionLog = redactionStorageService.getRedactionLog(redactionRequest.getDossierId(), redactionRequest.getFileId()); - return redactionLogMergeService.mergeRedactionLogData(redactionLog, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions()); + + if (redactionLog.getComputationalVersion() == 0) { + // old redaction logs are returned directly + return redactionLog; + } else { + return redactionLogMergeService.mergeRedactionLogData(redactionLog, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions()); + } }