From fcdc826631c74ad030683accc3772c66b017e851 Mon Sep 17 00:00:00 2001 From: Lexx YungCarter Date: Mon, 17 Jan 2022 12:41:16 +0300 Subject: [PATCH] refactor: threadResource mods --- src/Resources/ThreadResource.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Resources/ThreadResource.php b/src/Resources/ThreadResource.php index cc0cccc..2307ab9 100644 --- a/src/Resources/ThreadResource.php +++ b/src/Resources/ThreadResource.php @@ -14,6 +14,8 @@ class ThreadResource extends JsonResource */ public function toArray($request) { + $creator = $this->creator(); + return [ 'id' => (int) $this->id, 'subject' => $this->subject, @@ -29,8 +31,9 @@ public function toArray($request) 'unread_count' => $this->userUnreadMessagesCount(auth()->id()), 'latest_message' => optional($this->latestMessage)->body ?? null, - 'creator' => optional($this->creator())->name, - 'creator_avatar' => optional($this->creator())->avatar_url, + 'creator_id' => $creator->id ?? null, + 'creator_name' => $creator->name ?? null, + 'creator_avatar' => $creator->avatar_url ?? null, 'participants' => $this->participantsString(auth()->id()), 'messages' => MessageResource::collection($this->whenLoaded('messages')),