From 98e0d6cd1b2bb75231c4f113ccec6ff61f186800 Mon Sep 17 00:00:00 2001 From: maverickstuder Date: Thu, 7 Nov 2024 15:33:04 +0100 Subject: [PATCH] RED-10115: Refactoring of justifications --- .../server/service/EntityLogConverterService.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 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 73d6532..d7beb99 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 @@ -161,21 +161,17 @@ public class EntityLogConverterService { Optional optionalEntityLogLegalBasis = legalBasisMappings.stream() .filter(lbm -> lbm.getTechnicalName().equalsIgnoreCase(entry.getLegalBasis())) .findAny(); - String legalBasisText = optionalEntityLogLegalBasis.map(entityLogLegalBasis -> entityLogLegalBasis.getReason() - + " " - + entityLogLegalBasis.getDescription()) - .orElse(""); - String legalBasisReason = optionalEntityLogLegalBasis.map(EntityLogLegalBasis::getReason) - .orElse(""); + + EntityLogLegalBasis entityLogLegalBasis = optionalEntityLogLegalBasis.orElse(new EntityLogLegalBasis("", "", "", "")); reportEntries.add(new ReportRedactionEntry(position.getPageNumber(), position.x(), position.y(), getSection(entry, position), - legalBasisReason, - legalBasisText, + entityLogLegalBasis.getReason() + " " + entityLogLegalBasis.getDescription(), + entityLogLegalBasis.getReason(), entry.getParagraphPageIdx(), - legalBasisReason, + entityLogLegalBasis.getDescription(), checkTextForNull(entry.getTextBefore()) + entry.getValue() + checkTextForNull(entry.getTextAfter()), entry.getValue(), mapOfEntityDisplayName.get(entry.getType())