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

legal basis can change value for rectangles

Browse Source
This commit is contained in:
Timo Bejan 2021-11-28 22:29:58 +02:00
parent 8250714e32
commit 48c100c25a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualLegalBasisChange.java
View File

@ -18,6 +18,7 @@ public class ManualLegalBasisChange {
private Status status; private Status status;
private String legalBasis; private String legalBasis;
private String section; private String section;
private String value;
private OffsetDateTime requestDate; private OffsetDateTime requestDate;
private OffsetDateTime processedDate; private OffsetDateTime processedDate;

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

@ -182,6 +182,9 @@ public class RedactionLogMergeService {
if (manualLegalBasisChange.getSection() != null) { if (manualLegalBasisChange.getSection() != null) {
redactionLogEntry.setSection(manualLegalBasisChange.getSection()); redactionLogEntry.setSection(manualLegalBasisChange.getSection());
} }
if (redactionLogEntry.isRectangle() && manualLegalBasisChange.getValue() != null) {
redactionLogEntry.setValue(manualLegalBasisChange.getValue());
}
} else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) { } else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) {
manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested"); manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
redactionLogEntry.setStatus(Status.REQUESTED); redactionLogEntry.setStatus(Status.REQUESTED);
@ -218,8 +221,8 @@ public class RedactionLogMergeService {
private List<RedactionLogEntry> addManualAddEntries(SectionGrid sectionGrid, private List<RedactionLogEntry> addManualAddEntries(SectionGrid sectionGrid,
Set<ManualRedactionEntry> manualAdds, Set<ManualRedactionEntry> manualAdds,
Map<String, List<Comment>> comments, String dossierTemplateId) { Map<String, List<Comment>> comments, String dossierTemplateId) {
List<RedactionLogEntry> redactionLogEntries = new ArrayList<>(); List<RedactionLogEntry> redactionLogEntries = new ArrayList<>();