mirror of
				https://github.com/lingble/chatwoot.git
				synced 2025-11-03 20:48:07 +00:00 
			
		
		
		
	feat: API to add label to contacts (#1563)
This commit is contained in:
		@@ -0,0 +1,13 @@
 | 
				
			|||||||
 | 
					class Api::V1::Accounts::Contacts::LabelsController < Api::V1::Accounts::BaseController
 | 
				
			||||||
 | 
					  include LabelConcern
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  private
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  def model
 | 
				
			||||||
 | 
					    @model ||= Current.account.contacts.find(params[:contact_id])
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  def permitted_params
 | 
				
			||||||
 | 
					    params.permit(:contact_id, :labels)
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					end
 | 
				
			||||||
@@ -1,11 +1,13 @@
 | 
				
			|||||||
class Api::V1::Accounts::Conversations::LabelsController < Api::V1::Accounts::Conversations::BaseController
 | 
					class Api::V1::Accounts::Conversations::LabelsController < Api::V1::Accounts::Conversations::BaseController
 | 
				
			||||||
  def create
 | 
					  include LabelConcern
 | 
				
			||||||
    @conversation.update_labels(params[:labels])
 | 
					
 | 
				
			||||||
    @labels = @conversation.label_list
 | 
					  private
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  def model
 | 
				
			||||||
 | 
					    @model ||= @conversation
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # all labels of the current conversation
 | 
					  def permitted_params
 | 
				
			||||||
  def index
 | 
					    params.permit(:conversation_id, :labels)
 | 
				
			||||||
    @labels = @conversation.label_list
 | 
					 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										10
									
								
								app/controllers/concerns/label_concern.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								app/controllers/concerns/label_concern.rb
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,10 @@
 | 
				
			|||||||
 | 
					module LabelConcern
 | 
				
			||||||
 | 
					  def create
 | 
				
			||||||
 | 
					    model.update_labels(permitted_params[:labels])
 | 
				
			||||||
 | 
					    @labels = model.label_list
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  def index
 | 
				
			||||||
 | 
					    @labels = model.label_list
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					end
 | 
				
			||||||
							
								
								
									
										11
									
								
								app/models/concerns/labelable.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								app/models/concerns/labelable.rb
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,11 @@
 | 
				
			|||||||
 | 
					module Labelable
 | 
				
			||||||
 | 
					  extend ActiveSupport::Concern
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  included do
 | 
				
			||||||
 | 
					    acts_as_taggable_on :labels
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  def update_labels(labels = nil)
 | 
				
			||||||
 | 
					    update!(label_list: labels)
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					end
 | 
				
			||||||
@@ -26,6 +26,7 @@ class Contact < ApplicationRecord
 | 
				
			|||||||
  include Pubsubable
 | 
					  include Pubsubable
 | 
				
			||||||
  include Avatarable
 | 
					  include Avatarable
 | 
				
			||||||
  include AvailabilityStatusable
 | 
					  include AvailabilityStatusable
 | 
				
			||||||
 | 
					  include Labelable
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  validates :account_id, presence: true
 | 
					  validates :account_id, presence: true
 | 
				
			||||||
  validates :email, allow_blank: true, uniqueness: { scope: [:account_id], case_sensitive: false }
 | 
					  validates :email, allow_blank: true, uniqueness: { scope: [:account_id], case_sensitive: false }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -32,6 +32,8 @@
 | 
				
			|||||||
#
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Conversation < ApplicationRecord
 | 
					class Conversation < ApplicationRecord
 | 
				
			||||||
 | 
					  include Labelable
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  validates :account_id, presence: true
 | 
					  validates :account_id, presence: true
 | 
				
			||||||
  validates :inbox_id, presence: true
 | 
					  validates :inbox_id, presence: true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -57,8 +59,6 @@ class Conversation < ApplicationRecord
 | 
				
			|||||||
  after_create_commit :notify_conversation_creation, :queue_conversation_auto_resolution_job
 | 
					  after_create_commit :notify_conversation_creation, :queue_conversation_auto_resolution_job
 | 
				
			||||||
  after_save :run_round_robin
 | 
					  after_save :run_round_robin
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  acts_as_taggable_on :labels
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  delegate :auto_resolve_duration, to: :account
 | 
					  delegate :auto_resolve_duration, to: :account
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def can_reply?
 | 
					  def can_reply?
 | 
				
			||||||
@@ -75,10 +75,6 @@ class Conversation < ApplicationRecord
 | 
				
			|||||||
    update!(assignee: agent)
 | 
					    update!(assignee: agent)
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def update_labels(labels = nil)
 | 
					 | 
				
			||||||
    update!(label_list: labels)
 | 
					 | 
				
			||||||
  end
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  def toggle_status
 | 
					  def toggle_status
 | 
				
			||||||
    # FIXME: implement state machine with aasm
 | 
					    # FIXME: implement state machine with aasm
 | 
				
			||||||
    self.status = open? ? :resolved : :open
 | 
					    self.status = open? ? :resolved : :open
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					json.payload @labels
 | 
				
			||||||
@@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					json.payload @labels
 | 
				
			||||||
@@ -71,6 +71,7 @@ Rails.application.routes.draw do
 | 
				
			|||||||
            scope module: :contacts do
 | 
					            scope module: :contacts do
 | 
				
			||||||
              resources :conversations, only: [:index]
 | 
					              resources :conversations, only: [:index]
 | 
				
			||||||
              resources :contact_inboxes, only: [:create]
 | 
					              resources :contact_inboxes, only: [:create]
 | 
				
			||||||
 | 
					              resources :labels, only: [:create, :index]
 | 
				
			||||||
            end
 | 
					            end
 | 
				
			||||||
          end
 | 
					          end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -0,0 +1,67 @@
 | 
				
			|||||||
 | 
					require 'rails_helper'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					RSpec.describe 'Contact Label API', type: :request do
 | 
				
			||||||
 | 
					  let(:account) { create(:account) }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  describe 'GET /api/v1/accounts/{account.id}/contacts/<id>/labels' do
 | 
				
			||||||
 | 
					    let(:contact) { create(:contact, account: account) }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    before do
 | 
				
			||||||
 | 
					      contact.update_labels('label1, label2')
 | 
				
			||||||
 | 
					    end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    context 'when it is an unauthenticated user' do
 | 
				
			||||||
 | 
					      it 'returns unauthorized' do
 | 
				
			||||||
 | 
					        get api_v1_account_contact_labels_url(account_id: account.id, contact_id: contact.id)
 | 
				
			||||||
 | 
					        expect(response).to have_http_status(:unauthorized)
 | 
				
			||||||
 | 
					      end
 | 
				
			||||||
 | 
					    end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    context 'when it is an authenticated user' do
 | 
				
			||||||
 | 
					      let(:agent) { create(:user, account: account, role: :agent) }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      it 'returns all the labels for the contact' do
 | 
				
			||||||
 | 
					        get api_v1_account_contact_labels_url(account_id: account.id, contact_id: contact.id),
 | 
				
			||||||
 | 
					            headers: agent.create_new_auth_token,
 | 
				
			||||||
 | 
					            as: :json
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        expect(response).to have_http_status(:success)
 | 
				
			||||||
 | 
					        expect(response.body).to include('label1')
 | 
				
			||||||
 | 
					        expect(response.body).to include('label2')
 | 
				
			||||||
 | 
					      end
 | 
				
			||||||
 | 
					    end
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  describe 'POST /api/v1/accounts/{account.id}/contacts/<id>/labels' do
 | 
				
			||||||
 | 
					    let(:contact) { create(:contact, account: account) }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    before do
 | 
				
			||||||
 | 
					      contact.update_labels('label1, label2')
 | 
				
			||||||
 | 
					    end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    context 'when it is an unauthenticated user' do
 | 
				
			||||||
 | 
					      it 'returns unauthorized' do
 | 
				
			||||||
 | 
					        post api_v1_account_contact_labels_url(account_id: account.id, contact_id: contact.id),
 | 
				
			||||||
 | 
					             params: { labels: 'label3,label4' },
 | 
				
			||||||
 | 
					             as: :json
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        expect(response).to have_http_status(:unauthorized)
 | 
				
			||||||
 | 
					      end
 | 
				
			||||||
 | 
					    end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    context 'when it is an authenticated user' do
 | 
				
			||||||
 | 
					      let(:agent) { create(:user, account: account, role: :agent) }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      it 'creates labels for the contact' do
 | 
				
			||||||
 | 
					        post api_v1_account_contact_labels_url(account_id: account.id, contact_id: contact.id),
 | 
				
			||||||
 | 
					             params: { labels: 'label3,label4' },
 | 
				
			||||||
 | 
					             headers: agent.create_new_auth_token,
 | 
				
			||||||
 | 
					             as: :json
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        expect(response).to have_http_status(:success)
 | 
				
			||||||
 | 
					        expect(response.body).to include('label3')
 | 
				
			||||||
 | 
					        expect(response.body).to include('label4')
 | 
				
			||||||
 | 
					      end
 | 
				
			||||||
 | 
					    end
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					end
 | 
				
			||||||
		Reference in New Issue
	
	Block a user