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

Pull request #192: RED-1830

Browse Source 
Merge in RED/redaction-service from RED-1830 to master

* commit 'd4486ea6f4d31d68a2c75ec5e192f2a3bd62443c':
  fixed PMD
  fixed undo after reanalysis
This commit is contained in:
Timo Bejan 2021-07-19 12:02:54 +02:00
commit 26def889d8
1 changed files with 12 additions and 7 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/RedactionLogCreatorService.java
View File

@ -667,16 +667,21 @@ public class RedactionLogCreatorService {
// Cannot undo Already Approved change because UI won't allow it for now
if (Status.REQUESTED.equals(entry.getStatus())) {
if (entry.getManualRedactionType() == ManualRedactionType.RECATEGORIZE) {
entry.setManual(false);
entry.setStatus(null);
entry.setRecategorizationType(null);
var recategorizeExists = manualRedactions.getImageRecategorizations().stream().anyMatch(entryToAdd -> entryToAdd.getId().equalsIgnoreCase(entry.getId()));
if (!recategorizeExists) {
entry.setManual(false);
entry.setStatus(null);
entry.setRecategorizationType(null);
}
}
if (entry.getManualRedactionType() == ManualRedactionType.LEGAL_BASIS_CHANGE) {
entry.setManual(false);
entry.setStatus(null);
entry.setLegalBasisChangeValue(null);
var legalBasisChangeExists = manualRedactions.getImageRecategorizations().stream().anyMatch(entryToAdd -> entryToAdd.getId().equalsIgnoreCase(entry.getId()));
if (!legalBasisChangeExists) {
entry.setManual(false);
entry.setStatus(null);
entry.setLegalBasisChangeValue(null);
}
}
}
}