Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-3287: Improve RedactionLog Controller to allow incremental calls

Browse Source
This commit is contained in:
aoezyetimoglu 2022-04-01 15:28:29 +02:00
parent b13c4623b4
commit fabfffcf3d
1 changed files with 21 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java
View File

@ -2,6 +2,7 @@ package com.iqser.red.service.peristence.v1.server.service;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -96,80 +97,44 @@ public class RedactionLogService {
public RedactionLog getFilteredRedactionLog(String dossierId, String fileId, FilteredRedactionLogRequest filteredRedactionLogRequest) { public RedactionLog getFilteredRedactionLog(String dossierId, String fileId, FilteredRedactionLogRequest filteredRedactionLogRequest) {
if(filteredRedactionLogRequest.getSpecifiedDate() == null) { if (filteredRedactionLogRequest.getSpecifiedDate() == null) {
filteredRedactionLogRequest.setSpecifiedDate(OffsetDateTime.MIN); filteredRedactionLogRequest.setSpecifiedDate(OffsetDateTime.MIN);
} }
var redactionLog = getRedactionLog(dossierId, fileId, filteredRedactionLogRequest.getExcludedTypes(), filteredRedactionLogRequest.isWithManualRedactions(), filteredRedactionLogRequest.isIncludeFalsePositives()); var redactionLog = getRedactionLog(dossierId, fileId, filteredRedactionLogRequest.getExcludedTypes(), filteredRedactionLogRequest.isWithManualRedactions(), filteredRedactionLogRequest.isIncludeFalsePositives());
var redactionLogEntries = redactionLog.getRedactionLogEntry();
List<RedactionLogEntry> filteredRedactionLogEntries = new ArrayList<>(); Iterator<RedactionLogEntry> it = redactionLogEntries.iterator();
RedactionLog filteredRedactionLog = new RedactionLog(redactionLog.getAnalysisVersion(), redactionLog.getAnalysisNumber(), filteredRedactionLogEntries, redactionLog.getLegalBasis(), redactionLog.getDictionaryVersion(), redactionLog.getDossierDictionaryVersion(), redactionLog.getRulesVersion(), redactionLog.getLegalBasisVersion()); while (it.hasNext()) {
var redactionLogEntry = it.next();
for (var redactionLogEntry : redactionLog.getRedactionLogEntry()) { boolean isAfterSpecifiedDate = false;
RedactionLogEntry frle = RedactionLogEntry.builder() for (var change : redactionLogEntry.getChanges()) {
.id(redactionLogEntry.getId())
.type(redactionLogEntry.getType())
.value(redactionLogEntry.getValue())
.reason(redactionLogEntry.getReason())
.matchedRule(redactionLogEntry.getMatchedRule())
.rectangle(redactionLogEntry.isRectangle())
.legalBasis(redactionLogEntry.getLegalBasis())
.imported(redactionLogEntry.isImported())
.redacted(redactionLogEntry.isRedacted())
.isHint(redactionLogEntry.isHint())
.isRecommendation(redactionLogEntry.isRecommendation())
.isFalsePositive(redactionLogEntry.isFalsePositive())
.section(redactionLogEntry.getSection())
.color(redactionLogEntry.getColor())
.positions(redactionLogEntry.getPositions())
.sectionNumber(redactionLogEntry.getSectionNumber())
.textBefore(redactionLogEntry.getTextBefore())
.textAfter(redactionLogEntry.getTextAfter())
.startOffset(redactionLogEntry.getStartOffset())
.endOffset(redactionLogEntry.getEndOffset())
.isImage(redactionLogEntry.isImage())
.imageHasTransparency(redactionLogEntry.isImageHasTransparency())
.isDictionaryEntry(redactionLogEntry.isDictionaryEntry())
.isDossierDictionaryEntry(redactionLogEntry.isDossierDictionaryEntry())
.excluded(redactionLogEntry.isExcluded())
.engines(redactionLogEntry.getEngines())
.reference(redactionLogEntry.getReference())
.build();
var changes = redactionLogEntry.getChanges();
List<Change> filteredChanges = new ArrayList<>();
for (var change : changes) {
if (change.getDateTime().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) { if (change.getDateTime().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) {
filteredChanges.add(change); isAfterSpecifiedDate = true;
} }
} }
frle.setChanges(filteredChanges); for (var manualChange : redactionLogEntry.getManualChanges()) {
if (manualChange.getProcessedDate().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) {
var manualChanges = redactionLogEntry.getManualChanges(); isAfterSpecifiedDate = true;
List<ManualChange> filteredManualChanges = new ArrayList<>();
for (var manualChange: manualChanges){
if(manualChange.getProcessedDate().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) {
filteredManualChanges.add(manualChange);
} }
} }
frle.setManualChanges(filteredManualChanges);
var comments = redactionLogEntry.getComments(); var comments = redactionLogEntry.getComments();
List<Comment> filteredComments = new ArrayList<>(); if (comments != null) {
if(comments != null) {
for (var comment : comments) { for (var comment : comments) {
if (comment.getSoftDeletedTime() != null && comment.getSoftDeletedTime().isAfter(filteredRedactionLogRequest.getSpecifiedDate()) || comment.getDate().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) { if (comment.getSoftDeletedTime() != null && comment.getSoftDeletedTime().isAfter(filteredRedactionLogRequest.getSpecifiedDate()) || comment.getDate().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) {
filteredComments.add(comment); isAfterSpecifiedDate = true;
} }
} }
frle.setComments(filteredComments);
} }
filteredRedactionLogEntries.add(frle); if(!isAfterSpecifiedDate) {
} it.remove();
filteredRedactionLog.setRedactionLogEntry(filteredRedactionLogEntries); }
return filteredRedactionLog; }
return redactionLog;
} }
} }