From 27239ae14ae80709ae0a79cba0c8999ce268740b Mon Sep 17 00:00:00 2001 From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com> Date: Mon, 11 Dec 2023 09:33:39 +0530 Subject: [PATCH] feat: Adds API for retry messages in conversation (#8518) --- .../conversations/messages_controller.rb | 9 ++++ .../messages/retry.json.jbuilder | 1 + config/routes.rb | 1 + .../conversations/messages_controller_spec.rb | 45 +++++++++++++++++++ 4 files changed, 56 insertions(+) create mode 100644 app/views/api/v1/accounts/conversations/messages/retry.json.jbuilder diff --git a/app/controllers/api/v1/accounts/conversations/messages_controller.rb b/app/controllers/api/v1/accounts/conversations/messages_controller.rb index 319c6763f..d34561e36 100644 --- a/app/controllers/api/v1/accounts/conversations/messages_controller.rb +++ b/app/controllers/api/v1/accounts/conversations/messages_controller.rb @@ -18,6 +18,15 @@ class Api::V1::Accounts::Conversations::MessagesController < Api::V1::Accounts:: end end + def retry + return if message.blank? + + message.update!(status: :sent, content_attributes: {}) + ::SendReplyJob.perform_later(message.id) + rescue StandardError => e + render_could_not_create_error(e.message) + end + def translate return head :ok if already_translated_content_available? diff --git a/app/views/api/v1/accounts/conversations/messages/retry.json.jbuilder b/app/views/api/v1/accounts/conversations/messages/retry.json.jbuilder new file mode 100644 index 000000000..3798b6c1f --- /dev/null +++ b/app/views/api/v1/accounts/conversations/messages/retry.json.jbuilder @@ -0,0 +1 @@ +json.partial! 'api/v1/models/message', message: @message diff --git a/config/routes.rb b/config/routes.rb index f8a138bb5..c600edbf7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -84,6 +84,7 @@ Rails.application.routes.draw do resources :messages, only: [:index, :create, :destroy] do member do post :translate + post :retry end end resources :assignments, only: [:create] diff --git a/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb index dc9de8c35..8f7a5fea0 100644 --- a/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb +++ b/spec/controllers/api/v1/accounts/conversations/messages_controller_spec.rb @@ -234,4 +234,49 @@ RSpec.describe 'Conversation Messages API', type: :request do end end end + + describe 'POST /api/v1/accounts/{account.id}/conversations/:conversation_id/messages/:id/retry' do + let(:message) { create(:message, account: account, status: :failed, content_attributes: { external_error: 'error' }) } + + context 'when it is an unauthenticated user' do + it 'returns unauthorized' do + post "/api/v1/accounts/#{account.id}/conversations/#{message.conversation.display_id}/messages/#{message.id}/retry" + expect(response).to have_http_status(:unauthorized) + end + end + + context 'when it is an authenticated user with access to conversation' do + let(:agent) { create(:user, account: account, role: :agent) } + + before do + create(:inbox_member, inbox: message.conversation.inbox, user: agent) + end + + it 'retries the message' do + post "/api/v1/accounts/#{account.id}/conversations/#{message.conversation.display_id}/messages/#{message.id}/retry", + headers: agent.create_new_auth_token, + as: :json + + expect(response).to have_http_status(:success) + expect(message.reload.status).to eq('sent') + expect(message.reload.content_attributes['external_error']).to be_nil + end + end + + context 'when the message id is invalid' do + let(:agent) { create(:user, account: account, role: :agent) } + + before do + create(:inbox_member, inbox: message.conversation.inbox, user: agent) + end + + it 'returns not found error' do + post "/api/v1/accounts/#{account.id}/conversations/#{message.conversation.display_id}/messages/99999/retry", + headers: agent.create_new_auth_token, + as: :json + + expect(response).to have_http_status(:unprocessable_entity) + end + end + end end