renamed withTrashed to withAll

binkode · Oct 16, 2021 · e4d2516 · e4d2516
1 parent 466055d
commit e4d2516
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/Http/Controllers/ConversationController.php b/src/Http/Controllers/ConversationController.php
@@ -36,13 +36,14 @@ public function index(PaginableRequest $request)
       ])
       ->orderByDesc('latest_message_at')
       ->with([
+        // 'chatEvents' => fn ($q) => $q->groupBy('chat_events.id', 'chat_events.maker_type', 'chat_events.maker_id', 'chat_events.made_type', 'chat_events.made_id', 'chat_events.all', 'chat_events.created_at', 'chat_events.updated_at'),
         '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'),
-            'trashed' => fn ($q) => $q->withTrashed($user)
+            'trashed' => fn ($q) => $q->withAll($user)
           ]),
         'participant' => fn ($q) => $q->select('id', 'user_id', 'conversation_id')->where('user_id', '!=', $user->id),
         'participant.user' => fn ($q) => $q,//->withUrls(['avatar']),

diff --git a/src/Http/Controllers/MessageController.php b/src/Http/Controllers/MessageController.php
@@ -44,7 +44,7 @@ public function index(PaginableRequest $request)
       $reply    = [];
       $with     = [
         'reply',
-        'trashed' => fn ($q) => $q->withTrashed($user),
+        'trashed' => fn ($q) => $q->withAll($user),
         'sender',
       ];
 

diff --git a/src/Models/ChatEvent.php b/src/Models/ChatEvent.php
@@ -21,22 +21,20 @@ protected static function newFactory(){
       return ChatEventFactory::new();
     }
 
-    function scopeWithTrashed($q, ChatEventMaker $user) {
-      $q->select('id', 'maker_id', 'maker_type', 'made_id', 'made_type', 'all')->whereMakerId($user->id)->orWhere('all', true);
+    function scopeWithAll($q, ChatEventMaker $user) {
+      $q->select('*')->whereMakerId($user->id)->orWhere('all', true);
     }
 
     function scopeNotMessanger($q, ChatEventMaker|int $user) {
       $q->whereDoesntHave('message', fn($q) => $q->whereUserId($user->id ?? $user));
     }
 
     function message(): BelongsTo {
-      $message = self::config('models.message');
-      return $this->belongsTo($message, 'made_id')->whereMadeType($message);
+      return $this->belongsTo(self::config('models.message'), 'made_id');
     }
 
     function conversation(): BelongsTo {
-      $conversation = self::config('models.conversation');
-      return $this->belongsTo($conversation, 'made_id')->whereMadeType($conversation);
+      return $this->belongsTo(self::config('models.conversation'), 'made_id');
     }
 
     function maker(): MorphTo{