changed notMsgEvents to whereDoesntHaveChatEvents

binkode · Sep 25, 2021 · f8db80a · f8db80a
1 parent c05e3a7
commit f8db80a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/docs b/docs
diff --git a/src/Jobs/Chat/MakeEvent.php b/src/Jobs/Chat/MakeEvent.php
@@ -43,7 +43,7 @@ public function handle()
       } else {
         // get unread msg for conversations
         $undelivered = Config::config('models.message')::with('conversation')
-        ->notMsgEvents('deliver', $this->user->id, fn ($q) =>
+        ->whereDoesntHaveChatEvents('deliver', $this->user->id, fn ($q) =>
           $q->whereIn('id', $conversation->pluck('id'))
         )->where('user_id', '!=', $this->user->id)->get();
 

diff --git a/src/Models/Message.php b/src/Models/Message.php
@@ -44,16 +44,22 @@ protected static function newFactory(){
       return MessageFactory::new();
     }
 
-    function scopeNotMsgEvents($q, $type = null, ChatEventMaker|int $user = null, $conversationScope = null) {
+    function scopeWhereDoesntHaveChatEvents($q, $type = null, ChatEventMaker|int $user = null, $conversationScope = null) {
       $user_id = $user->id ?? $user ?? auth()->user()->id;
 
-      $q->whereHas('conversation', fn ($q) =>
+      if ($type == 'delete') {
         $q->whereDoesntHave('chatEvents', fn ($q) =>
-          $q->whereMakerId($user_id)
-          ->when($type, fn ($q) => $q->whereType($type))
-          ->whereColumn('created_at', '>', 'messages.created_at')
-        )->when($conversationScope, $conversationScope)
-      );
+          $q->whereMakerId($user_id)->whereType($type)
+        );
+      } else {
+        $q->whereHas('conversation', fn ($q) =>
+          $q->whereDoesntHave('chatEvents', fn ($q) =>
+            $q->whereMakerId($user_id)
+              ->when($type, fn ($q) => $q->whereType($type))
+              ->whereColumn('created_at', '>', 'messages.created_at')
+          )->when($conversationScope, $conversationScope)
+        );
+      }
     }
 
     function scopeWhereRelatedToUser($q, ChatEventMaker|int $user) {
@@ -96,7 +102,7 @@ function participantsHasDeleted(int $maker_id = null){
         ->when($maker_id, fn ($q) => $q->where('maker_id', '!=', $maker_id))
         ->count()
       ];
-      return $deleteEventsCount == $participantsCount-1;
+      return $deleteEventsCount == $participantsCount - 1;
     }
 
     function makeDelete(ChatEventMaker $user, $all = false) {