From dd585a13fd8d37319ce695eeb39a87ff197bec15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Wed, 18 Aug 2021 10:02:37 +0200 Subject: [PATCH] RED-1755: Calculate falgs in file-management-service async --- .../redaction/v1/model/AnalyzeResult.java | 4 --- .../service/AnalyzeResponseService.java | 25 ------------------- 2 files changed, 29 deletions(-) diff --git a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/AnalyzeResult.java b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/AnalyzeResult.java index 8d569c81..4fc3fada 100644 --- a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/AnalyzeResult.java +++ b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/AnalyzeResult.java @@ -15,10 +15,6 @@ public class AnalyzeResult { private String fileId; private long duration; private int numberOfPages; - private boolean hasHints; - private boolean hasRequests; - private boolean hasRedactions; - private boolean hasImages; private boolean hasUpdates; private long dictionaryVersion; private long dossierDictionaryVersion; 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 2ddbcc46..a2e40ee4 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 @@ -19,27 +19,6 @@ public class AnalyzeResponseService { 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() - .filter(entry -> !entry.isExcluded()) - .anyMatch(entry -> entry.isManual() && entry.getStatus() - .equals(com.iqser.red.service.redaction.v1.model.Status.REQUESTED)); - - boolean hasRedactions = redactionLog.getRedactionLogEntry() - .stream() - .filter(entry -> !entry.isExcluded()) - .anyMatch(entry -> entry.isRedacted() && !entry.isManual() || entry.isManual() && entry.getStatus() - .equals(com.iqser.red.service.redaction.v1.model.Status.APPROVED)); - - boolean hasImages = redactionLog.getRedactionLogEntry() - .stream() - .filter(entry -> !entry.isExcluded()) - .anyMatch(entry -> entry.isHint() && entry.getType().equals("image") || entry.isImage()); boolean hasUpdates = redactionChangeLog != null && redactionChangeLog.getRedactionLogEntry() != null && !redactionChangeLog .getRedactionLogEntry() @@ -52,10 +31,6 @@ public class AnalyzeResponseService { .fileId(fileId) .duration(duration) .numberOfPages(pageCount) - .hasHints(hasHints) - .hasRedactions(hasRedactions) - .hasRequests(hasRequests) - .hasImages(hasImages) .hasUpdates(hasUpdates) .analysisVersion(redactionServiceSettings.getAnalysisVersion()) .rulesVersion(redactionLog.getRulesVersion())