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

Pull request #209: logs

Browse Source 
Merge in RED/redaction-service from realease/2.52x-fix to release/2.52.x

* commit 'b1f73fb5b169710a56a74a9ecb55b7e0cc4b7b88':
  logs
This commit is contained in:
Timo Bejan 2021-08-13 12:33:09 +02:00
commit de2282bc24
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
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()));
} }
@ -48,27 +49,26 @@ public class RedactionLogMergeService {
private List<ManualRedactionWrapper> createManualRedactionWrappers(ManualRedactions manualRedactions) { private List<ManualRedactionWrapper> createManualRedactionWrappers(ManualRedactions manualRedactions) {
List<ManualRedactionWrapper> manualRedactionWrappers = new ArrayList<>(); List<ManualRedactionWrapper> manualRedactionWrappers = new ArrayList<>();
manualRedactions.getForceRedacts().forEach(item -> {
if (item.getSoftDeletedTime() != null) { manualRedactions.getImageRecategorizations().forEach(item -> {
manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
}
});
manualRedactions.getEntriesToAdd().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.getManualLegalBasisChanges().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.getImageRecategorizations().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));
} }
@ -76,12 +76,15 @@ public class RedactionLogMergeService {
Collections.sort(manualRedactionWrappers); Collections.sort(manualRedactionWrappers);
log.info("Obtained manual redaction wrappers: {}", manualRedactionWrappers);
return manualRedactionWrappers; return manualRedactionWrappers;
} }
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) {