LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "feat(perf): update query to reduce N+1 impact [CW-1926] (#7228)" (#7271)

Browse Source 
This reverts commit f28533bc47.
This commit is contained in:
Shivam Mishra
2023-06-15 16:23:56 +05:30
committed by GitHub
parent 06ac7c829b
commit cac9fe1880
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/finders/conversation_finder.rb
View File

@@ -155,9 +155,9 @@ class ConversationFinder
end end
def conversations def conversations
@conversations = @conversations.includes(:taggings, :inbox, @conversations = @conversations.includes(
{ assignee: [{ account_users: [:account] }, { avatar_attachment: [:blob] }] }, :taggings, :inbox, { assignee: { avatar_attachment: [:blob] } }, { contact: { avatar_attachment: [:blob] } }, :team, :contact_inbox
{ contact: { avatar_attachment: [:blob] } }, :team, :contact_inbox, :messages) )
sort_by = SORT_OPTIONS[params[:sort_by]] || SORT_OPTIONS['latest'] sort_by = SORT_OPTIONS[params[:sort_by]] || SORT_OPTIONS['latest']
@conversations.send(sort_by).page(current_page) @conversations.send(sort_by).page(current_page)
end end

2
app/views/api/v1/conversations/partials/_conversation.json.jbuilder
View File

@@ -22,7 +22,7 @@ if conversation.messages.first.blank?
elsif conversation.unread_incoming_messages.count.zero? elsif conversation.unread_incoming_messages.count.zero?
json.messages [conversation.messages.includes([{ attachments: [{ file_attachment: [:blob] }] }]).last.try(:push_event_data)] json.messages [conversation.messages.includes([{ attachments: [{ file_attachment: [:blob] }] }]).last.try(:push_event_data)]
else else
json.messages conversation.unread_messages.includes([{ attachments: [{ file_attachment: [:blob] }] }]).last(10).map(&:push_event_data) json.messages conversation.unread_messages.includes([:user, { attachments: [{ file_attachment: [:blob] }] }]).last(10).map(&:push_event_data)
end end
json.account_id conversation.account_id json.account_id conversation.account_id