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 254b84e..f73ab12 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 @@ -190,9 +190,17 @@ public class EntityLogConverterService { private static String getJustificationReason(List legalBasisMappings, EntityLogEntry entry) { return legalBasisMappings.stream() - .filter((EntityLogLegalBasis lbm) -> lbm.getTechnicalName().equalsIgnoreCase(entry.getLegalBasis())) + .filter((EntityLogLegalBasis lbm) -> { + if (lbm.getTechnicalName() == null) { + return false; + } + if (lbm.getTechnicalName().equalsIgnoreCase(entry.getLegalBasis())) { + return true; + } + return false; + }) .findAny() - .map(EntityLogLegalBasis::getTechnicalName) + .map(EntityLogLegalBasis::getDescription) .orElse(""); }