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

RedactionLogMergeService.java edited online with Bitbucket

Browse Source
This commit is contained in:
Timo Bejan 2021-08-13 13:19:42 +02:00
parent e43e8bccbf
commit 5312d5ffdf
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ public class RedactionLogMergeService {
processRedactionLogEntry(manualRedactionWrappers.stream().filter(mr -> entry.getId().equals(mr.getId())) processRedactionLogEntry(manualRedactionWrappers.stream().filter(mr -> entry.getId().equals(mr.getId()))
.collect(Collectors.toList()), dossierTemplateId, entry); .collect(Collectors.toList()), dossierTemplateId, entry);
entry.setComments(manualRedactions.getComments().get(entry.getId())); entry.setComments(manualRedactions.getComments().get(entry.getId()));
} }
@ -47,30 +48,30 @@ public class RedactionLogMergeService {
private List<ManualRedactionWrapper> createManualRedactionWrappers(ManualRedactions manualRedactions) { private List<ManualRedactionWrapper> createManualRedactionWrappers(ManualRedactions manualRedactions) {
List<ManualRedactionWrapper> manualRedactionWrappers = new ArrayList<>();
log.info("Processing Manual Redactions: {}", manualRedactions); log.info("Processing Manual Redactions: {}", manualRedactions);
List<ManualRedactionWrapper> manualRedactionWrappers = new ArrayList<>();
manualRedactions.getImageRecategorizations().forEach(item -> { manualRedactions.getImageRecategorizations().forEach(item -> {
if (item.getSoftDeletedTime() == null) { if (item.getSoftDeletedTime() != null) {
manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item)); manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
} }
}); });
manualRedactions.getIdsToRemove().forEach(item -> { manualRedactions.getIdsToRemove().forEach(item -> {
if (item.getSoftDeletedTime() == null) { if (item.getSoftDeletedTime() != null) {
manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item)); manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
} }
}); });
manualRedactions.getForceRedacts().forEach(item -> { manualRedactions.getForceRedacts().forEach(item -> {
if (item.getSoftDeletedTime() == null) { if (item.getSoftDeletedTime() != null) {
manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item)); manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
} }
}); });
manualRedactions.getManualLegalBasisChanges().forEach(item -> { manualRedactions.getManualLegalBasisChanges().forEach(item -> {
if (item.getSoftDeletedTime() == null) { if (item.getSoftDeletedTime() != null) {
manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item)); manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
} }
}); });
@ -84,6 +85,8 @@ public class RedactionLogMergeService {
private void processRedactionLogEntry(List<ManualRedactionWrapper> manualRedactionWrappers, String dossierTemplateId, RedactionLogEntry redactionLogEntry) { private void processRedactionLogEntry(List<ManualRedactionWrapper> manualRedactionWrappers, String dossierTemplateId, RedactionLogEntry redactionLogEntry) {
log.info("Processing: {} for: {}", manualRedactionWrappers, redactionLogEntry);
manualRedactionWrappers.forEach(mrw -> { manualRedactionWrappers.forEach(mrw -> {
if (mrw.getItem() instanceof ManualImageRecategorization) { if (mrw.getItem() instanceof ManualImageRecategorization) {
@ -287,3 +290,4 @@ public class RedactionLogMergeService {
} }