From 759e52090e9cc11bf300289ca2cb6edc7511943c Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Mon, 25 Mar 2024 16:00:43 +0100 Subject: [PATCH] RED-7384: Do not use value from RESIZE change, since images don't use that and the value is now updated in the EntityLogMergeService --- .../service/EntityLogConverterService.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java index 8c58f5a..80194f2 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java @@ -169,7 +169,7 @@ public class EntityLogConverterService { .map(EntityLogLegalBasis::getDescription) .orElse(""), checkTextForNull(entry.getTextBefore()) + entry.getValue() + checkTextForNull(entry.getTextAfter()), - determineValue(entry), + entry.getValue(), mapOfEntityDisplayName.get(entry.getType()), entry.getState() == EntryState.SKIPPED || entry.getState() == EntryState.IGNORED)); } @@ -198,21 +198,6 @@ public class EntityLogConverterService { } - private String determineValue(EntityLogEntry entry) { - - if (entry.getManualChanges() != null && !entry.getManualChanges().isEmpty()) { - ManualChange lastChange = getLastManualChange(entry); - if ((lastChange.getManualRedactionType().equals(ManualRedactionType.RESIZE) || lastChange.getManualRedactionType().equals(ManualRedactionType.RESIZE_IN_DICTIONARY)) - && lastChange.getPropertyChanges() != null) { - return lastChange.getPropertyChanges() - .get("value"); - } - } - - return entry.getValue(); - } - - private String getSection(EntityLogEntry entry, Position position) { if (StringUtils.isNotBlank(entry.getSection())) {