[Fix apache/incubator-kie-issues#1857] Adding triggerCount

fjtirado · fjtirado · commit fc0287c9ac6e · 2025-03-06T18:09:23.000+01:00
diff --git a/data-index/data-index-graphql/src/main/resources/basic.schema.graphqls b/data-index/data-index-graphql/src/main/resources/basic.schema.graphqls
@@ -106,6 +106,7 @@ type ProcessInstance {
 
 type ProcessInstanceError {
     nodeDefinitionId: String!
+    nodeInstanceId: String
     message: String
 }
 
@@ -142,6 +143,8 @@ type NodeInstance {
     definitionId: String!
     nodeId: String!
     slaDueDate: DateTime
+    triggerCount: Int
+    errorMessage: String
 }
 
 enum MilestoneStatus {
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/NodeInstance.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/NodeInstance.java
@@ -40,6 +40,26 @@ public class NodeInstance {
 
     private ZonedDateTime slaDueDate;
 
+    private int triggerCount;
+
+    private String errorMessage;
+
+    public int getTriggerCount() {
+        return triggerCount;
+    }
+
+    public void setTriggerCount(int triggerCount) {
+        this.triggerCount = triggerCount;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
     @JsonProperty("nodeDefinitionId")
     private String definitionId;
 
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstanceError.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstanceError.java
@@ -25,6 +25,7 @@
 public class ProcessInstanceError {
 
     private String nodeDefinitionId;
+    private String nodeInstanceId;
     @JsonProperty("errorMessage")
     private String message;
 
@@ -77,4 +78,12 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(nodeDefinitionId, message);
     }
+
+    public String getNodeInstanceId() {
+        return nodeInstanceId;
+    }
+
+    public void setNodeInstanceId(String nodeInstanceId) {
+        this.nodeInstanceId = nodeInstanceId;
+    }
 }
diff --git a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceErrorDataEventMerger.java b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceErrorDataEventMerger.java
@@ -20,6 +20,7 @@
 
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
 import org.kie.kogito.event.process.ProcessInstanceErrorDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceErrorEventBody;
 import org.kie.kogito.index.CommonUtils;
 import org.kie.kogito.index.model.ProcessInstance;
 import org.kie.kogito.index.model.ProcessInstanceError;
@@ -30,14 +31,17 @@
 public class ProcessInstanceErrorDataEventMerger extends ProcessInstanceEventMerger {
 
     @Override
-    public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent<?> data) {
-        ProcessInstanceErrorDataEvent event = (ProcessInstanceErrorDataEvent) data;
-        pi = getOrNew(pi, data, event.getData().getEventDate());
+    public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent<?> dataEvent) {
+        ProcessInstanceErrorDataEvent event = (ProcessInstanceErrorDataEvent) dataEvent;
+        ProcessInstanceErrorEventBody data = event.getData();
+        pi = getOrNew(pi, dataEvent, data.getEventDate());
         ProcessInstanceError error = new ProcessInstanceError();
-        error.setMessage(event.getData().getErrorMessage());
-        error.setNodeDefinitionId(event.getData().getNodeDefinitionId());
+        error.setMessage(data.getErrorMessage());
+        error.setNodeDefinitionId(data.getNodeDefinitionId());
+        error.setNodeInstanceId(data.getNodeInstanceId());
         pi.setError(error);
         pi.setState(CommonUtils.ERROR_STATE);
+        pi.getNodes().stream().filter(n -> n.getId().equals(error.getNodeInstanceId())).findAny().ifPresent(n -> n.setErrorMessage(data.getErrorMessage()));
         return pi;
     }
 
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
@@ -64,6 +64,7 @@ public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent<?> dat
         nodeInstance.setName(body.getNodeName());
         nodeInstance.setType(body.getNodeType());
         nodeInstance.setSlaDueDate(toZonedDateTime(body.getSlaDueDate()));
+        nodeInstance.setTriggerCount(body.triggerCount());
         ZonedDateTime eventDate = toZonedDateTime(body.getEventDate());
         switch (body.getEventType()) {
             case EVENT_TYPE_ENTER:
diff --git a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeInstanceEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeInstanceEntity.java
@@ -45,11 +45,30 @@ public class NodeInstanceEntity extends AbstractEntity {
     private ZonedDateTime exit;
     private ZonedDateTime slaDueDate;
     private String definitionId;
+    private int triggerCount;
+    private String errorMessage;
+
     @ManyToOne(cascade = CascadeType.ALL, optional = false)
     @OnDelete(action = OnDeleteAction.CASCADE)
     @JoinColumn(name = "processInstanceId", foreignKey = @ForeignKey(name = "fk_nodes_process"))
     private ProcessInstanceEntity processInstance;
 
+    public int getTriggerCount() {
+        return triggerCount;
+    }
+
+    public void setTriggerCount(int triggerCount) {
+        this.triggerCount = triggerCount;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
     @Override
     public String getId() {
         return id;
diff --git a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceErrorEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceErrorEntity.java
@@ -26,6 +26,7 @@
 public class ProcessInstanceErrorEntity {
 
     private String nodeDefinitionId;
+    private String nodeInstanceId;
     private String message;
 
     public String getNodeDefinitionId() {
@@ -44,22 +45,28 @@ public void setMessage(String message) {
         this.message = message;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ProcessInstanceErrorEntity that = (ProcessInstanceErrorEntity) o;
-        return Objects.equals(nodeDefinitionId, that.nodeDefinitionId) &&
-                Objects.equals(message, that.message);
+    public void setNodeInstanceId(String nodeInstanceId) {
+        this.nodeInstanceId = nodeInstanceId;
+    }
+
+    public String getNodeInstanceId() {
+        return nodeInstanceId;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(nodeDefinitionId, message);
+        return Objects.hash(message, nodeDefinitionId, nodeInstanceId);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!(obj instanceof ProcessInstanceErrorEntity))
+            return false;
+        ProcessInstanceErrorEntity other = (ProcessInstanceErrorEntity) obj;
+        return Objects.equals(message, other.message) && Objects.equals(nodeDefinitionId, other.nodeDefinitionId)
+                && Objects.equals(nodeInstanceId, other.nodeInstanceId);
     }
 
 }
diff --git a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java
@@ -147,7 +147,9 @@ private void indexError(ProcessInstanceEntity pi, ProcessInstanceErrorEventBody
         }
         errorEntity.setMessage(error.getErrorMessage());
         errorEntity.setNodeDefinitionId(error.getNodeDefinitionId());
+        errorEntity.setNodeInstanceId(error.getNodeInstanceId());
         pi.setState(CommonUtils.ERROR_STATE);
+        pi.getNodes().stream().filter(n -> n.getId().equals(error.getNodeInstanceId())).findAny().ifPresent(n -> n.setErrorMessage(error.getErrorMessage()));
     }
 
     private void indexNode(ProcessInstanceEntity pi, ProcessInstanceNodeEventBody data) {
@@ -186,6 +188,7 @@ private NodeInstanceEntity updateNode(NodeInstanceEntity nodeInstance, ProcessIn
         nodeInstance.setName(body.getNodeName());
         nodeInstance.setType(body.getNodeType());
         nodeInstance.setSlaDueDate(toZonedDateTime(body.getSlaDueDate()));
+        nodeInstance.setTriggerCount(body.triggerCount());
         ZonedDateTime eventDate = toZonedDateTime(body.getEventDate());
         switch (body.getEventType()) {
             case EVENT_TYPE_ENTER:
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntity.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntity.java
@@ -283,6 +283,10 @@ public static class NodeInstanceEntity {
 
         Long slaDueDate;
 
+        private int triggerCount;
+
+        private String errorMessage;
+
         public String getId() {
             return id;
         }
@@ -363,6 +367,22 @@ public boolean equals(Object o) {
         public int hashCode() {
             return Objects.hash(id);
         }
+
+        public int getTriggerCount() {
+            return triggerCount;
+        }
+
+        public void setTriggerCount(int triggerCount) {
+            this.triggerCount = triggerCount;
+        }
+
+        public String getErrorMessage() {
+            return errorMessage;
+        }
+
+        public void setErrorMessage(String errorMessage) {
+            this.errorMessage = errorMessage;
+        }
     }
 
     public static class ProcessInstanceErrorEntity {
@@ -371,6 +391,8 @@ public static class ProcessInstanceErrorEntity {
 
         String message;
 
+        private String nodeInstanceId;
+
         public String getNodeDefinitionId() {
             return nodeDefinitionId;
         }
@@ -387,22 +409,30 @@ public void setMessage(String message) {
             this.message = message;
         }
 
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            ProcessInstanceErrorEntity that = (ProcessInstanceErrorEntity) o;
-            return Objects.equals(nodeDefinitionId, that.nodeDefinitionId) &&
-                    Objects.equals(message, that.message);
+        public String getNodeInstanceId() {
+            return nodeInstanceId;
+        }
+
+        public void setNodeInstanceId(String nodeInstanceId) {
+            this.nodeInstanceId = nodeInstanceId;
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(nodeDefinitionId, message);
+            return Objects.hash(message, nodeDefinitionId, nodeInstanceId);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            ProcessInstanceErrorEntity other = (ProcessInstanceErrorEntity) obj;
+            return Objects.equals(message, other.message) && Objects.equals(nodeDefinitionId, other.nodeDefinitionId)
+                    && Objects.equals(nodeInstanceId, other.nodeInstanceId);
         }
     }
 
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntityMapper.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntityMapper.java
@@ -149,6 +149,8 @@ NodeInstance toNodeInstance(ProcessInstanceEntity.NodeInstanceEntity entity) {
         instance.setExit(instantToZonedDateTime(entity.getExit()));
         instance.setDefinitionId(entity.getDefinitionId());
         instance.setSlaDueDate(instantToZonedDateTime(entity.getSlaDueDate()));
+        instance.setTriggerCount(instance.getTriggerCount());
+        instance.setErrorMessage(entity.getErrorMessage());
         return instance;
     }
 
@@ -166,6 +168,8 @@ ProcessInstanceEntity.NodeInstanceEntity fromNodeInstance(NodeInstance instance)
         entity.setExit(zonedDateTimeToInstant(instance.getExit()));
         entity.setDefinitionId(instance.getDefinitionId());
         entity.setSlaDueDate(zonedDateTimeToInstant(instance.getSlaDueDate()));
+        entity.setTriggerCount(instance.getTriggerCount());
+        entity.setErrorMessage(instance.getErrorMessage());
         return entity;
     }
 
@@ -176,6 +180,7 @@ ProcessInstanceError toProcessInstanceError(ProcessInstanceEntity.ProcessInstanc
 
         ProcessInstanceError error = new ProcessInstanceError();
         error.setNodeDefinitionId(entity.getNodeDefinitionId());
+        error.setNodeInstanceId(entity.getNodeInstanceId());
         error.setMessage(entity.getMessage());
         return error;
     }
@@ -187,6 +192,7 @@ ProcessInstanceEntity.ProcessInstanceErrorEntity fromProcessInstanceError(Proces
 
         ProcessInstanceEntity.ProcessInstanceErrorEntity entity = new ProcessInstanceEntity.ProcessInstanceErrorEntity();
         entity.setNodeDefinitionId(error.getNodeDefinitionId());
+        entity.setNodeInstanceId(error.getNodeInstanceId());
         entity.setMessage(error.getMessage());
         return entity;
     }
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java
@@ -93,7 +93,7 @@ public CompletableFuture<String> abortProcessInstance(String serviceURL, Process
             pInstance.abort();
 
             if (pInstance.status() == org.kie.kogito.process.ProcessInstance.STATE_ERROR) {
-                throw new ProcessInstanceExecutionException(pInstance.id(), pInstance.error().get().failedNodeId(), pInstance.error().get().errorMessage());
+                throw ProcessInstanceExecutionException.fromError(pInstance);
             } else {
                 return String.format(SUCCESSFULLY_OPERATION_MESSAGE, "ABORT ProcessInstance with id: " + processInstance.getId());
             }
@@ -106,7 +106,7 @@ public CompletableFuture<String> retryProcessInstance(String serviceURL, Process
             pInstance.error().get().retrigger();
 
             if (pInstance.status() == org.kie.kogito.process.ProcessInstance.STATE_ERROR) {
-                throw new ProcessInstanceExecutionException(pInstance.id(), pInstance.error().get().failedNodeId(), pInstance.error().get().errorMessage());
+                throw ProcessInstanceExecutionException.fromError(pInstance);
             } else {
                 return String.format(SUCCESSFULLY_OPERATION_MESSAGE, "RETRY ProcessInstance in error with id: " + processInstance.getId());
             }
@@ -119,7 +119,7 @@ public CompletableFuture<String> skipProcessInstance(String serviceURL, ProcessI
             pInstance.error().get().skip();
 
             if (pInstance.status() == org.kie.kogito.process.ProcessInstance.STATE_ERROR) {
-                throw new ProcessInstanceExecutionException(pInstance.id(), pInstance.error().get().failedNodeId(), pInstance.error().get().errorMessage());
+                throw ProcessInstanceExecutionException.fromError(pInstance);
             } else {
                 return String.format(SUCCESSFULLY_OPERATION_MESSAGE, "SKIP ProcessInstance in error with id: " + processInstance.getId());
             }
@@ -185,7 +185,7 @@ public CompletableFuture<String> triggerNodeInstance(String serviceURL, ProcessI
             pInstance.triggerNode(nodeDefinitionId);
 
             if (pInstance.status() == org.kie.kogito.process.ProcessInstance.STATE_ERROR) {
-                throw new ProcessInstanceExecutionException(pInstance.id(), pInstance.error().get().failedNodeId(), pInstance.error().get().errorMessage());
+                throw ProcessInstanceExecutionException.fromError(pInstance);
             } else {
                 return String.format(SUCCESSFULLY_OPERATION_MESSAGE,
                         "TRIGGER Node " + nodeDefinitionId + "from ProcessInstance with id: " + processInstance.getId());
@@ -199,7 +199,7 @@ public CompletableFuture<String> retriggerNodeInstance(String serviceURL, Proces
             pInstance.retriggerNodeInstance(nodeInstanceId);
 
             if (pInstance.status() == org.kie.kogito.process.ProcessInstance.STATE_ERROR) {
-                throw new ProcessInstanceExecutionException(pInstance.id(), pInstance.error().get().failedNodeId(), pInstance.error().get().errorMessage());
+                throw ProcessInstanceExecutionException.fromError(pInstance);
             } else {
                 return String.format(SUCCESSFULLY_OPERATION_MESSAGE,
                         "RETRIGGER Node instance " + nodeInstanceId + "from ProcessInstance with id: " + processInstance.getId());
@@ -213,7 +213,7 @@ public CompletableFuture<String> cancelNodeInstance(String serviceURL, ProcessIn
             pInstance.cancelNodeInstance(nodeInstanceId);
 
             if (pInstance.status() == org.kie.kogito.process.ProcessInstance.STATE_ERROR) {
-                throw new ProcessInstanceExecutionException(pInstance.id(), pInstance.error().get().failedNodeId(), pInstance.error().get().errorMessage());
+                throw ProcessInstanceExecutionException.fromError(pInstance);
             } else {
                 return String.format(SUCCESSFULLY_OPERATION_MESSAGE,
                         "CANCEL Node instance " + nodeInstanceId + "from ProcessInstance with id: " + processInstance.getId());

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ type ProcessInstance {`
`106`	`106`
`107`	`107`	`type ProcessInstanceError {`
`108`	`108`	`nodeDefinitionId: String!`
	`109`	`+ nodeInstanceId: String`
`109`	`110`	`message: String`
`110`	`111`	`}`
`111`	`112`
`@@ -142,6 +143,8 @@ type NodeInstance {`
`142`	`143`	`definitionId: String!`
`143`	`144`	`nodeId: String!`
`144`	`145`	`slaDueDate: DateTime`
	`146`	`+ triggerCount: Int`
	`147`	`+ errorMessage: String`
`145`	`148`	`}`
`146`	`149`
`147`	`150`	`enum MilestoneStatus {`