Merge branch 'RED-8427' into 'master'

RED-8427 - Last manual change for Force Hint action should be FORCE_HINT

Closes RED-8427

See merge request redactmanager/persistence-service!332
This commit is contained in:
Corina Olariu 2024-02-02 11:12:02 +01:00
commit bb58667bb2

View File

@ -284,7 +284,7 @@ public class EntityLogMergeService {
entityLogEntry.setState(entityLogEntry.getEntryType().equals(EntryType.HINT) ? EntryState.SKIPPED : EntryState.APPLIED);
addChanges(entityLogEntry.getChanges(), ChangeType.CHANGED, analysisNumber, forceRedaction.getRequestDate());
var forceRedactManualChange = ManualChange.builder()
.manualRedactionType(ManualRedactionType.FORCE_REDACT)
.manualRedactionType(entityLogEntry.getEntryType().equals(EntryType.HINT) ? ManualRedactionType.FORCE_HINT : ManualRedactionType.FORCE_REDACT)
.requestedDate(forceRedaction.getRequestDate())
.processedDate(forceRedaction.getProcessedDate())
.userId(forceRedaction.getUser());