fix(engine): allow querying for hist pis by async activities

related to #4757
camunda · Nov 5, 2024 · cc93482 · cc93482
1 parent ab78ff5
commit cc93482
Show file tree

Hide file tree

Showing 4 changed files with 142 additions and 241 deletions.
diff --git a/engine-rest/engine-rest-openapi/src/main/templates/lib/commons/history-process-instance.ftl b/engine-rest/engine-rest-openapi/src/main/templates/lib/commons/history-process-instance.ftl
@@ -240,7 +240,7 @@
   "activityIdIn": {
     "type": "array",
     "itemType": "string",
-    "desc": "Restrict to instances with an active activity with one of the given ids. This filter behaves differently as `activeActivityIdIn` since it also yields results when filtering for activities with an incident. ${listTypeDescription}"
+    "desc": "Restrict to instances with an active activity with one of the given ids. In contrast to the `activeActivityIdIn` filter, it can query for async and incident activities. ${listTypeDescription}"
   },
 
   "executedActivityIdIn": {

diff --git a/engine/src/main/java/org/camunda/bpm/engine/history/HistoricProcessInstanceQuery.java b/engine/src/main/java/org/camunda/bpm/engine/history/HistoricProcessInstanceQuery.java
@@ -441,7 +441,8 @@ public interface HistoricProcessInstanceQuery extends Query<HistoricProcessInsta
   HistoricProcessInstanceQuery activeActivityIdIn(String... ids);
 
   /**
-   * Only select historic process instances with an active activity with one of the given ids. This filter behaves differently as `activeActivityIdIn` since it also yields results when filtering for activities with an incident.
+   * Only select historic process instances with an active activity with one of the given ids.
+   * In contrast to the `activeActivityIdIn` filter, it can query for async and incident activities.
    */
   HistoricProcessInstanceQuery activityIdIn(String... ids);
 

diff --git a/...src/main/resources/org/camunda/bpm/engine/impl/mapping/entity/HistoricProcessInstance.xml b/...src/main/resources/org/camunda/bpm/engine/impl/mapping/entity/HistoricProcessInstance.xml
@@ -402,7 +402,7 @@
 
     <bind name="INC_JOIN" value="false" />
     <bind name="HAI_JOIN" value="false" />
-    <bind name="INCACT_JOIN" value="false" />
+    <bind name="RU_EXE_JOIN" value="false" />
     <bind name="JOIN_TYPE" value="'inner join'" />
 
     <foreach collection="queries" item="query">
@@ -414,12 +414,12 @@
         <bind name="INC_JOIN" value="true" />
       </if>
 
-      <if test="query != null &amp;&amp; (query.executedActivityIds != null and query.executedActivityIds.length > 0) || (query.activeActivityIds != null and query.activeActivityIds.length > 0) || (query.activityIds != null and query.activityIds.length > 0)">
+      <if test="query != null &amp;&amp; (query.executedActivityIds != null and query.executedActivityIds.length > 0) || (query.activeActivityIds != null and query.activeActivityIds.length > 0)">
         <bind name="HAI_JOIN" value="true" />
       </if>
 
       <if test="query != null &amp;&amp; (query.activityIds != null and query.activityIds.length > 0)">
-        <bind name="INCACT_JOIN" value="true" />
+        <bind name="RU_EXE_JOIN" value="true" />
       </if>
     </foreach>
 
@@ -430,9 +430,8 @@
       LEFT JOIN ${prefix}ACT_HI_ACTINST HAI
       ON HAI.PROC_INST_ID_ = SELF.ID_
     </if>
-
-    <if test="INCACT_JOIN">
-      LEFT JOIN ${prefix}ACT_HI_INCIDENT INCACT on SELF.PROC_INST_ID_ = INCACT.PROC_INST_ID_
+    <if test="RU_EXE_JOIN">
+      LEFT JOIN ${prefix}ACT_RU_EXECUTION EXE on SELF.PROC_INST_ID_ = EXE.PROC_INST_ID_
     </if>
 
     <!-- actual value conditions are checked in the WHERE part;
@@ -643,19 +642,14 @@
               )
             </if>
 
-            <if test="query.activityIds != null and query.activityIds.length > 0">
-              ${queryType} (
-                  (
-                  HAI.END_TIME_ IS NULL
-                  AND HAI.ACT_ID_ IN
-                  <foreach item="activityId" index="index" collection="query.activityIds" open="(" separator="," close=")">
-                    #{activityId}
-                  </foreach>
-                  ) OR INCACT.ACTIVITY_ID_ IN
-                  <foreach item="activityId" index="index" collection="query.activityIds" open="(" separator="," close=")">
-                    #{activityId}
-                  </foreach>
-                )
+            <if test="query.activityIds != null &amp;&amp; query.activityIds.length > 0">
+              ${queryType} (EXE.IS_EVENT_SCOPE_ = ${falseConstant}
+              and EXE.ACT_ID_ in
+              <foreach item="activityId" index="index" collection="query.activityIds"
+                       open="(" separator="," close=")">
+                #{activityId}
+              </foreach>
+              )
             </if>
 
             <if test="query.executedActivityIds != null and query.executedActivityIds.length > 0">