KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: new endpoint for the text search

Browse source
This commit is contained in:
Tejaswini Chile 2022-12-10 01:39:53 +05:30
parent c03a6602f3
commit 1a2349ae84
3 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/api/v1/accounts/conversations_controller.rb
View file

@ -2,8 +2,8 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
include Events::Types include Events::Types
include DateRangeHelper include DateRangeHelper
before_action :conversation, except: [:index, :meta, :search, :create, :filter] before_action :conversation, except: [:index, :meta, :search, :create, :filter, :text_search]
before_action :inbox, :contact, :contact_inbox, only: [:create] before_action :inbox, :contact, :contact_inbox, :text_search, only: [:create]
def index def index
result = conversation_finder.perform result = conversation_finder.perform
@ -12,7 +12,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
end end
def text_search def text_search
@result = conversation_finder.search @result = conversation_finder.text_search
end end
def meta def meta

20
app/finders/conversation_finder.rb
View file

@ -44,6 +44,14 @@ class ConversationFinder
} }
end end
def text_search
{
messages: filter_messages,
conversations: filter_conversations,
contacts: filter_contacts
}
end
private private
def set_up def set_up
@ -103,12 +111,12 @@ class ConversationFinder
@conversations @conversations
end end
def search def filter_by_query
{ allowed_message_types = [Message.message_types[:incoming], Message.message_types[:outgoing]]
messages: filter_messages, @conversations = conversations.joins(:messages).where('messages.content ILIKE :search', search: "%#{params[:q]}%")
conversations: filter_conversations, .where(messages: { message_type: allowed_message_types }).includes(:messages)
contacts: filter_contacts .where('messages.content ILIKE :search', search: "%#{params[:q]}%")
} .where(messages: { message_type: allowed_message_types })
end end
def filter_by_query def filter_by_query

18
app/views/api/v1/accounts/conversations/text_search.json.jbuilder
View file

@ -1,13 +1,19 @@
json.payload do json.payload do
json.array! @result[:conversations] do |conversation| json.conversations do
json.partial! 'api/v1/models/conversation', formats: [:json], conversation: conversation json.array! @result[:conversations] do |conversation|
json.partial! 'api/v1/models/conversation', formats: [:json], conversation: conversation
end
end end
json.array! @result[:contacts] do |contact| json.contacts do
json.partial! 'api/v1/models/contact', formats: [:json], resource: contact json.array! @result[:contacts] do |contact|
json.partial! 'api/v1/models/contact', formats: [:json], resource: contact
end
end end
json.array! @result[:messages] do |message| json.messages do
json.partial! 'api/v1/models/message', formats: [:json], message: message json.array! @result[:messages] do |message|
json.partial! 'api/v1/models/message', formats: [:json], message: message
end
end end
end end