Skip to content

Commit d329de0

Browse files
committed
fix sql bug in get message by tag id
1 parent b10fbd4 commit d329de0

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/Conversations/ConversationRepository.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -208,19 +208,20 @@ public function getMessagesById($conversationId, $userId, $offset, $take)
208208
public function getMessagesByTagId($tagId, $userId)
209209
{
210210
return Conversation::with(['messages' => function ($query) use ($userId) {
211-
$query->where(function ($qr) use ($userId) {
212-
$qr->where('user_id', '=', $userId)
213-
->where('deleted_from_sender', 0);
214-
})
211+
$query
212+
->where(function ($qr) use ($userId) {
213+
$qr->where('messages.user_id', '=', $userId)
214+
->where('messages.deleted_from_sender', 0);
215+
})
215216
->orWhere(function ($q) use ($userId) {
216-
$q->where('user_id', '!=', $userId)
217-
->where('deleted_from_receiver', 0);
217+
$q->where('messages.user_id', '!=', $userId)
218+
->where('messages.deleted_from_receiver', 0);
218219
});
219220
},
220221
'userone',
221222
'usertwo',
222223
'tags' => function ($query) use ($tagId) {
223-
$query->where('id', $tagId);
224+
$query->where('tags.id', $tagId);
224225
},
225226
])
226227
->get();

0 commit comments

Comments
 (0)