Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-7400: changed logic for flag isLocalManualRedaction

Browse Source
This commit is contained in:
Ali Oezyetimoglu 2023-08-15 12:33:37 +02:00
parent 2eecf7c428
commit 067fb8a814
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/redactionlog/RedactionLogMergeService.java
View File

@ -103,6 +103,7 @@ public class RedactionLogMergeService {
if (excludedPages != null && !excludedPages.isEmpty()) { if (excludedPages != null && !excludedPages.isEmpty()) {
entry.getPositions().forEach(pos -> { entry.getPositions().forEach(pos -> {
if (!entry.isLocalManualRedaction() && excludedPages.contains(pos.getPage())) { if (!entry.isLocalManualRedaction() && excludedPages.contains(pos.getPage())) {
// if (!isLocalManualRedaction(entry.getManualChanges()) && excludedPages.contains(pos.getPage())) {
entry.setExcluded(true); entry.setExcluded(true);
} }
}); });
@ -131,6 +132,12 @@ public class RedactionLogMergeService {
return redactionLog; return redactionLog;
} }
// private boolean isLocalManualRedaction(List<ManualChange> manualChanges) {
//
// return manualChanges != null && manualChanges.stream()
// .anyMatch(mc -> (mc.getManualRedactionType() == ManualRedactionType.ADD_LOCALLY || mc.getManualRedactionType() == ManualRedactionType.RESIZE) && mc.getAnnotationStatus() == AnnotationStatus.APPROVED);
// }
private List<ManualRedactionWrapper> createManualRedactionWrappers(ManualRedactions manualRedactions) { private List<ManualRedactionWrapper> createManualRedactionWrappers(ManualRedactions manualRedactions) {

7
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/redactionlog/RedactionLogEntry.java
View File

@ -87,12 +87,7 @@ public class RedactionLogEntry {
public boolean isLocalManualRedaction() { public boolean isLocalManualRedaction() {
return manualChanges != null && manualChanges.stream() return manualChanges != null && manualChanges.stream()
.anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.ADD_LOCALLY && mc.getAnnotationStatus() == AnnotationStatus.APPROVED .anyMatch(mc -> (mc.getManualRedactionType() == ManualRedactionType.ADD_LOCALLY || mc.getManualRedactionType() == ManualRedactionType.RESIZE) && mc.getAnnotationStatus() == AnnotationStatus.APPROVED);
|| isResizeRedaction(mc));
}
private boolean isResizeRedaction(ManualChange mc) {
return mc.getManualRedactionType() == ManualRedactionType.RESIZE && mc.getAnnotationStatus() == AnnotationStatus.APPROVED;
} }