From b5794f7fdf80611810c3c535f3e2b12a2cc5daee Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Tue, 19 Dec 2023 17:14:49 +0200 Subject: [PATCH] RED-7784 - Don't update changes dateTime on every merge. --- .../processor/service/EntityLogMergeService.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 3e72f3c2b..eee21fdec 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 @@ -181,7 +181,7 @@ public class EntityLogMergeService { private void mergeIdsToRemove(IdRemoval idRemoval, EntityLogEntry entityLogEntry, int analysisNumber) { entityLogEntry.setState(EntryState.IGNORED); - addChanges(entityLogEntry.getChanges(), ChangeType.REMOVED, analysisNumber); + addChanges(entityLogEntry.getChanges(), ChangeType.REMOVED, analysisNumber, idRemoval.getRequestDate()); entityLogEntry.getManualChanges().add(ManualChange.builder() .manualRedactionType(ManualRedactionType.REMOVE_LOCALLY) .requestedDate(idRemoval.getRequestDate()) @@ -194,7 +194,7 @@ public class EntityLogMergeService { entityLogEntry.setTextAfter(manualResizeRedaction.getTextAfter()); entityLogEntry.setTextBefore(manualResizeRedaction.getTextBefore()); entityLogEntry.setPositions(convertPositions(manualResizeRedaction.getPositions())); - addChanges(entityLogEntry.getChanges(), ChangeType.CHANGED, analysisNumber); + addChanges(entityLogEntry.getChanges(), ChangeType.CHANGED, analysisNumber, manualResizeRedaction.getRequestDate()); entityLogEntry.getManualChanges().add(ManualChange.builder() .manualRedactionType(ManualRedactionType.RESIZE) .requestedDate(manualResizeRedaction.getRequestDate()) @@ -208,7 +208,7 @@ public class EntityLogMergeService { entityLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis()); entityLogEntry.setSection(manualLegalBasisChange.getSection()); entityLogEntry.setValue(manualLegalBasisChange.getValue()); - addChanges(entityLogEntry.getChanges(), ChangeType.CHANGED, analysisNumber); + addChanges(entityLogEntry.getChanges(), ChangeType.CHANGED, analysisNumber, manualLegalBasisChange.getRequestDate()); entityLogEntry.getManualChanges().add(ManualChange.builder() .manualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE) .requestedDate(manualLegalBasisChange.getRequestDate()) @@ -226,7 +226,7 @@ public class EntityLogMergeService { entityLogEntry.setType(recategorization.getType()); entityLogEntry.setEntryType(getEntryType(isHint, recategorization.getType())); entityLogEntry.setState(isHint ? EntryState.SKIPPED : EntryState.APPLIED); - addChanges(entityLogEntry.getChanges(), ChangeType.CHANGED, analysisNumber); + addChanges(entityLogEntry.getChanges(), ChangeType.CHANGED, analysisNumber, recategorization.getRequestDate()); entityLogEntry.getManualChanges().add(ManualChange.builder() .manualRedactionType(ManualRedactionType.RECATEGORIZE) .requestedDate(recategorization.getRequestDate()) @@ -259,7 +259,7 @@ public class EntityLogMergeService { entityLogEntry.setLegalBasis(forceRedaction.getLegalBasis()); entityLogEntry.setState(EntryState.APPLIED); - addChanges(entityLogEntry.getChanges(), ChangeType.CHANGED, analysisNumber); + addChanges(entityLogEntry.getChanges(), ChangeType.CHANGED, analysisNumber, forceRedaction.getRequestDate()); var forceRedactManualChange = ManualChange.builder() .manualRedactionType(ManualRedactionType.FORCE_REDACT) .requestedDate(forceRedaction.getRequestDate()) @@ -271,12 +271,12 @@ public class EntityLogMergeService { entityLogEntry.getManualChanges().add(forceRedactManualChange.build()); } - private void addChanges(List changes, ChangeType changeType, int analysisNumber) { + private void addChanges(List changes, ChangeType changeType, int analysisNumber, OffsetDateTime offsetDateTime) { if (!changes.isEmpty()) { changes.add(Change.builder() .analysisNumber(analysisNumber + 1) - .dateTime(OffsetDateTime.now()) + .dateTime(offsetDateTime) .type(changeType) .build()); } else { -- 2.47.2