scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-10-29 18:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: order for canned response (#6400)

Browse Source 
* feat: order canned response

Order canned responses by short_code match first and then with content

* Added specs

---------

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
This commit is contained in:
Shivam Mishra
2023-02-07 02:23:48 +05:30
committed by GitHub
parent d672aa357b
commit f8aa544aae
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/api/v1/accounts/canned_responses_controller.rb
View File

@@ -33,7 +33,10 @@ class Api::V1::Accounts::CannedResponsesController < Api::V1::Accounts::BaseCont
def canned_responses
if params[:search]
Current.account.canned_responses.where('short_code ILIKE :search OR content ILIKE :search', search: "%#{params[:search]}%")
Current.account.canned_responses
.where('short_code ILIKE :search OR content ILIKE :search', search: "%#{params[:search]}%")
.order_by_search(params[:search])
else
Current.account.canned_responses
end

10
app/models/canned_response.rb
View File

@@ -17,4 +17,14 @@ class CannedResponse < ApplicationRecord
validates_uniqueness_of :short_code, scope: :account_id
belongs_to :account
scope :order_by_search, lambda { |search|
short_code_starts_with = sanitize_sql_array(['WHEN short_code ILIKE ? THEN 1', "#{search}%"])
short_code_like = sanitize_sql_array(['WHEN short_code ILIKE ? THEN 0.5', "%#{search}%"])
content_like = sanitize_sql_array(['WHEN content ILIKE ? THEN 0.2', "%#{search}%"])
order_clause = "CASE #{short_code_starts_with} #{short_code_like} #{content_like} ELSE 0 END"
order(Arel.sql(order_clause) => :desc)
}
end

15
spec/controllers/api/v1/accounts/canned_responses_controller_spec.rb
View File

@@ -4,7 +4,7 @@ RSpec.describe 'Canned Responses API', type: :request do
let(:account) { create(:account) }
before do
create(:canned_response, account: account)
create(:canned_response, account: account, content: 'Hey {{ contact.name }}, Thanks for reaching out', short_code: 'name-short-code')
end
describe 'GET /api/v1/accounts/{account.id}/canned_responses' do
@@ -29,9 +29,12 @@ RSpec.describe 'Canned Responses API', type: :request do
end
it 'returns all the canned responses the user searched for' do
create(:canned_response, account: account)
cr1 = account.canned_responses.first
create(:canned_response, account: account, content: 'Great! Looking forward', short_code: 'short-code')
cr2 = create(:canned_response, account: account, content: 'Thanks for reaching out', short_code: 'content-with-thanks')
cr3 = create(:canned_response, account: account, content: 'Thanks for reaching out', short_code: 'Thanks')
params = { search: CannedResponse.last.short_code }
params = { search: 'thanks' }
get "/api/v1/accounts/#{account.id}/canned_responses",
params: params,
@@ -39,7 +42,9 @@ RSpec.describe 'Canned Responses API', type: :request do
as: :json
expect(response).to have_http_status(:success)
expect(JSON.parse(response.body)).to eq([CannedResponse.last].as_json)
expect(JSON.parse(response.body)).to eq(
[cr3, cr2, cr1].as_json
)
end
end
end
@@ -65,7 +70,7 @@ RSpec.describe 'Canned Responses API', type: :request do
as: :json
expect(response).to have_http_status(:success)
expect(CannedResponse.count).to eq(2)
expect(account.canned_responses.count).to eq(2)
end
end
end