Marmelator/redaction-report-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 129 Wiki Activity

Merge remote-tracking branch 'origin/feature/RED-10115' into feature/RED-10115

Browse Source
This commit is contained in:
maverickstuder 2024-11-13 13:01:45 +01:00
commit d2b64fcfb2
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java
View File

@ -161,21 +161,17 @@ public class EntityLogConverterService {
Optional<EntityLogLegalBasis> 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())