Marmelator/redaction-report-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 129 Wiki Activity

Merge branch 'RED-7784-additional-fixes' into 'master'

Browse Source 
RED-7784 - Don't add to report unprocessed manual add dict and image recategorizations

Closes RED-7784

See merge request redactmanager/redaction-report-service!37
This commit is contained in:
Andrei Isvoran 2023-11-28 12:50:34 +01:00
commit 178fbef9c2
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java
View File

@ -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;
}