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

added user-id to all manual entries

Browse Source
This commit is contained in:
Timo Bejan 2021-08-05 15:35:06 +03:00
parent 4bdca5644a
commit 30715cdcb8
2 changed files with 6 additions and 0 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/RedactionLogEntry.java
View File

@ -36,6 +36,7 @@ public class RedactionLogEntry {
private boolean manual; private boolean manual;
private Status status; private Status status;
private ManualRedactionType manualRedactionType; private ManualRedactionType manualRedactionType;
private String manualRedactionUserId;
private boolean isDictionaryEntry; private boolean isDictionaryEntry;
private String textBefore; private String textBefore;

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

@ -61,6 +61,7 @@ public class RedactionLogMergeService {
redactionLogEntry.setStatus(Status.DECLINED); redactionLogEntry.setStatus(Status.DECLINED);
} }
redactionLogEntry.setManualRedactionUserId(recategorization.getUser());
redactionLogEntry.setReason(manualOverrideReason); redactionLogEntry.setReason(manualOverrideReason);
redactionLogEntry.setManual(true); redactionLogEntry.setManual(true);
redactionLogEntry.setManualRedactionType(ManualRedactionType.RECATEGORIZE); redactionLogEntry.setManualRedactionType(ManualRedactionType.RECATEGORIZE);
@ -88,6 +89,7 @@ public class RedactionLogMergeService {
redactionLogEntry.setReason(manualOverrideReason); redactionLogEntry.setReason(manualOverrideReason);
redactionLogEntry.setManual(true); redactionLogEntry.setManual(true);
redactionLogEntry.setManualRedactionUserId(manualRemoval.getUser());
redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE); redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
redactionLogEntry.setDictionaryEntry(manualRemoval.isRemoveFromDictionary()); redactionLogEntry.setDictionaryEntry(manualRemoval.isRemoveFromDictionary());
redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary()); redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary());
@ -114,6 +116,7 @@ public class RedactionLogMergeService {
redactionLogEntry.setStatus(Status.DECLINED); redactionLogEntry.setStatus(Status.DECLINED);
} }
redactionLogEntry.setManualRedactionUserId(manualForceRedact.getUser());
redactionLogEntry.setReason(manualOverrideReason); redactionLogEntry.setReason(manualOverrideReason);
redactionLogEntry.setManual(true); redactionLogEntry.setManual(true);
redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT); redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
@ -139,6 +142,7 @@ public class RedactionLogMergeService {
redactionLogEntry.setStatus(Status.DECLINED); redactionLogEntry.setStatus(Status.DECLINED);
} }
redactionLogEntry.setManualRedactionUserId(manualLegalBasisChange.getUser());
redactionLogEntry.setReason(manualOverrideReason); redactionLogEntry.setReason(manualOverrideReason);
redactionLogEntry.setManual(true); redactionLogEntry.setManual(true);
redactionLogEntry.setManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE); redactionLogEntry.setManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
@ -209,6 +213,7 @@ public class RedactionLogMergeService {
.manual(true) .manual(true)
.status(manualRedactionEntry.getStatus()) .status(manualRedactionEntry.getStatus())
.manualRedactionType(ManualRedactionType.ADD) .manualRedactionType(ManualRedactionType.ADD)
.manualRedactionUserId(manualRedactionEntry.getUser())
.build(); .build();
} }