From 7e7bec0b4a1124348dbea66afaa049a436a188c8 Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Tue, 28 Nov 2023 12:09:38 +0200 Subject: [PATCH] RED-7784 - Don't add to report unprocessed manual add dict and image recategorizations --- .../v1/server/service/EntityLogConverterService.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java index 0f944c6..b0af077 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java @@ -117,7 +117,17 @@ public class EntityLogConverterService { return; } - if (!entry.getManualChanges().isEmpty() && (entry.isDictionaryEntry() || entry.isDossierDictionaryEntry()) && entry.getManualChanges().get(entry.getManualChanges().size() - 1).getProcessedDate() == null) { + if (!entry.getManualChanges().isEmpty() + && (entry.getEntryType() == EntryType.IMAGE || entry.getEntryType() == EntryType.IMAGE_HINT) + && entry.getManualChanges().get(entry.getManualChanges().size() - 1).getProcessedDate() == null + && entry.getManualChanges().get(entry.getManualChanges().size() - 1).getManualRedactionType().equals(ManualRedactionType.RECATEGORIZE)) { + return; + } + + if (!entry.getManualChanges().isEmpty() + && (entry.isDictionaryEntry() || entry.isDossierDictionaryEntry()) + && entry.getManualChanges().get(entry.getManualChanges().size() - 1).getProcessedDate() == null + && entry.getManualChanges().get(entry.getManualChanges().size() - 1).getManualRedactionType().equals(ManualRedactionType.ADD_TO_DICTIONARY)) { return; }