From feb2f9ae82e43fe9e427dd0c4121d71a24935a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20B=C3=B6hler?= Date: Thu, 21 Mar 2019 13:51:02 +0100 Subject: [PATCH 1/3] Add user id and displayname in task status (API) --- app/Ninja/Transformers/TaskTransformer.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Ninja/Transformers/TaskTransformer.php b/app/Ninja/Transformers/TaskTransformer.php index 98b09fbbbfe9..20989b816cc2 100644 --- a/app/Ninja/Transformers/TaskTransformer.php +++ b/app/Ninja/Transformers/TaskTransformer.php @@ -63,6 +63,8 @@ class TaskTransformer extends EntityTransformer { return array_merge($this->getDefaults($task), [ 'id' => (int) $task->public_id, + 'user_id' => (int) $task->user_id, + 'username' => $task->user->getDisplayName(), 'description' => $task->description ?: '', 'duration' => $task->getDuration() ?: 0, 'updated_at' => (int) $this->getTimestamp($task->updated_at), From afbd8df0728f2a84dbfb85067213eb8d061e2173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20B=C3=B6hler?= Date: Thu, 21 Mar 2019 16:46:46 +0100 Subject: [PATCH 2/3] Fixes for Code Review --- app/Http/Controllers/TaskApiController.php | 2 +- app/Ninja/Transformers/TaskTransformer.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/TaskApiController.php b/app/Http/Controllers/TaskApiController.php index cead941fd910..c5d2682b142c 100644 --- a/app/Http/Controllers/TaskApiController.php +++ b/app/Http/Controllers/TaskApiController.php @@ -45,7 +45,7 @@ class TaskApiController extends BaseAPIController { $tasks = Task::scope() ->withTrashed() - ->with('client', 'invoice', 'project', 'task_status') + ->with('client', 'invoice', 'project', 'task_status', 'user') ->orderBy('updated_at', 'desc'); return $this->listResponse($tasks); diff --git a/app/Ninja/Transformers/TaskTransformer.php b/app/Ninja/Transformers/TaskTransformer.php index 20989b816cc2..45d5907b6107 100644 --- a/app/Ninja/Transformers/TaskTransformer.php +++ b/app/Ninja/Transformers/TaskTransformer.php @@ -63,7 +63,7 @@ class TaskTransformer extends EntityTransformer { return array_merge($this->getDefaults($task), [ 'id' => (int) $task->public_id, - 'user_id' => (int) $task->user_id, + 'user_id' => (int) $task->user->public_id, 'username' => $task->user->getDisplayName(), 'description' => $task->description ?: '', 'duration' => $task->getDuration() ?: 0, From fde4e553dfcb470be16cfeced1b75f49ecb053da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20B=C3=B6hler?= Date: Fri, 22 Mar 2019 07:55:29 +0100 Subject: [PATCH 3/3] Change username -> user --- app/Ninja/Transformers/TaskTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Ninja/Transformers/TaskTransformer.php b/app/Ninja/Transformers/TaskTransformer.php index 45d5907b6107..cd04fc6ca8e1 100644 --- a/app/Ninja/Transformers/TaskTransformer.php +++ b/app/Ninja/Transformers/TaskTransformer.php @@ -64,7 +64,7 @@ class TaskTransformer extends EntityTransformer return array_merge($this->getDefaults($task), [ 'id' => (int) $task->public_id, 'user_id' => (int) $task->user->public_id, - 'username' => $task->user->getDisplayName(), + 'user' => $task->user->getDisplayName(), 'description' => $task->description ?: '', 'duration' => $task->getDuration() ?: 0, 'updated_at' => (int) $this->getTimestamp($task->updated_at),