Merge pull request Activiti#1057 from jtulley/process-instance-id-in-…

…rest add processInstanceIdIn capability to taskQuery rest calls
mecod · Oct 27, 2016 · 4ba00ac · 4ba00ac
2 parents ff88f2a + 5c0c385
commit 4ba00ac
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 3 deletions.
diff --git a/...iviti-rest/src/main/java/org/activiti/rest/service/api/runtime/task/TaskBaseResource.java b/...iviti-rest/src/main/java/org/activiti/rest/service/api/runtime/task/TaskBaseResource.java
@@ -182,6 +182,9 @@ protected DataResponse getTasksFromQueryRequest(TaskQueryRequest request,
     if (request.getProcessInstanceId() != null) {
       taskQuery.processInstanceId(request.getProcessInstanceId());
     }
+    if (request.getProcessInstanceIdIn() != null) {
+      taskQuery.processInstanceIdIn(request.getProcessInstanceIdIn());
+    }
     if (request.getProcessInstanceBusinessKey() != null) {
       taskQuery.processInstanceBusinessKey(request.getProcessInstanceBusinessKey());
     }

diff --git a/...rest/src/main/java/org/activiti/rest/service/api/runtime/task/TaskCollectionResource.java b/...rest/src/main/java/org/activiti/rest/service/api/runtime/task/TaskCollectionResource.java
@@ -14,6 +14,7 @@
 package org.activiti.rest.service.api.runtime.task;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -139,7 +140,13 @@ public DataResponse getTasks(@RequestParam Map<String, String> requestParams, Ht
     if (requestParams.containsKey("processInstanceId")) {
       request.setProcessInstanceId(requestParams.get("processInstanceId"));
     }
-
+
+    if (requestParams.containsKey("processInstanceIdIn")) {
+      String[] processInstanceIds = requestParams.get("processInstanceIdIn").split(",");
+      List<String> ids = Arrays.asList(processInstanceIds);
+      request.setProcessInstanceIdIn(ids);
+    }
+
     if (requestParams.containsKey("processInstanceBusinessKey")) {
       request.setProcessInstanceBusinessKey(requestParams.get("processInstanceBusinessKey"));
     }

diff --git a/...iviti-rest/src/main/java/org/activiti/rest/service/api/runtime/task/TaskQueryRequest.java b/...iviti-rest/src/main/java/org/activiti/rest/service/api/runtime/task/TaskQueryRequest.java
@@ -49,6 +49,7 @@ public class TaskQueryRequest extends PaginateRequest {
   private String processInstanceId;
   private String processInstanceBusinessKey;
   private String processInstanceBusinessKeyLike;
+  private List<String> processInstanceIdIn;
   private String processDefinitionId;
   private String processDefinitionKey;
   private String processDefinitionName;
@@ -219,7 +220,15 @@ public String getProcessInstanceId() {
   public void setProcessInstanceId(String processInstanceId) {
     this.processInstanceId = processInstanceId;
   }
-
+
+  public List<String> getProcessInstanceIdIn() {
+    return processInstanceIdIn;
+  }
+
+  public void setProcessInstanceIdIn(List<String> processInstanceIdIn) {
+      this.processInstanceIdIn = processInstanceIdIn;
+  }
+
   public String getProcessInstanceBusinessKey() {
     return processInstanceBusinessKey;
   }

diff --git a/...-rest/src/test/java/org/activiti/rest/service/api/runtime/TaskCollectionResourceTest.java b/...-rest/src/test/java/org/activiti/rest/service/api/runtime/TaskCollectionResourceTest.java
@@ -242,7 +242,11 @@ public void testGetTasks() throws Exception {
       // Process instance filtering
       url = RestUrls.createRelativeResourceUrl(RestUrls.URL_TASK_COLLECTION) + "?processInstanceId=" + processInstance.getId();
       assertResultsPresentInDataResponse(url, processTask.getId());
-
+
+      // Process instance id in list filtering
+      url = RestUrls.createRelativeResourceUrl(RestUrls.URL_TASK_COLLECTION) + "?processInstanceIdIn=" + adhocTask.getId() + "," + processInstance.getId();
+      assertResultsPresentInDataResponse(url, processTask.getId());
+
       // Execution filtering
       url = RestUrls.createRelativeResourceUrl(RestUrls.URL_TASK_COLLECTION) + "?executionId=" + processInstance.getId();
       assertResultsPresentInDataResponse(url, processTask.getId());

diff --git a/...iviti-rest/src/test/java/org/activiti/rest/service/api/runtime/TaskQueryResourceTest.java b/...iviti-rest/src/test/java/org/activiti/rest/service/api/runtime/TaskQueryResourceTest.java
@@ -178,6 +178,15 @@ public void testQueryTasks() throws Exception {
       requestNode.put("processInstanceId", processInstance.getId());
       assertResultsPresentInPostDataResponse(url, requestNode, processTask.getId());
 
+      // Process instance id in filtering
+      requestNode.removeAll();
+
+      arrayNode =  requestNode.arrayNode();
+      arrayNode.add(processInstance.getId());
+
+      requestNode.put("processInstanceIdIn", arrayNode);
+      assertResultsPresentInPostDataResponse(url, requestNode, processTask.getId());
+
       // Execution filtering
       requestNode.removeAll();
       requestNode.put("executionId", processInstance.getId());