Skip to content

FOUR-15872 Implement task screen endpoint #6913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caleeli merged 8 commits into from
Jun 6, 2024
Merged

FOUR-15872 Implement task screen endpoint #6913

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
556452c
Merge pull request #6897 from ProcessMaker/FOUR-15868
caleeli May 31, 2024
bc0d2d3
Add task screen endpoint
caleeli Jun 4, 2024
d2b24aa
Register endpoint
caleeli Jun 4, 2024
07c44e0
Add test for task screen endpoint
caleeli Jun 5, 2024
4d7ec3f
Reduce the size of response
caleeli Jun 6, 2024
46add45
Move resource screen functions into a trait
caleeli Jun 6, 2024
1ad9ba7
Update test
caleeli Jun 6, 2024
0eb08d8
Clean code
caleeli Jun 6, 2024
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
Prev Previous commit
Clean code
  • Loading branch information
@caleeli
caleeli committed Jun 6, 2024
commit 0eb08d880a8ddc96438ea8a02bc2e0cdef24afd9
5 changes: 2 additions & 3 deletions ProcessMaker/Http/Controllers/Api/V1_1/TaskController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@

use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\ProcessRequestToken;
use ProcessMaker\Http\Resources\Task as Resource;
use ProcessMaker\Http\Resources\V1_1\TaskScreen;
use ProcessMaker\Models\ProcessVersion;

class TaskController extends Controller
{
Expand Down Expand Up @@ -36,7 +34,8 @@ public function show(ProcessRequestToken $task)

public function showScreen($taskId)
{
$task = ProcessRequestToken::select('id', 'process_request_id', 'element_id', 'process_id')->findOrFail($taskId);
$task = ProcessRequestToken::select('id', 'process_request_id', 'element_id', 'process_id')
->findOrFail($taskId);
$response = new TaskScreen($task);
$response = response($response->toArray(request())['screen'], 200);
$now = time();
Expand Down
4 changes: 1 addition & 3 deletions ProcessMaker/Http/Resources/V1_1/TaskScreen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ class TaskScreen extends ApiResource
*/
public function toArray($request)
{
$array = $this->includeScreen($request);

return $array;
return $this->includeScreen($request);
}

private function includeScreen($request)
Expand Down
1 change: 0 additions & 1 deletion tests/Feature/Api/V1_1/TaskControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Tests\Feature\Api\V1_1;

use ProcessMaker\Http\Controllers\Api\V1_1\TaskController;
use ProcessMaker\Models\ProcessRequest;
use ProcessMaker\Models\ProcessRequestToken;
use Tests\Feature\Shared\RequestHelper;
Expand Down