From 68a9c93d54e445bc290b99e1c63cffe0c8115da1 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Mon, 6 Dec 2021 13:55:14 +0200
Subject: [PATCH] ignore hint that is forced should turn to hint

---
 .../redaction/service/RedactionLogMergeService.java      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
index f0fb70b6..76c27bd8 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
@@ -159,7 +159,14 @@ public class RedactionLogMergeService {
                 var manualForceRedact = (ManualForceRedact) mrw.getItem();
                 String manualOverrideReason = null;
                 if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                    redactionLogEntry.setRedacted(true);
+
+                    // Forcing a skipped hint should result in a hint
+                    if (dictionaryService.isHint(redactionLogEntry.getType(), dossierTemplateId)) {
+                        redactionLogEntry.setHint(true);
+                    } else {
+                        redactionLogEntry.setRedacted(true);
+                    }
+
                     redactionLogEntry.setStatus(Status.APPROVED);
                     redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
                             .isRedacted(), false));