From 6b2118e803e9130517c48742947a5f80c7306812 Mon Sep 17 00:00:00 2001 From: yhampe Date: Fri, 9 Aug 2024 10:13:43 +0200 Subject: [PATCH] RED-5624: Refactoring of justifications added technicalname instead of reason to reports --- .../redaction-report-service-server-v1/build.gradle.kts | 2 +- .../report/v1/server/service/EntityLogConverterService.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts b/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts index d42a76f..ec2282a 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts +++ b/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts @@ -17,7 +17,7 @@ val storageCommonsVersion = "2.45.0" val lifecycleCommonsVersion = "0.4.0" val poiVersion = "5.2.3" val metricCommonsVersion = "2.1.0" -val persistenceServiceVersion = "2.467.0" +val persistenceServiceVersion = "2.509.0" val springBootStarterVersion = "3.2.3" configurations { 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 9b9f144..1bd2869 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 @@ -162,7 +162,8 @@ public class EntityLogConverterService { getSection(entry, position), checkTextForNull(entry.getLegalBasis()) + " " + getJustificationReason(legalBasisMappings, entry), entry.getLegalBasis(), - entry.getParagraphPageIdx(), getJustificationReason(legalBasisMappings, entry), + entry.getParagraphPageIdx(), + getJustificationReason(legalBasisMappings, entry), checkTextForNull(entry.getTextBefore()) + entry.getValue() + checkTextForNull(entry.getTextAfter()), entry.getValue(), mapOfEntityDisplayName.get(entry.getType()), @@ -191,7 +192,7 @@ public class EntityLogConverterService { return legalBasisMappings.stream() .filter((EntityLogLegalBasis lbm) -> lbm.getTechnicalName().equalsIgnoreCase(entry.getLegalBasis())) .findAny() - .map(EntityLogLegalBasis::getDescription) + .map(EntityLogLegalBasis::getTechnicalName) .orElse(""); }