added dates to model classes for manual redactions

This commit is contained in:
Timo 2021-07-13 11:34:08 +03:00
parent 3517841d24
commit 279fdc6985
6 changed files with 35 additions and 4 deletions

View File

@ -5,6 +5,8 @@ import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.time.OffsetDateTime;
@Data @Data
@Builder @Builder
@AllArgsConstructor @AllArgsConstructor
@ -16,4 +18,8 @@ public class IdRemoval {
private Status status; private Status status;
private boolean removeFromDictionary; private boolean removeFromDictionary;
} private OffsetDateTime requestDate;
private OffsetDateTime processedDate;
private OffsetDateTime softDeletedTime;
}

View File

@ -5,6 +5,8 @@ import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.time.OffsetDateTime;
@Data @Data
@Builder @Builder
@AllArgsConstructor @AllArgsConstructor
@ -16,4 +18,8 @@ public class ManualForceRedact {
private Status status; private Status status;
private String legalBasis; private String legalBasis;
} private OffsetDateTime requestDate;
private OffsetDateTime processedDate;
private OffsetDateTime softDeletedTime;
}

View File

@ -5,6 +5,8 @@ import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.time.OffsetDateTime;
@Data @Data
@Builder @Builder
@AllArgsConstructor @AllArgsConstructor
@ -18,4 +20,8 @@ public class ManualImageRecategorization {
private String legalBasis; private String legalBasis;
private boolean redacted; private boolean redacted;
} private OffsetDateTime requestDate;
private OffsetDateTime processedDate;
private OffsetDateTime softDeletedTime;
}

View File

@ -5,6 +5,8 @@ import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.time.OffsetDateTime;
@Data @Data
@Builder @Builder
@AllArgsConstructor @AllArgsConstructor
@ -16,4 +18,8 @@ public class ManualLegalBasisChange {
private Status status; private Status status;
private String legalBasis; private String legalBasis;
} private OffsetDateTime requestDate;
private OffsetDateTime processedDate;
private OffsetDateTime softDeletedTime;
}

View File

@ -5,6 +5,7 @@ import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.time.OffsetDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -29,4 +30,8 @@ public class ManualRedactionEntry {
private boolean addToDossierDictionary; private boolean addToDossierDictionary;
private OffsetDateTime requestDate;
private OffsetDateTime processedDate;
private OffsetDateTime softDeletedTime;
} }

View File

@ -641,6 +641,8 @@ public class RedactionLogCreatorService {
redactionLogEntry.setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary()); redactionLogEntry.setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary());
redactionLogEntry.setPositions(manualRedaction.getPositions()); redactionLogEntry.setPositions(manualRedaction.getPositions());
manualRedaction.
var found = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getId().equalsIgnoreCase(redactionLogEntry.getId())).findAny(); var found = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getId().equalsIgnoreCase(redactionLogEntry.getId())).findAny();
if (found.isPresent()) { if (found.isPresent()) {
found.get().setDictionaryEntry(manualRedaction.isAddToDossierDictionary()); found.get().setDictionaryEntry(manualRedaction.isAddToDossierDictionary());