From 05679289a3b22f72a2ce20e284e6ecfb0fa09d1f Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Thu, 13 Jun 2024 13:32:00 +0300 Subject: [PATCH] RED-9140 - Add more information to changes --- .../v1/processor/service/EntityLogMergeService.java | 2 +- .../v1/server/integration/tests/EntityLogMergeTest.java | 6 +++--- .../v1/api/shared/model/annotations/ChangeFactory.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java index c5a20db4b..ea6e7a885 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java @@ -484,7 +484,7 @@ public class EntityLogMergeService { List changes = new ArrayList<>(); EntryState oldState = entityLogEntry.getState(); EntryState newState = entityLogEntry.getEntryType().equals(EntryType.HINT) ? EntryState.SKIPPED : EntryState.APPLIED; - changes.add(ChangeFactory.toChange(ChangeType.RECATEGORIZE, + changes.add(ChangeFactory.toChange(ChangeType.FORCE_REDACT, forceRedaction.getRequestDate(), analysisNumber, PropertyChange.builder() diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/EntityLogMergeTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/EntityLogMergeTest.java index b69cd69bf..f842f8556 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/EntityLogMergeTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/EntityLogMergeTest.java @@ -185,7 +185,7 @@ public class EntityLogMergeTest { assertEquals(resizeEntryLogEntry.getManualChanges() .get(0).getManualRedactionType(), ManualRedactionType.RESIZE); assertEquals(resizeEntryLogEntry.getChanges() - .get(0).getType(), ChangeType.CHANGED); + .get(0).getType(), ChangeType.RESIZED); assertTrue(resizeEntryLogEntry.getEngines().contains(Engine.MANUAL)); var optionalLegalBasisEntryLogEntry = response.getEntityLogEntry() @@ -200,7 +200,7 @@ public class EntityLogMergeTest { assertEquals(legalBasisEntryLogEntry.getManualChanges() .get(0).getManualRedactionType(), ManualRedactionType.LEGAL_BASIS_CHANGE); assertEquals(legalBasisEntryLogEntry.getChanges() - .get(0).getType(), ChangeType.CHANGED); + .get(0).getType(), ChangeType.LEGAL_BASIS_CHANGE); assertTrue(legalBasisEntryLogEntry.getEngines().contains(Engine.MANUAL)); var optionalForceRedactionEntryLogEntry = response.getEntityLogEntry() @@ -215,7 +215,7 @@ public class EntityLogMergeTest { assertEquals(forceRedactionEntryLogEntry.getManualChanges() .get(0).getManualRedactionType(), ManualRedactionType.FORCE); assertEquals(forceRedactionEntryLogEntry.getChanges() - .get(0).getType(), ChangeType.CHANGED); + .get(0).getType(), ChangeType.FORCE_REDACT); assertTrue(forceRedactionEntryLogEntry.getEngines().contains(Engine.MANUAL)); var optionalRectangleEntryLogEntry = response.getEntityLogEntry() diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/ChangeFactory.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/ChangeFactory.java index 9d73722d5..b86d038bd 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/ChangeFactory.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/ChangeFactory.java @@ -31,7 +31,7 @@ public class ChangeFactory { Arrays.stream(propertyChanges) .forEach(propertyChange -> { - if (!propertyChange.getOldValue().equals(propertyChange.getNewValue())) { + if (propertyChange.getOldValue() != null && propertyChange.getNewValue() != null && !propertyChange.getOldValue().equals(propertyChange.getNewValue())) { change.addChange(propertyChange.getProperty(), ChangeUtils.buildVisualChange(propertyChange.getOldValue(), propertyChange.getNewValue())); } });