This is an automated email from the ASF dual-hosted git repository.
ederign pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
The following commit(s) were added to refs/heads/main by this push:
new 2bb20134a [Fix_1960] Always setting enter date (#1961)
2bb20134a is described below
commit 2bb20134a9273f0f3a7a8d0bf9fd6e7b37e65991
Author: Francisco Javier Tirado Sarti
<[email protected]>
AuthorDate: Fri Jan 19 01:36:18 2024 +0100
[Fix_1960] Always setting enter date (#1961)
---
.../storage/merger/ProcessInstanceNodeDataEventMerger.java | 11 ++++++-----
.../index/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 d2bfac1cb..f3442d24b 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 class ProcessInstanceNodeDataEventMerger extends
ProcessInstanceEventMerg
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 34c59225b..f86570fbd 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 @@ public class ProcessInstanceEntityStorage extends
AbstractJPAStorageFetcher<Proc
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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
