formatting

binkode · Jun 18, 2021 · e868db5 · e868db5
1 parent f9e723d
commit e868db5
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Http/Controllers/ConversationController.php b/src/Http/Controllers/ConversationController.php
@@ -22,6 +22,10 @@ public function index(PaginableRequest $request)
       $order    = $request->order;
       $orderBy  = $request->orderBy;
 
+      $eventColumns = ['id', 'maker_id', 'made_type', 'made_id', 'created_at'];
+
+      $queryEvent = fn ($q) => $q->select($eventColumns)->notMessanger($user->id);
+
       $conversations = $user->conversations()
       ->whereHasLastMessage($user)
       ->withCount([
@@ -30,9 +34,9 @@ public function index(PaginableRequest $request)
       ])
       ->orderByDesc('latest_message_at')
       ->with([
-        'delivery' => fn ($q) => $q->select('id', 'maker_id', 'made_type', 'made_id', 'created_at')->notMessanger($user->id)->where('maker_id', '!=', $user->id),
-        'read' => fn ($q) => $q->select('id', 'maker_id', 'made_type', 'made_id', 'created_at')->notMessanger($user->id)->where('maker_id', '!=', $user->id),
-        'trashed' => fn ($q) => $q->select('id', 'maker_id', 'made_type', 'made_id', 'created_at')->whereMakerId($user->id),
+        'delivery'      => fn ($q) => $queryEvent($q)->where('maker_id', '!=', $user->id),
+        'read'          => fn ($q) => $queryEvent($q)->where('maker_id', '!=', $user->id),
+        'trashed'       => $queryEvent,
         'last_message' => fn ($q) => $q->select(['id','user_id','message','conversation_id', 'created_at'])
           ->with([
             // 'latestMedia' => fn ($q) => $q->select('id', 'model_type', 'model_id', 'name'),