fix read

QuentinGab · QuentinGab · commit 8c7bf06aa13d · 2025-05-14T15:34:32.000+02:00
diff --git a/src/Concerns/ParticipateToConversations.php b/src/Concerns/ParticipateToConversations.php
@@ -101,6 +101,7 @@ public function denormalizedConversationsUnread(): BelongsToMany
     {
         return $this
             ->conversations()
+            ->where('conversations.latest_message_id', '!=', null)
             ->where(function ($query) {
                 return $query
                     ->where('conversation_user.last_read_message_id', '=', null)
@@ -118,7 +119,11 @@ public function denormalizedConversationsRead(): BelongsToMany
     {
         return $this
             ->conversations()
-            ->wherePivot('last_read_message_id', '>=', DB::raw('conversations.latest_message_id'));
+            ->where(function ($query) {
+                $query
+                    ->where('conversations.latest_message_id', '=', null)
+                    ->orWhere('conversation_user.last_read_message_id', '>=', DB::raw('conversations.latest_message_id'));
+            });
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ public function denormalizedConversationsUnread(): BelongsToMany`
`101`	`101`	`{`
`102`	`102`	`return $this`
`103`	`103`	`->conversations()`
	`104`	`+ ->where('conversations.latest_message_id', '!=', null)`
`104`	`105`	`->where(function ($query) {`
`105`	`106`	`return $query`
`106`	`107`	`->where('conversation_user.last_read_message_id', '=', null)`
`@@ -118,7 +119,11 @@ public function denormalizedConversationsRead(): BelongsToMany`
`118`	`119`	`{`
`119`	`120`	`return $this`
`120`	`121`	`->conversations()`
`121`		`- ->wherePivot('last_read_message_id', '>=', DB::raw('conversations.latest_message_id'));`
	`122`	`+ ->where(function ($query) {`
	`123`	`+ $query`
	`124`	`+ ->where('conversations.latest_message_id', '=', null)`
	`125`	`+ ->orWhere('conversation_user.last_read_message_id', '>=', DB::raw('conversations.latest_message_id'));`
	`126`	`+ });`
`122`	`127`	`}`
`123`	`128`
`124`	`129`	`/**`