Merge branch 'develop' into feat/CW-3059

app/controllers/api/v1/accounts/agents_controller.rb

@@ -43,7 +43,11 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
         inviter: current_user,
         account: Current.account
       )
-      builder.perform
+      begin
+        builder.perform
+      rescue ActiveRecord::RecordInvalid => e
+        Rails.logger.info "[Agent#bulk_create] ignoring email #{email}, errors: #{e.record.errors}"
+      end
     end
     head :ok
   end

app/mailboxes/mailbox_helper.rb

@@ -2,6 +2,7 @@ module MailboxHelper
   private
 
   def create_message
+    Rails.logger.info "[MailboxHelper] Creating message #{processed_mail.message_id}"
     return if @conversation.messages.find_by(source_id: processed_mail.message_id).present?
 
     @message = @conversation.messages.create!(
@@ -36,6 +37,7 @@ module MailboxHelper
   end
 
   def process_regular_attachments(attachments)
+    Rails.logger.info "[MailboxHelper] Processing regular attachments for message with ID: #{processed_mail.message_id}"
     attachments.each do |mail_attachment|
       attachment = @message.attachments.new(
         account_id: @conversation.account_id,
@@ -46,6 +48,8 @@ module MailboxHelper
   end
 
   def process_inline_attachments(attachments)
+    Rails.logger.info "[MailboxHelper] Processing inline attachments for message with ID: #{processed_mail.message_id}"
+
     # create an instance variable here, the `embed_inline_image_source`
     # updates them directly. And then the value is eventaully used to update the message content
     @html_content = processed_mail.serialized_data[:html_content][:full]
@@ -98,7 +102,9 @@ module MailboxHelper
         }
       }
     ).perform
+
     @contact = @contact_inbox.contact
+    Rails.logger.info "[MailboxHelper] Contact created with ID: #{@contact.id} for inbox with ID: #{@inbox.id}"
   end
 
   def notification_email_from_chatwoot?

spec/controllers/api/v1/accounts/agents_controller_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe 'Agents API', type: :request do
 
   let(:account) { create(:account) }
   let!(:admin) { create(:user, custom_attributes: { test: 'test' }, account: account, role: :administrator) }
-  let!(:agent) { create(:user, account: account, role: :agent) }
+  let!(:agent) { create(:user, account: account, email: 'exists@example.com', role: :agent) }
 
   describe 'GET /api/v1/accounts/{account.id}/agents' do
     context 'when it is an unauthenticated user' do
@@ -196,6 +196,17 @@ RSpec.describe 'Agents API', type: :request do
 
         expect(response).to have_http_status(:ok)
       end
+
+      it 'ignores errors if account_user already exists' do
+        params = { emails: ['exists@example.com', 'test1@example.com', 'test2@example.com'] }
+
+        expect do
+          post "/api/v1/accounts/#{account.id}/agents/bulk_create", params: params,
+                                                                    headers: admin.create_new_auth_token
+        end.to change(User, :count).by(2)
+
+        expect(response).to have_http_status(:ok)
+      end
     end
   end
 end