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

RM-76: Ignore excluded page logic in stored redactionLog, always set value in RedactionLogMerge #221

Merged
dominique.eiflaender1 merged 1 commits from RM-76 into release/3.222.x 2023-12-04 16:40:06 +01:00
Conversation 4 Commits 1 Files Changed 1 +5 -1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
View File

@ -109,7 +109,7 @@ public class RedactionLogMergeService {
var skippedImportedRedactions = new HashSet<>(); var skippedImportedRedactions = new HashSet<>();
log.info("Merging Redaction log with manual redactions"); log.info("Merging Redaction log with manual redactions");
if (manualRedactions != null) { if (manualRedactions != null) { // This is never null! Could be removed
var manualRedactionLogEntries = addManualAddEntries(sectionGrid, var manualRedactionLogEntries = addManualAddEntries(sectionGrid,
manualRedactions.getEntriesToAdd(), manualRedactions.getEntriesToAdd(),
@ -136,8 +136,12 @@ public class RedactionLogMergeService {
entry.getPositions().forEach(pos -> { entry.getPositions().forEach(pos -> {
if (!entry.isLocalManualRedaction() && excludedPages.contains(pos.getPage())) { if (!entry.isLocalManualRedaction() && excludedPages.contains(pos.getPage())) {
entry.setExcluded(true); entry.setExcluded(true);
} else {
entry.setExcluded(false); // This is a workaround, because in the analysis exlcuded is also set, but should not, because it triggers no reanalyis
} }
}); });
} else {
entry.setExcluded(false); // This is a workaround, because in the analysis exlcuded is also set, but should not, because it triggers no reanalyis
} }
} }