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

RED-7784 - Apply correct value in reports for resized redactions

Browse Source
This commit is contained in:
Andrei Isvoran 2023-11-20 16:02:34 +01:00
parent 9882a9ae9b
commit b8202d9e96
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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

@ -21,6 +21,8 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogLegalBasis;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryState;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryType;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualChange;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualRedactionType;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.Type;
import com.iqser.red.service.redaction.report.v1.server.client.DictionaryClient;
@ -136,7 +138,7 @@ public class EntityLogConverterService {
.map(EntityLogLegalBasis::getDescription)
.orElse(""),
checkTextForNull(entry.getTextBefore()) + entry.getValue() + checkTextForNull(entry.getTextAfter()),
entry.getValue(),
determineValue(entry),
mapOfEntityDisplayName.get(entry.getType()),
isSkipped));
}
@ -158,6 +160,18 @@ public class EntityLogConverterService {
return reportEntries;
}
private String determineValue(EntityLogEntry entry) {
if (entry.getManualChanges() != null && !entry.getManualChanges().isEmpty()) {
ManualChange lastChange = entry.getManualChanges().get(entry.getManualChanges().size() - 1);
if (lastChange.getManualRedactionType().equals(ManualRedactionType.RESIZE)) {
return lastChange.getPropertyChanges().get("value");
}
}
return entry.getValue();
}
private String getSection(EntityLogEntry entry, Position position) {