Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-9140 - Add more information to changes

Browse Source
This commit is contained in:
Andrei Isvoran 2024-06-13 13:32:00 +03:00
parent 9a64c0f2d7
commit 05679289a3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java
View File

@ -484,7 +484,7 @@ public class EntityLogMergeService {
List<Change> 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()

6
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/EntityLogMergeTest.java
View File

@ -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()

2
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/ChangeFactory.java
View File

@ -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()));
}
});