From 5cb7510aacdac6e15494dc85d20e0b80331a29dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Mon, 17 Jun 2024 13:04:03 +0200 Subject: [PATCH] RED-9274: Set state REMOVED if last change is REMOVED in migration --- .../redaction/v1/server/model/MigrationEntity.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/MigrationEntity.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/MigrationEntity.java index bf31e2c2..37857744 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/MigrationEntity.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/MigrationEntity.java @@ -14,6 +14,8 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; +import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Change; +import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ChangeType; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryState; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryType; @@ -214,6 +216,12 @@ public final class MigrationEntity { entityLogEntry.setValue("Imported Redaction"); } + if(entityLogEntry.getChanges() != null + && !entityLogEntry.getChanges().isEmpty() + && entityLogEntry.getChanges().stream().map(Change::getType).toList().get(entityLogEntry.getChanges().size() - 1).equals(ChangeType.REMOVED)) { + entityLogEntry.setState(EntryState.REMOVED); + } + return entityLogEntry; } -- 2.47.2