Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ProcessMaker/Http/Controllers/Api/TaskController.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,15 @@ class TaskController extends Controller
* type="integer",
* )
* ),
* @OA\Parameter(
* description="Return all task types. Not just user tasks.",
* in="query",
* name="all_tasks",
* required=false,
* @OA\Schema(
* type="boolean",
* )
* ),
* @OA\Parameter(ref="#/components/parameters/filter"),
* @OA\Parameter(ref="#/components/parameters/order_by"),
* @OA\Parameter(ref="#/components/parameters/order_direction"),
Expand Down
3 changes: 2 additions & 1 deletion ProcessMaker/Traits/TaskControllerIndexMethods.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ private function addTaskData($response)
private function excludeNonVisibleTasks($query, $request)
{
$nonSystem = filter_var($request->input('non_system'), FILTER_VALIDATE_BOOLEAN);
$query->where(function ($query) {
$allTasks = filter_var($request->input('all_tasks'), FILTER_VALIDATE_BOOLEAN);
$query->when(!$allTasks, function ($query) {
$query->where('element_type', '=', 'task');
$query->orWhere('element_type', '=', 'serviceTask');
$query->where('element_name', '=', 'AI Assistant');
Expand Down
9 changes: 9 additions & 0 deletions storage/api-docs/api-docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -6139,6 +6139,15 @@
"type": "integer"
}
},
{
"name": "all_tasks",
"in": "query",
"description": "Return all task types. Not just user tasks.",
"required": false,
"schema": {
"type": "boolean"
}
},
{
"$ref": "#/components/parameters/filter"
},
Expand Down
39 changes: 39 additions & 0 deletions tests/Feature/Api/TasksTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -832,4 +832,43 @@ public function testGetScreenFields()

$this->assertEquals($expectedFields, $jsonResponse);
}

public function testGetAllTaskTypes()
{
$request = ProcessRequest::factory()->create();

$taskAttributes = [
'process_request_id' => $request->id,
'process_id' => $request->process_id,
'element_type' => 'task',
'user_id' => $this->user->id,
];

$userTask = ProcessRequestToken::factory()->create($taskAttributes);
$scriptTask = ProcessRequestToken::factory()->create([...$taskAttributes, 'element_type' => 'scriptTask']);
$gatewayTask = ProcessRequestToken::factory()->create([...$taskAttributes, 'element_type' => 'gateway']);

$queryString = http_build_query([
'pmql' => "process_request_id = {$request->id}",
]);
$response = $this->apiCall('GET', '/tasks?' . $queryString);

// Assert default behavior: only human tasks
$response = $response->json();
$this->assertCount(1, $response['data']);
$this->assertEquals($userTask->id, $response['data'][0]['id']);

$queryString = http_build_query([
'pmql' => "process_request_id = {$request->id}",
'all_tasks' => 1,
]);
$response = $this->apiCall('GET', '/tasks?' . $queryString);

// Assert all tasks returned
$response = $response->json();
$this->assertCount(3, $response['data']);
$this->assertEquals($userTask->id, $response['data'][0]['id']);
$this->assertEquals($scriptTask->id, $response['data'][1]['id']);
$this->assertEquals($gatewayTask->id, $response['data'][2]['id']);
}
}