From abb48d46f95ab218c790dece094a44b8e9ccf86c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Thu, 8 Jul 2021 11:31:27 +0200 Subject: [PATCH] RED-1755: Fixed hasHints flag at excluded pages --- .../redaction/service/AnalyzeResponseService.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeResponseService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeResponseService.java index 80589a8f..ff772521 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeResponseService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeResponseService.java @@ -4,13 +4,19 @@ import com.iqser.red.service.redaction.v1.model.AnalyzeResult; import com.iqser.red.service.redaction.v1.model.RedactionChangeLog; import com.iqser.red.service.redaction.v1.model.RedactionLog; import com.iqser.red.service.redaction.v1.model.RedactionLogEntry; + import org.springframework.stereotype.Service; @Service public class AnalyzeResponseService { - public AnalyzeResult createAnalyzeResponse(String dossierId, String fileId, long duration, int pageCount, RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) { - boolean hasHints = redactionLog.getRedactionLogEntry().stream().anyMatch(entry -> entry.isHint() && !entry.getType().equals("false_positive")); + public AnalyzeResult createAnalyzeResponse(String dossierId, String fileId, long duration, int pageCount, + RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) { + + boolean hasHints = redactionLog.getRedactionLogEntry() + .stream() + .filter(entry -> !entry.isExcluded()) + .anyMatch(entry -> entry.isHint() && !entry.getType().equals("false_positive")); boolean hasRequests = redactionLog.getRedactionLogEntry() .stream() @@ -31,7 +37,9 @@ public class AnalyzeResponseService { boolean hasUpdates = redactionChangeLog != null && redactionChangeLog.getRedactionLogEntry() != null && !redactionChangeLog .getRedactionLogEntry() - .isEmpty() && redactionChangeLog.getRedactionLogEntry().stream().anyMatch(entry -> !entry.getType().equals("false_positive")); + .isEmpty() && redactionChangeLog.getRedactionLogEntry() + .stream() + .anyMatch(entry -> !entry.getType().equals("false_positive")); return AnalyzeResult.builder() .dossierId(dossierId) @@ -49,4 +57,5 @@ public class AnalyzeResponseService { .dossierDictionaryVersion(redactionLog.getDossierDictionaryVersion()) .build(); } + }