diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java index ce8cbeda6..c22dd8261 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java @@ -65,20 +65,21 @@ public class EntityLogService { @Observed(name = "EntityLogService", contextualName = "post-process-entity-log") private void postProcessEntityLog(String dossierId, String fileId, EntityLog entityLog, boolean includeUnprocessed) { + EntityLog processedEntityLog = entityLog; var fileStatus = fileStatusService.getStatus(fileId); if (fileStatus.isExcluded()) { - entityLog.setEntityLogEntry(new ArrayList<>()); + processedEntityLog.setEntityLogEntry(new ArrayList<>()); } if (includeUnprocessed) { DossierEntity dossier = dossierService.getDossierById(dossierId); ManualRedactions unprocessedManualRedactions = manualRedactionProviderService.getManualRedactions(fileId, ManualChangesQueryOptions.unprocessedOnly()); - entityLog = entityLogMergeService.mergeEntityLog(unprocessedManualRedactions, entityLog, dossier); + processedEntityLog = entityLogMergeService.mergeEntityLog(unprocessedManualRedactions, processedEntityLog, dossier); } if (fileStatus.getExcludedPages() != null && !fileStatus.getExcludedPages().isEmpty()) { - entityLog.getEntityLogEntry() + processedEntityLog.getEntityLogEntry() .removeIf(entry -> entry.getPositions() .stream() .anyMatch(position -> fileStatus.getExcludedPages().contains(position.getPageNumber())) // @@ -88,7 +89,7 @@ public class EntityLogService { } Map commentCountPerAnnotationId = commentService.getCommentCounts(fileId); - entityLog.getEntityLogEntry() + processedEntityLog.getEntityLogEntry() .forEach(entityLogEntry -> entityLogEntry.setNumberOfComments(commentCountPerAnnotationId.getOrDefault(entityLogEntry.getId(), 0))); }