From 5d3d15a3dcddb95b251b5ea3f6dcf117b3eae8a6 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti Date: Thu, 18 Jan 2024 19:16:46 +0100 Subject: [PATCH] [Fix_1960] Always setting enter date --- .../merger/ProcessInstanceNodeDataEventMerger.java | 11 ++++++----- .../jpa/storage/ProcessInstanceEntityStorage.java | 12 +++++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceNodeDataEventMerger.java b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceNodeDataEventMerger.java index d2bfac1cbb..f3442d24b9 100644 --- a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceNodeDataEventMerger.java +++ b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceNodeDataEventMerger.java @@ -18,6 +18,7 @@ */ package org.kie.kogito.index.storage.merger; +import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -62,18 +63,18 @@ public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent dat nodeInstance.setNodeId(body.getNodeDefinitionId()); nodeInstance.setName(body.getNodeName()); nodeInstance.setType(body.getNodeType()); + ZonedDateTime eventDate = toZonedDateTime(body.getEventDate()); switch (body.getEventType()) { case EVENT_TYPE_ENTER: - nodeInstance.setEnter(toZonedDateTime(body.getEventDate())); + nodeInstance.setEnter(eventDate); break; case EVENT_TYPE_EXIT: - nodeInstance.setExit(toZonedDateTime(body.getEventDate())); - + nodeInstance.setExit(eventDate); + default: if (nodeInstance.getEnter() == null) { // Adding a default enter time for exit events triggered by EventNodeInstances - nodeInstance.setEnter(nodeInstance.getExit()); + nodeInstance.setEnter(eventDate); } - break; } nodeInstances.add(nodeInstance); diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java index 34c59225b6..f86570fbd4 100644 --- a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java +++ b/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java @@ -18,6 +18,7 @@ */ package org.kie.kogito.index.jpa.storage; +import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Set; @@ -155,18 +156,19 @@ private NodeInstanceEntity updateNode(NodeInstanceEntity nodeInstance, ProcessIn nodeInstance.setNodeId(body.getNodeDefinitionId()); nodeInstance.setName(body.getNodeName()); nodeInstance.setType(body.getNodeType()); + ZonedDateTime eventDate = toZonedDateTime(body.getEventDate()); switch (body.getEventType()) { + case EVENT_TYPE_ENTER: - nodeInstance.setEnter(toZonedDateTime(body.getEventDate())); + nodeInstance.setEnter(eventDate); break; case EVENT_TYPE_EXIT: - nodeInstance.setExit(toZonedDateTime(body.getEventDate())); - + nodeInstance.setExit(eventDate); + default: if (nodeInstance.getEnter() == null) { // Adding a default enter time for exit events triggered by EventNodeInstances - nodeInstance.setEnter(nodeInstance.getExit()); + nodeInstance.setEnter(eventDate); } - break; } return nodeInstance; }