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

chore: Add status param in conversation APIs (#2394)

Browse Source 
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
This commit is contained in:
Sojan Jose
2021-06-07 20:04:31 +05:30
committed by GitHub
parent 467b45b427
commit 9e56565a30
5 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/api/v1/accounts/conversations_controller.rb
View File

@@ -98,13 +98,14 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
def conversation_params
additional_attributes = params[:additional_attributes]&.permit! || {}
status = params[:status].present? ? { status: params[:status] } : {}
{
account_id: Current.account.id,
inbox_id: @contact_inbox.inbox_id,
contact_id: @contact_inbox.contact_id,
contact_inbox_id: @contact_inbox.id,
additional_attributes: additional_attributes
}
}.merge(status)
end
def conversation_finder

12
spec/controllers/api/v1/accounts/conversations_controller_spec.rb
View File

@@ -162,6 +162,18 @@ RSpec.describe 'Conversations API', type: :request do
expect(response_data[:additional_attributes]).to eq(additional_attributes)
end
it 'creates a conversation in specificed status' do
allow(Rails.configuration.dispatcher).to receive(:dispatch)
post "/api/v1/accounts/#{account.id}/conversations",
headers: agent.create_new_auth_token,
params: { source_id: contact_inbox.source_id, status: 'bot' },
as: :json
expect(response).to have_http_status(:success)
response_data = JSON.parse(response.body, symbolize_names: true)
expect(response_data[:status]).to eq('bot')
end
it 'creates a new conversation with message when message is passed' do
allow(Rails.configuration.dispatcher).to receive(:dispatch)
post "/api/v1/accounts/#{account.id}/conversations",

4
spec/controllers/api/v1/profiles_controller_spec.rb
View File

@@ -58,12 +58,12 @@ RSpec.describe 'Profile API', type: :request do
it 'updates the password when current password is provided' do
put '/api/v1/profile',
params: { profile: { current_password: 'Test123!', password: 'test123', password_confirmation: 'test123' } },
params: { profile: { current_password: 'Test123!', password: 'Test1234!', password_confirmation: 'Test1234!' } },
headers: agent.create_new_auth_token,
as: :json
expect(response).to have_http_status(:success)
expect(agent.reload.valid_password?('test123')).to eq true
expect(agent.reload.valid_password?('Test1234!')).to eq true
end
it 'throws error when current password provided is invalid' do

6
swagger/paths/conversation/index_or_create.yml
View File

@@ -100,7 +100,7 @@ post:
schema:
type: object
properties:
source_id:
source_id:
$ref: '#/parameters/source_id'
inbox_id:
type: string
@@ -111,6 +111,10 @@ post:
additional_attributes:
type: object
description: Lets you specify attributes like browser information
status:
type: string
enum: ['open', 'resolved', 'bot']
description: Specify the conversation whether it's bot, open, closed
responses:
200:

9
swagger/swagger.json
View File

@@ -1224,6 +1224,15 @@
"additional_attributes": {
"type": "object",
"description": "Lets you specify attributes like browser information"
},
"status": {
"type": "string",
"enum": [
"open",
"resolved",
"bot"
],
"description": "Specify the conversation whether it's bot, open, closed"
}
}
}