From 8e7b4452996a1e67c2c99d3f997162ce8648c162 Mon Sep 17 00:00:00 2001 From: deiflaender Date: Thu, 13 Jan 2022 10:55:19 +0100 Subject: [PATCH] RED-3173: Fixed wrong skipped redaction afer remove and readd to dictionary --- .../v1/server/redaction/service/EntityRedactionService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java index 183bdd13..686e28e8 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java @@ -94,7 +94,7 @@ public class EntityRedactionService { .collect(Collectors.toList()); // only approved id removals, that haven't been forced back afterwards var idsToRemove = analyzeRequest.getManualRedactions().getIdsToRemove().stream() - .filter(idr -> idr.getStatus() == AnnotationStatus.APPROVED) + .filter(idr -> idr.getStatus() == AnnotationStatus.APPROVED && !idr.isRemoveFromDictionary()) .filter(idr -> idr.getRequestDate() != null) .filter(idr -> approvedForceRedactions.stream().noneMatch(forceRedact -> forceRedact.getRequestDate().isAfter(idr.getRequestDate()))) .map(IdRemoval::getAnnotationId).collect(Collectors.toSet());