RED-8034: Filter out entityLog entries for excluded pages #286
@ -71,8 +71,8 @@ public class EntityLogService {
|
|||||||
|
|
||||||
if (fileStatus.getExcludedPages() != null && !fileStatus.getExcludedPages().isEmpty()) {
|
if (fileStatus.getExcludedPages() != null && !fileStatus.getExcludedPages().isEmpty()) {
|
||||||
entityLog.getEntityLogEntry()
|
entityLog.getEntityLogEntry()
|
||||||
.forEach(entry -> entry.setExcluded(entry.getPositions().stream().anyMatch(position -> fileStatus.getExcludedPages().contains(position.getPageNumber())) //
|
.removeIf(entry -> entry.getPositions().stream().anyMatch(position -> fileStatus.getExcludedPages().contains(position.getPageNumber())) //
|
||||||
&& entry.getManualChanges().stream().noneMatch(m -> m.getManualRedactionType().equals(ManualRedactionType.ADD_LOCALLY))));
|
&& entry.getManualChanges().stream().noneMatch(m -> m.getManualRedactionType().equals(ManualRedactionType.ADD_LOCALLY)));
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, Integer> commentCountPerAnnotationId = commentService.getCommentCounts(fileId);
|
Map<String, Integer> commentCountPerAnnotationId = commentService.getCommentCounts(fileId);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user