JBPM-10162 IntermediateThrowingSignal node from subprocess and the su…

…bprocess is not getting marked as executed (#2278)
kiegroup · Mar 24, 2023 · 5709830 · 5709830
1 parent 14e3b63
commit 5709830
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 4 deletions.
diff --git a/...es/jbpm-kie-services/src/main/java/org/jbpm/kie/services/impl/RuntimeDataServiceImpl.java b/...es/jbpm-kie-services/src/main/java/org/jbpm/kie/services/impl/RuntimeDataServiceImpl.java
@@ -692,6 +692,13 @@ public Collection<NodeInstanceDesc> getProcessInstanceHistoryCompleted(long proc
         return getProcessInstanceHistory(processId, true, queryContext);
     }
 
+    @Override
+    public Collection<NodeInstanceDesc> getProcessInstanceHistoryFinished(long processId, QueryContext queryContext) {
+        Map<String, Object> params = new HashMap<String, Object>();
+        params.put("processId", processId);
+        applyQueryContext(params, queryContext);
+        return commandService.execute(new QueryNameCommand<List<NodeInstanceDesc>>("getProcessInstanceFinishedNodes", params));
+    }
 
     protected Collection<NodeInstanceDesc> getProcessInstanceHistory(long processId, boolean completed, QueryContext queryContext) {
     	Map<String, Object> params = new HashMap<String, Object>();

diff --git a/jbpm-services/jbpm-kie-services/src/main/resources/META-INF/Servicesorm.xml b/jbpm-services/jbpm-kie-services/src/main/resources/META-INF/Servicesorm.xml
@@ -597,7 +597,37 @@
     </query>
     <!-- hint name="org.hibernate.timeout" value="200"/ -->
   </named-query>
-
+
+  <named-query name="getProcessInstanceFinishedNodes">
+    <query>
+      select
+      new org.jbpm.kie.services.impl.model.NodeInstanceDesc(
+      log.nodeInstanceId,
+      log.nodeId,
+      log.nodeName,
+      log.nodeType,
+      log.externalId,
+      log.processInstanceId,
+      log.date,
+      log.connection,
+      log.type,
+      log.workItemId,
+      log.referenceId,
+      log.nodeContainerId,
+      log.slaDueDate,
+      log.slaCompliance
+      )
+      from
+      NodeInstanceLog log
+      where
+      log.type in ( 1, 2, 3 ,4 )
+      and log.processInstanceId=:processId
+      ORDER BY
+      log.id ASC
+    </query>
+    <!-- hint name="org.hibernate.timeout" value="200"/ -->
+  </named-query>
+
   <named-query name="getNodeInstanceForWorkItem">
     <query>
       select

diff --git a/...s/src/test/java/org/jbpm/kie/services/impl/admin/ProcessInstanceAdminServiceImplTest.java b/...s/src/test/java/org/jbpm/kie/services/impl/admin/ProcessInstanceAdminServiceImplTest.java
@@ -273,6 +273,11 @@ public void testReTriggerNodeInstance() {
         assertNotNull(completedNodes);
         assertEquals(1, completedNodes.size());
 
+        // test for finished nodes
+        Collection<NodeInstanceDesc> finishedNodes = runtimeDataService.getProcessInstanceHistoryFinished(processInstanceId, new QueryFilter());
+        assertNotNull(finishedNodes);
+        assertEquals(2, finishedNodes.size());
+
         final List<NodeInstanceDesc> nodeInstances = completedNodes.stream().filter(node -> node.getId().equals(active.getId())).collect(Collectors.toList());
         assertEquals(0, nodeInstances.size());
 

diff --git a/jbpm-services/jbpm-services-api/src/build/revapi-config.json b/jbpm-services/jbpm-services-api/src/build/revapi-config.json
@@ -44,8 +44,16 @@
                    "methodName": "countProcessInstancesByDeploymentId",
                    "elementKind": "method",
                    "justification": "[RHPAM-4028] Allow to count process instances by deploymentId and states."
-                }
-
+                },
+                {
+                   "code": "java.method.addedToInterface",
+                   "new": "method java.util.Collection<org.jbpm.services.api.model.NodeInstanceDesc> org.jbpm.services.api.RuntimeDataService::getProcessInstanceHistoryFinished(long, org.kie.api.runtime.query.QueryContext)",
+                   "package": "org.jbpm.services.api",
+                   "classSimpleName": "RuntimeDataService",
+                   "methodName": "getProcessInstanceHistoryFinished",
+                   "elementKind": "method",
+                   "justification": "[RHPAM-4653] IntermediateThrowingSignal node from subprocess and the subprocess is not getting marked as executed."
+                 }
             ]
         }
     }

diff --git a/jbpm-services/jbpm-services-api/src/main/java/org/jbpm/services/api/RuntimeDataService.java b/jbpm-services/jbpm-services-api/src/main/java/org/jbpm/services/api/RuntimeDataService.java
@@ -247,7 +247,15 @@ public int getValue() {
      */
     Collection<NodeInstanceDesc> getProcessInstanceHistoryCompleted(long processInstanceId, QueryContext queryContext);
 
-    /**
+	/**
+	 * Returns trace of all passed (include completed, skipped, aborted, OBSOLETE) for given process instance id
+	 * @param processInstanceId unique identifier of process instance
+	 * @param queryContext control parameters for the result e.g. sorting, paging
+	 * @return
+	 */
+	Collection<NodeInstanceDesc> getProcessInstanceHistoryFinished(long processInstanceId, QueryContext queryContext);
+
+	/**
      * Returns complete trace of all executed (completed) and active nodes for given process instance id
      * @param processInstanceId The id of the process used to start the process instance.
      * @param queryContext control parameters for the result e.g. sorting, paging