AAE-29004 Add processDefinitionName field to process instance search …

…endpoint (#1628) * AAE-29004 add missing field * empty-commit
Activiti · Dec 4, 2024 · b6f3298 · b6f3298
1 parent db597da
commit b6f3298
Show file tree

Hide file tree

Showing 6 changed files with 289 additions and 233 deletions.
diff --git a/...ain/java/org/activiti/cloud/services/query/rest/payload/ProcessInstanceSearchRequest.java b/...ain/java/org/activiti/cloud/services/query/rest/payload/ProcessInstanceSearchRequest.java
@@ -24,6 +24,7 @@
 //prettier-ignore
 public record ProcessInstanceSearchRequest(
     Set<String> name,
+    Set<String> processDefinitionName,
     Set<String> initiator,
     Set<String> appVersion,
     Set<ProcessInstance.ProcessInstanceStatus> status,

diff --git a/...va/org/activiti/cloud/services/query/rest/specification/ProcessInstanceSpecification.java b/...va/org/activiti/cloud/services/query/rest/specification/ProcessInstanceSpecification.java
@@ -62,6 +62,7 @@ public Predicate toPredicate(
         query.distinct(distinct);
         applyUserRestrictionFilter(root, criteriaBuilder);
         applyNameFilter(root, criteriaBuilder);
+        applyProcessDefinitionNameFilter(root);
         applyInitiatorFilter(root);
         applyAppVersionFilter(root);
         applyStatusFilter(root);
@@ -91,6 +92,14 @@ private void applyNameFilter(Root<ProcessInstanceEntity> root, CriteriaBuilder c
         }
     }
 
+    private void applyProcessDefinitionNameFilter(Root<ProcessInstanceEntity> root) {
+        if (!CollectionUtils.isEmpty(searchRequest.processDefinitionName())) {
+            predicates.add(
+                root.get(ProcessInstanceEntity_.processDefinitionName).in(searchRequest.processDefinitionName())
+            );
+        }
+    }
+
     private void applyInitiatorFilter(Root<ProcessInstanceEntity> root) {
         if (!CollectionUtils.isEmpty(searchRequest.initiator())) {
             predicates.add(root.get(ProcessInstanceEntity_.initiator).in(searchRequest.initiator()));

diff --git a/...g/activiti/cloud/services/query/rest/AbstractProcessInstanceEntitySearchControllerIT.java b/...g/activiti/cloud/services/query/rest/AbstractProcessInstanceEntitySearchControllerIT.java
@@ -19,7 +19,6 @@
 import static io.restassured.module.mockmvc.RestAssuredMockMvc.postProcessors;
 import static io.restassured.module.mockmvc.RestAssuredMockMvc.webAppContextSetup;
 import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsInRelativeOrder;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
@@ -32,10 +31,8 @@
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.IntStream;
 import org.activiti.QueryRestTestApplication;
 import org.activiti.api.process.model.ProcessInstance;
-import org.activiti.api.task.model.Task;
 import org.activiti.cloud.alfresco.config.AlfrescoWebAutoConfiguration;
 import org.activiti.cloud.services.query.model.ProcessInstanceEntity;
 import org.activiti.cloud.services.query.model.ProcessVariableKey;
@@ -44,11 +41,8 @@
 import org.activiti.cloud.services.query.rest.filter.VariableType;
 import org.activiti.cloud.services.query.rest.payload.CloudRuntimeEntitySort;
 import org.activiti.cloud.services.query.rest.payload.ProcessInstanceSearchRequest;
-import org.activiti.cloud.services.query.rest.payload.TaskSearchRequest;
 import org.activiti.cloud.services.query.util.ProcessInstanceSearchRequestBuilder;
 import org.activiti.cloud.services.query.util.QueryTestUtils;
-import org.activiti.cloud.services.query.util.TaskBuilder;
-import org.activiti.cloud.services.query.util.TaskSearchRequestBuilder;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -118,6 +112,39 @@ void should_returnProcessInstances_filteredByNameLike() {
             .body(PROCESS_INSTANCE_IDS_JSON_PATH, hasItem(processInstance2.getId()));
     }
 
+    @Test
+    void should_returnProcessInstances_filteredByProcessDefinitionName() {
+        ProcessInstanceEntity processInstance1 = queryTestUtils
+            .buildProcessInstance()
+            .withInitiator(USER)
+            .withProcessDefinitionName("Process def name one")
+            .buildAndSave();
+        ProcessInstanceEntity processInstance2 = queryTestUtils
+            .buildProcessInstance()
+            .withInitiator(USER)
+            .withProcessDefinitionName("Process def name two")
+            .buildAndSave();
+        queryTestUtils
+            .buildProcessInstance()
+            .withInitiator(USER)
+            .withProcessDefinitionName("Process def name three")
+            .buildAndSave();
+
+        ProcessInstanceSearchRequestBuilder requestBuilder = new ProcessInstanceSearchRequestBuilder()
+            .withProcessDefinitionNames("Process def name one", "Process def name two");
+
+        given()
+            .contentType(MediaType.APPLICATION_JSON)
+            .body(requestBuilder.buildJson())
+            .when()
+            .post(getSearchEndpoint())
+            .then()
+            .statusCode(200)
+            .body(PROCESS_INSTANCES_JSON_PATH, hasSize(2))
+            .body(PROCESS_INSTANCE_IDS_JSON_PATH, hasItem(processInstance1.getId()))
+            .body(PROCESS_INSTANCE_IDS_JSON_PATH, hasItem(processInstance2.getId()));
+    }
+
     @Test
     void should_returnProcessInstances_filteredByAppVersion() {
         ProcessInstanceEntity processInstance1 = queryTestUtils

diff --git a/...ery-rest/src/test/java/org/activiti/cloud/services/query/util/ProcessInstanceBuilder.java b/...ery-rest/src/test/java/org/activiti/cloud/services/query/util/ProcessInstanceBuilder.java
@@ -61,6 +61,11 @@ public ProcessInstanceBuilder withName(String name) {
         return this;
     }
 
+    public ProcessInstanceBuilder withProcessDefinitionName(String processDefinitionName) {
+        process.setProcessDefinitionName(processDefinitionName);
+        return this;
+    }
+
     public ProcessInstanceBuilder withAppName(String appName) {
         process.setAppName(appName);
         return this;

diff --git a/...test/java/org/activiti/cloud/services/query/util/ProcessInstanceSearchRequestBuilder.java b/...test/java/org/activiti/cloud/services/query/util/ProcessInstanceSearchRequestBuilder.java
@@ -31,6 +31,7 @@
 public class ProcessInstanceSearchRequestBuilder {
 
     private Set<String> names;
+    private Set<String> processDefinitionNames;
     private Set<String> initiators;
     private Set<String> appVersions;
     private Set<ProcessInstance.ProcessInstanceStatus> statuses;
@@ -51,6 +52,11 @@ public ProcessInstanceSearchRequestBuilder withNames(String... names) {
         return this;
     }
 
+    public ProcessInstanceSearchRequestBuilder withProcessDefinitionNames(String... processDefinitionNames) {
+        this.processDefinitionNames = Set.of(processDefinitionNames);
+        return this;
+    }
+
     public ProcessInstanceSearchRequestBuilder withInitiators(String... initiators) {
         this.initiators = Set.of(initiators);
         return this;
@@ -137,6 +143,7 @@ public ProcessInstanceSearchRequest build() {
         }
         return new ProcessInstanceSearchRequest(
             names,
+            processDefinitionNames,
             initiators,
             appVersions,
             statuses,