Merge pull request #250 from camunda-community-hub/bugfix/#249_proces…

…sinstancequery_single_process_id_not_working fix: #249 correctly evaluate single process id passed to query
camunda-community-hub · Aug 19, 2022 · fc554a3 · fc554a3
2 parents 9a4d9a2 + c3c5529
commit fc554a3
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/...c/test/kotlin/org/camunda/community/rest/itest/RuntimeServiceProcessInstanceQueryITest.kt b/...c/test/kotlin/org/camunda/community/rest/itest/RuntimeServiceProcessInstanceQueryITest.kt
@@ -198,4 +198,34 @@ class RuntimeServiceProcessInstanceQueryITest :
   }
 
 
+  @Test
+  fun `find process by single process instance id`() {
+    val processDefinitionKey = "processDefinitionKey"
+    val key1 = "businessKey1"
+    val key2 = "businessKey2"
+    val key3 = "businessKey3"
+
+    GIVEN.no_deployment_exists()
+
+    GIVEN
+      .process_with_user_task_is_deployed(processDefinitionKey)
+
+    WHEN
+      .apply {
+        localService.startProcessInstanceByKey(processDefinitionKey, key1)
+        localService.startProcessInstanceByKey(processDefinitionKey, key2)
+        processInstance = localService.startProcessInstanceByKey(processDefinitionKey, key3)
+      }
+
+    THEN
+      .process_instance_query_succeeds { query, _ ->
+        val result = query
+          .processInstanceId(GIVEN.processInstance.id)
+          .count()
+        assertThat(
+          result
+        ).isEqualTo(1)
+      }
+  }
+
 }
diff --git a/...e/src/main/kotlin/org/camunda/community/rest/impl/query/DelegatingProcessInstanceQuery.kt b/...e/src/main/kotlin/org/camunda/community/rest/impl/query/DelegatingProcessInstanceQuery.kt
@@ -70,9 +70,10 @@ class DelegatingProcessInstanceQuery(private val processInstanceApiClient: Proce
         "processInstanceIds" -> {
           val ids = this@DelegatingProcessInstanceQuery.processInstanceIds?.toMutableSet() ?: mutableSetOf()
           if (this@DelegatingProcessInstanceQuery.processInstanceId != null) {
-            ids.plus(this@DelegatingProcessInstanceQuery.processInstanceId)
+            ids.plus(this@DelegatingProcessInstanceQuery.processInstanceId).toList()
+          } else {
+            if (ids.isEmpty()) null else ids.toList()
           }
-          if (ids.isEmpty()) null else ids.toList()
         }
         "tenantIdIn" -> this@DelegatingProcessInstanceQuery.tenantIds?.toList()
         "withoutTenantId" -> this@DelegatingProcessInstanceQuery.isTenantIdSet && (this@DelegatingProcessInstanceQuery.tenantIds == null)