Merge branch 'master' of http://gitlab.nologostudio.ru/alarionov/rekamore-su

Андрей Ларионов
2 parents 051ca2ef2e b425eeabc0
Showing 1 changed file Side-by-side Diff
app/Models/Chat.php
@@ -69,7 +69,11 @@ class Chat extends Model
             ->with('employer')
             ->with('last_message')
             ->withCount(['unread_messages' => function ($query) use($user_id) {
-                $query->where('to_user_id', '=', $user_id)->where('flag_new', '=', 1);
+                $query
+                    ->where('to_user_id', '=', $user_id)
+                    ->whereNotNull('chat_id_from')
+                    ->where('flag_new', '=', 1)
+                ;
             }])
             ->where('user_id', '=', $user_id)
             ->where('is_removed', '=', 0)
...	...	@@ -69,7 +69,11 @@ class Chat extends Model
69	69	->with('employer')
70	70	->with('last_message')
71	71	->withCount(['unread_messages' => function ($query) use($user_id) {
72		- $query->where('to_user_id', '=', $user_id)->where('flag_new', '=', 1);
	72	+ $query
	73	+ ->where('to_user_id', '=', $user_id)
	74	+ ->whereNotNull('chat_id_from')
	75	+ ->where('flag_new', '=', 1)
	76	+ ;
73	77	}])
74	78	->where('user_id', '=', $user_id)
75	79	->where('is_removed', '=', 0)