From 973816f0f7ea4454267e583ee62fc351e608fb26 Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Tue, 8 Aug 2023 17:16:46 +0200 Subject: [PATCH] DM-357 - no longer save all manualRedactionLogEntries here -> they will be... --- .../redactionlog/RedactionLogMergeService.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/redactionlog/RedactionLogMergeService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/redactionlog/RedactionLogMergeService.java index 8d027bc28..5f15ccd71 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/redactionlog/RedactionLogMergeService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/redactionlog/RedactionLogMergeService.java @@ -1,6 +1,5 @@ package com.iqser.red.service.persistence.management.v1.processor.service.redactionlog; -import java.awt.Color; import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Collections; @@ -66,12 +65,8 @@ public class RedactionLogMergeService { throw new NotFoundException("RedactionLog not present"); } - var sectionGrid = fileManagementStorageService.getSectionGrid(redactionRequest.getDossierId(), redactionRequest.getFileId()); - - log.debug("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion()); var merged = mergeRedactionLogData(redactionLog, - sectionGrid, redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages(), redactionRequest.getTypes(), @@ -84,7 +79,6 @@ public class RedactionLogMergeService { private RedactionLog mergeRedactionLogData(RedactionLog redactionLog, - SectionGrid sectionGrid, ManualRedactions manualRedactions, Set excludedPages, List types, @@ -94,15 +88,6 @@ public class RedactionLogMergeService { log.info("Merging Redaction log with manual redactions"); if (manualRedactions != null) { - var manualRedactionLogEntries = addManualAddEntries(sectionGrid, - manualRedactions.getEntriesToAdd(), - manualRedactions.getComments(), - colors, - types, - redactionLog.getAnalysisNumber()); - - redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries); - var manualRedactionWrappers = createManualRedactionWrappers(manualRedactions); for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {