From 0f3cc144098c2b4a33190ff74206e6cc3ac288da Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Thu, 2 Nov 2023 09:34:17 +0100 Subject: [PATCH] RED-7784 - Add state for unprocessed redactions --- .../management/v1/processor/service/EntityLogService.java | 4 +++- .../peristence/v1/server/integration/tests/EntityLogTest.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java index 06b909f56..98abf835a 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java @@ -161,13 +161,15 @@ public class EntityLogService { .dateTime(OffsetDateTime.now()) .type(ChangeType.ADDED) .build()); + boolean isHint = isHint(manualRedactionEntry.getType(), dossierTemplateId); entityLog.getEntityLogEntry().add(EntityLogEntry.builder() .id(manualRedactionEntry.getAnnotationId()) .type(manualRedactionEntry.getType()) .value(manualRedactionEntry.getValue()) .legalBasis(manualRedactionEntry.getLegalBasis()) .reason(manualRedactionEntry.getReason()) - .entryType(isHint(manualRedactionEntry.getType(), dossierTemplateId) ? EntryType.HINT : EntryType.ENTITY) + .entryType(isHint ? EntryType.HINT : EntryType.ENTITY) + .state(isHint ? EntryState.SKIPPED : EntryState.APPLIED) .imported(false) .matchedRule("") .section(manualRedactionEntry.getSection()) diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/EntityLogTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/EntityLogTest.java index d0899c48c..c3f2339ae 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/EntityLogTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/EntityLogTest.java @@ -132,7 +132,7 @@ public class EntityLogTest { var entityLogEntry = optionalEntityLogEntry.get(); assertEquals(entityLogEntry.getType(), "manual"); assertEquals(entityLogEntry.getEntryType(), EntryType.ENTITY); - assertNull(entityLogEntry.getState()); + assertEquals(entityLogEntry.getState(), EntryState.APPLIED); assertEquals(entityLogEntry.getValue(), "Test"); assertEquals(entityLogEntry.getReason(), "Reason"); assertEquals(entityLogEntry.getTextAfter(), "textAfter");