refactor: threadResource mods

syntaxlexx · Jan 17, 2022 · fcdc826 · fcdc826
1 parent 59c1951
commit fcdc826
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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')),