refactor: strategy pattern for mailbox conversation finding (#12766)
Co-authored-by: Pranav <pranav@chatwoot.com> Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
This commit is contained in:
parent
fb1aa085cf
commit
615e81731c
@ -4,38 +4,21 @@ class ApplicationMailbox < ActionMailbox::Base
|
|||||||
# Last part is the regex for the UUID
|
# Last part is the regex for the UUID
|
||||||
# Eg: email should be something like : reply+6bdc3f4d-0bec-4515-a284-5d916fdde489@domain.com
|
# Eg: email should be something like : reply+6bdc3f4d-0bec-4515-a284-5d916fdde489@domain.com
|
||||||
REPLY_EMAIL_UUID_PATTERN = /^reply\+([0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12})$/i
|
REPLY_EMAIL_UUID_PATTERN = /^reply\+([0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12})$/i
|
||||||
CONVERSATION_MESSAGE_ID_PATTERN = %r{conversation/([a-zA-Z0-9-]*?)/messages/(\d+?)@(\w+\.\w+)}
|
|
||||||
|
|
||||||
# routes as a reply to existing conversations
|
# Route all emails to verified channels to the unified reply mailbox
|
||||||
|
# The ConversationFinder will determine if it's a reply or new conversation
|
||||||
routing(
|
routing(
|
||||||
->(inbound_mail) { valid_to_address?(inbound_mail) && (reply_uuid_mail?(inbound_mail) || in_reply_to_mail?(inbound_mail)) } => :reply
|
lambda { |inbound_mail|
|
||||||
)
|
valid_to_address?(inbound_mail) &&
|
||||||
|
(reply_uuid_mail?(inbound_mail) || EmailChannelFinder.new(inbound_mail.mail).perform.present?)
|
||||||
# routes as a new conversation in email channel
|
} => :reply
|
||||||
routing(
|
|
||||||
->(inbound_mail) { valid_to_address?(inbound_mail) && EmailChannelFinder.new(inbound_mail.mail).perform.present? } => :support
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# catchall
|
# catchall
|
||||||
routing(all: :default)
|
routing(all: :default)
|
||||||
|
|
||||||
class << self
|
class << self
|
||||||
# checks if follow this pattern then send it to reply_mailbox
|
# checks if follows this pattern: reply+<conversation-uuid>@<mailer-domain.com>
|
||||||
# <account/#{@account.id}/conversation/#{@conversation.uuid}@#{@account.inbound_email_domain}>
|
|
||||||
def in_reply_to_mail?(inbound_mail)
|
|
||||||
in_reply_to = inbound_mail.mail.in_reply_to
|
|
||||||
|
|
||||||
in_reply_to.present? && (
|
|
||||||
in_reply_to_matches?(in_reply_to) || Message.exists?(source_id: in_reply_to)
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
def in_reply_to_matches?(in_reply_to)
|
|
||||||
Array.wrap(in_reply_to).any? { it.match?(CONVERSATION_MESSAGE_ID_PATTERN) }
|
|
||||||
end
|
|
||||||
|
|
||||||
# checks if follow this pattern send it to reply_mailbox
|
|
||||||
# reply+<conversation-uuid>@<mailer-domain.com>
|
|
||||||
def reply_uuid_mail?(inbound_mail)
|
def reply_uuid_mail?(inbound_mail)
|
||||||
inbound_mail.mail.to&.any? do |email|
|
inbound_mail.mail.to&.any? do |email|
|
||||||
conversation_uuid = email.split('@')[0]
|
conversation_uuid = email.split('@')[0]
|
||||||
|
|||||||
@ -3,6 +3,8 @@ class Imap::ImapMailbox
|
|||||||
include IncomingEmailValidityHelper
|
include IncomingEmailValidityHelper
|
||||||
attr_accessor :channel, :account, :inbox, :conversation, :processed_mail
|
attr_accessor :channel, :account, :inbox, :conversation, :processed_mail
|
||||||
|
|
||||||
|
FALLBACK_CONVERSATION_PATTERN = %r{account/(\d+)/conversation/([a-zA-Z0-9-]+)@}
|
||||||
|
|
||||||
def process(mail, channel)
|
def process(mail, channel)
|
||||||
@inbound_mail = mail
|
@inbound_mail = mail
|
||||||
@channel = channel
|
@channel = channel
|
||||||
@ -49,19 +51,32 @@ class Imap::ImapMailbox
|
|||||||
end
|
end
|
||||||
|
|
||||||
def find_conversation_by_reference_ids
|
def find_conversation_by_reference_ids
|
||||||
return if @inbound_mail.references.blank? && in_reply_to.present?
|
return if @inbound_mail.references.blank?
|
||||||
|
|
||||||
message = find_message_by_references
|
message = find_message_by_references
|
||||||
|
if message.present?
|
||||||
|
conversation = @inbox.conversations.find_by(id: message.conversation_id)
|
||||||
|
return conversation if conversation.present?
|
||||||
|
end
|
||||||
|
|
||||||
return if message.nil?
|
# FALLBACK_PATTERN use to find a conversation that is started by an agent (no incoming message yet)
|
||||||
|
conversation_id = find_conversation_by_references
|
||||||
@inbox.conversations.find(message.conversation_id)
|
@inbox.conversations.find_by(uuid: conversation_id) if conversation_id.present?
|
||||||
end
|
end
|
||||||
|
|
||||||
def in_reply_to
|
def in_reply_to
|
||||||
@processed_mail.in_reply_to
|
@processed_mail.in_reply_to
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def find_conversation_by_references
|
||||||
|
references = Array.wrap(@inbound_mail.references)
|
||||||
|
references.each do |message_id|
|
||||||
|
match = FALLBACK_CONVERSATION_PATTERN.match(message_id)
|
||||||
|
|
||||||
|
return match[2] if match.present?
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def find_message_by_references
|
def find_message_by_references
|
||||||
message_to_return = nil
|
message_to_return = nil
|
||||||
|
|
||||||
|
|||||||
@ -1,88 +1,38 @@
|
|||||||
class ReplyMailbox < ApplicationMailbox
|
class ReplyMailbox < ApplicationMailbox
|
||||||
attr_accessor :conversation_uuid, :processed_mail
|
attr_accessor :conversation, :processed_mail
|
||||||
|
|
||||||
# Last part is the regex for the UUID
|
before_processing :find_conversation
|
||||||
# Eg: email should be something like : reply+6bdc3f4d-0bec-4515-a284-5d916fdde489@domain.com
|
|
||||||
EMAIL_PART_PATTERN = /^reply\+([0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12})$/i
|
|
||||||
|
|
||||||
before_processing :conversation_uuid_from_to_address,
|
|
||||||
:find_relative_conversation
|
|
||||||
|
|
||||||
def process
|
def process
|
||||||
return if @conversation.blank?
|
# Return early if no conversation was found (e.g., notification emails, suspended accounts)
|
||||||
|
return unless @conversation
|
||||||
|
|
||||||
|
# Wrap everything in a transaction to ensure atomicity
|
||||||
|
# This prevents orphan conversations if message/attachment creation fails
|
||||||
|
# and ensures idempotency on job retry (conversation won't be duplicated)
|
||||||
|
ActiveRecord::Base.transaction do
|
||||||
|
persist_conversation_if_needed
|
||||||
decorate_mail
|
decorate_mail
|
||||||
create_message
|
create_message
|
||||||
add_attachments_to_message
|
add_attachments_to_message
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def find_relative_conversation
|
def find_conversation
|
||||||
if @conversation_uuid
|
@conversation = Mailbox::ConversationFinder.new(mail).find
|
||||||
find_conversation_with_uuid
|
# Log when email is rejected
|
||||||
elsif mail.in_reply_to.present?
|
Rails.logger.info "Email #{mail.message_id} rejected - no conversation found" unless @conversation
|
||||||
find_conversation_with_in_reply_to
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def conversation_uuid_from_to_address
|
def persist_conversation_if_needed
|
||||||
@mail = MailPresenter.new(mail)
|
# Save the conversation if it's a new record (from NewConversationStrategy)
|
||||||
|
# We persist here instead of in the strategy to maintain transaction integrity
|
||||||
|
return unless @conversation.new_record?
|
||||||
|
|
||||||
return if @mail.mail_receiver.blank?
|
@conversation.save!
|
||||||
|
Rails.logger.info "Created new conversation #{@conversation.id} for email #{mail.message_id}"
|
||||||
@mail.mail_receiver.each do |email|
|
|
||||||
username = email.split('@')[0]
|
|
||||||
match_result = username.match(ApplicationMailbox::REPLY_EMAIL_UUID_PATTERN)
|
|
||||||
if match_result
|
|
||||||
@conversation_uuid = match_result.captures
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@conversation_uuid
|
|
||||||
end
|
|
||||||
|
|
||||||
# find conversation uuid from below pattern
|
|
||||||
# reply+<conversation-uuid>@<mailer-domain.com>
|
|
||||||
def find_conversation_with_uuid
|
|
||||||
@conversation = Conversation.find_by(uuid: conversation_uuid)
|
|
||||||
validate_resource @conversation
|
|
||||||
end
|
|
||||||
|
|
||||||
def find_conversation_by_uuid(match_result)
|
|
||||||
@conversation_uuid = match_result.captures[0]
|
|
||||||
|
|
||||||
find_conversation_with_uuid
|
|
||||||
end
|
|
||||||
|
|
||||||
def find_conversation_by_message_id(in_reply_to)
|
|
||||||
@message = Message.find_by(source_id: in_reply_to)
|
|
||||||
@conversation = @message.conversation if @message.present?
|
|
||||||
@conversation_uuid = @conversation.uuid if @conversation.present?
|
|
||||||
end
|
|
||||||
|
|
||||||
# find conversation uuid from below pattern
|
|
||||||
# <conversation/#{@conversation.uuid}/messages/#{@messages&.last&.id}@#{@account.inbound_email_domain}>
|
|
||||||
def find_conversation_with_in_reply_to
|
|
||||||
match_result = nil
|
|
||||||
in_reply_to_addresses = mail.in_reply_to
|
|
||||||
in_reply_to_addresses = [in_reply_to_addresses] if in_reply_to_addresses.is_a?(String)
|
|
||||||
in_reply_to_addresses.each do |in_reply_to|
|
|
||||||
match_result = in_reply_to.match(::ApplicationMailbox::CONVERSATION_MESSAGE_ID_PATTERN)
|
|
||||||
break if match_result
|
|
||||||
end
|
|
||||||
find_by_in_reply_to_addresses(match_result, in_reply_to_addresses)
|
|
||||||
end
|
|
||||||
|
|
||||||
def find_by_in_reply_to_addresses(match_result, in_reply_to_addresses)
|
|
||||||
find_conversation_by_uuid(match_result) if match_result
|
|
||||||
find_conversation_by_message_id(in_reply_to_addresses) if @conversation.blank?
|
|
||||||
end
|
|
||||||
|
|
||||||
def validate_resource(resource)
|
|
||||||
Rails.logger.error "[App::Mailboxes::ReplyMailbox] Email conversation with uuid: #{conversation_uuid} not found" if resource.nil?
|
|
||||||
|
|
||||||
resource
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def decorate_mail
|
def decorate_mail
|
||||||
|
|||||||
@ -1,94 +0,0 @@
|
|||||||
class SupportMailbox < ApplicationMailbox
|
|
||||||
include IncomingEmailValidityHelper
|
|
||||||
attr_accessor :channel, :account, :inbox, :conversation, :processed_mail
|
|
||||||
|
|
||||||
before_processing :find_channel,
|
|
||||||
:load_account,
|
|
||||||
:load_inbox,
|
|
||||||
:decorate_mail
|
|
||||||
|
|
||||||
def process
|
|
||||||
Rails.logger.info "Processing email #{mail.message_id} from #{original_sender_email} to #{mail.to} with subject #{mail.subject}"
|
|
||||||
|
|
||||||
# Skip processing email if it belongs to any of the edge cases
|
|
||||||
return unless incoming_email_from_valid_email?
|
|
||||||
|
|
||||||
ActiveRecord::Base.transaction do
|
|
||||||
find_or_create_contact
|
|
||||||
find_or_create_conversation
|
|
||||||
create_message
|
|
||||||
add_attachments_to_message
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def find_channel
|
|
||||||
find_channel_with_to_mail if @channel.blank?
|
|
||||||
|
|
||||||
raise 'Email channel/inbox not found' if @channel.nil?
|
|
||||||
|
|
||||||
@channel
|
|
||||||
end
|
|
||||||
|
|
||||||
def find_channel_with_to_mail
|
|
||||||
@channel = EmailChannelFinder.new(mail).perform
|
|
||||||
end
|
|
||||||
|
|
||||||
def load_account
|
|
||||||
@account = @channel.account
|
|
||||||
end
|
|
||||||
|
|
||||||
def load_inbox
|
|
||||||
@inbox = @channel.inbox
|
|
||||||
end
|
|
||||||
|
|
||||||
def decorate_mail
|
|
||||||
@processed_mail = MailPresenter.new(mail, @account)
|
|
||||||
end
|
|
||||||
|
|
||||||
def find_conversation_by_in_reply_to
|
|
||||||
return if in_reply_to.blank?
|
|
||||||
|
|
||||||
@account.conversations.where("additional_attributes->>'in_reply_to' = ?", in_reply_to).first
|
|
||||||
end
|
|
||||||
|
|
||||||
def in_reply_to
|
|
||||||
mail['In-Reply-To'].try(:value)
|
|
||||||
end
|
|
||||||
|
|
||||||
def original_sender_email
|
|
||||||
@processed_mail.original_sender&.downcase
|
|
||||||
end
|
|
||||||
|
|
||||||
def find_or_create_conversation
|
|
||||||
@conversation = find_conversation_by_in_reply_to || ::Conversation.create!({
|
|
||||||
account_id: @account.id,
|
|
||||||
inbox_id: @inbox.id,
|
|
||||||
contact_id: @contact.id,
|
|
||||||
contact_inbox_id: @contact_inbox.id,
|
|
||||||
additional_attributes: {
|
|
||||||
in_reply_to: in_reply_to,
|
|
||||||
source: 'email',
|
|
||||||
auto_reply: @processed_mail.auto_reply?,
|
|
||||||
mail_subject: @processed_mail.subject,
|
|
||||||
initiated_at: {
|
|
||||||
timestamp: Time.now.utc
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
def find_or_create_contact
|
|
||||||
@contact = @inbox.contacts.from_email(original_sender_email)
|
|
||||||
if @contact.present?
|
|
||||||
@contact_inbox = ContactInbox.find_by(inbox: @inbox, contact: @contact)
|
|
||||||
else
|
|
||||||
create_contact
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def identify_contact_name
|
|
||||||
processed_mail.sender_name || processed_mail.from.first.split('@').first
|
|
||||||
end
|
|
||||||
end
|
|
||||||
29
app/services/mailbox/conversation_finder.rb
Normal file
29
app/services/mailbox/conversation_finder.rb
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
class Mailbox::ConversationFinder
|
||||||
|
DEFAULT_STRATEGIES = [
|
||||||
|
Mailbox::ConversationFinderStrategies::ReceiverUuidStrategy,
|
||||||
|
Mailbox::ConversationFinderStrategies::InReplyToStrategy,
|
||||||
|
Mailbox::ConversationFinderStrategies::ReferencesStrategy,
|
||||||
|
Mailbox::ConversationFinderStrategies::NewConversationStrategy
|
||||||
|
].freeze
|
||||||
|
|
||||||
|
def initialize(mail, strategies: DEFAULT_STRATEGIES)
|
||||||
|
@mail = mail
|
||||||
|
@strategies = strategies
|
||||||
|
end
|
||||||
|
|
||||||
|
def find
|
||||||
|
@strategies.each do |strategy_class|
|
||||||
|
conversation = strategy_class.new(@mail).find
|
||||||
|
|
||||||
|
next unless conversation
|
||||||
|
|
||||||
|
strategy_name = strategy_class.name.demodulize.underscore
|
||||||
|
Rails.logger.info "Conversation found via #{strategy_name} strategy"
|
||||||
|
return conversation
|
||||||
|
end
|
||||||
|
|
||||||
|
# Should not reach here if NewConversationStrategy is in the chain
|
||||||
|
Rails.logger.error 'No conversation found via any strategy (NewConversationStrategy missing?)'
|
||||||
|
nil
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
class Mailbox::ConversationFinderStrategies::BaseStrategy
|
||||||
|
attr_reader :mail
|
||||||
|
|
||||||
|
def initialize(mail)
|
||||||
|
@mail = mail
|
||||||
|
end
|
||||||
|
|
||||||
|
# Returns Conversation or nil
|
||||||
|
# Subclasses must implement this method
|
||||||
|
def find
|
||||||
|
raise NotImplementedError, "#{self.class} must implement #find"
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
class Mailbox::ConversationFinderStrategies::InReplyToStrategy < Mailbox::ConversationFinderStrategies::BaseStrategy
|
||||||
|
# Patterns from ApplicationMailbox
|
||||||
|
MESSAGE_PATTERN = %r{conversation/([a-zA-Z0-9-]+)/messages/(\d+)@}
|
||||||
|
|
||||||
|
# FALLBACK_PATTERN is used when building In-Reply-To headers in ConversationReplyMailer
|
||||||
|
# when there's no actual message to reply to (see app/mailers/conversation_reply_mailer.rb#in_reply_to_email).
|
||||||
|
# This happens when:
|
||||||
|
# - A conversation is started by an agent (no incoming message yet)
|
||||||
|
# - The conversation originated from a non-email channel (widget, WhatsApp, etc.) but is now using email
|
||||||
|
# - The incoming message doesn't have email metadata with a message_id
|
||||||
|
# In these cases, we use a conversation-level identifier instead of a message-level one.
|
||||||
|
FALLBACK_PATTERN = %r{account/(\d+)/conversation/([a-zA-Z0-9-]+)@}
|
||||||
|
|
||||||
|
def find
|
||||||
|
return nil if mail.in_reply_to.blank?
|
||||||
|
|
||||||
|
in_reply_to_addresses = Array.wrap(mail.in_reply_to)
|
||||||
|
|
||||||
|
in_reply_to_addresses.each do |in_reply_to|
|
||||||
|
# Try extracting UUID from patterns
|
||||||
|
uuid = extract_uuid_from_patterns(in_reply_to)
|
||||||
|
if uuid
|
||||||
|
conversation = Conversation.find_by(uuid: uuid)
|
||||||
|
return conversation if conversation
|
||||||
|
end
|
||||||
|
|
||||||
|
# Try finding by message source_id
|
||||||
|
message = Message.find_by(source_id: in_reply_to)
|
||||||
|
return message.conversation if message&.conversation
|
||||||
|
end
|
||||||
|
|
||||||
|
nil
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def extract_uuid_from_patterns(message_id)
|
||||||
|
# Try message-specific pattern first
|
||||||
|
match = MESSAGE_PATTERN.match(message_id)
|
||||||
|
return match[1] if match
|
||||||
|
|
||||||
|
# Try conversation fallback pattern
|
||||||
|
match = FALLBACK_PATTERN.match(message_id)
|
||||||
|
return match[2] if match
|
||||||
|
|
||||||
|
nil
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,83 @@
|
|||||||
|
class Mailbox::ConversationFinderStrategies::NewConversationStrategy < Mailbox::ConversationFinderStrategies::BaseStrategy
|
||||||
|
include MailboxHelper
|
||||||
|
include IncomingEmailValidityHelper
|
||||||
|
|
||||||
|
attr_accessor :processed_mail, :account, :inbox, :contact, :contact_inbox, :conversation, :channel
|
||||||
|
|
||||||
|
def initialize(mail)
|
||||||
|
super(mail)
|
||||||
|
@channel = EmailChannelFinder.new(mail).perform
|
||||||
|
return unless @channel
|
||||||
|
|
||||||
|
@account = @channel.account
|
||||||
|
@inbox = @channel.inbox
|
||||||
|
@processed_mail = MailPresenter.new(mail, @account)
|
||||||
|
end
|
||||||
|
|
||||||
|
# This strategy prepares a new conversation but doesn't persist it yet.
|
||||||
|
# Why we don't use create! here:
|
||||||
|
# - Avoids orphan conversations if message/attachment creation fails later
|
||||||
|
# - Prevents duplicate conversations on job retry (no idempotency issue)
|
||||||
|
# - Follows the pattern from old SupportMailbox where everything was in one transaction
|
||||||
|
# The actual persistence happens in ReplyMailbox within a transaction that includes message creation.
|
||||||
|
def find
|
||||||
|
return nil unless @channel # No valid channel found
|
||||||
|
return nil unless incoming_email_from_valid_email? # Skip edge cases
|
||||||
|
|
||||||
|
# Check if conversation already exists by in_reply_to
|
||||||
|
existing_conversation = find_conversation_by_in_reply_to
|
||||||
|
return existing_conversation if existing_conversation
|
||||||
|
|
||||||
|
# Prepare contact (persisted) and build conversation (not persisted)
|
||||||
|
find_or_create_contact
|
||||||
|
build_conversation
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def find_or_create_contact
|
||||||
|
@contact = @inbox.contacts.from_email(original_sender_email)
|
||||||
|
if @contact.present?
|
||||||
|
@contact_inbox = ContactInbox.find_by(inbox: @inbox, contact: @contact)
|
||||||
|
else
|
||||||
|
create_contact
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def original_sender_email
|
||||||
|
@processed_mail.original_sender&.downcase
|
||||||
|
end
|
||||||
|
|
||||||
|
def identify_contact_name
|
||||||
|
@processed_mail.sender_name || @processed_mail.from.first.split('@').first
|
||||||
|
end
|
||||||
|
|
||||||
|
def build_conversation
|
||||||
|
# Build but don't persist - ReplyMailbox will save in transaction with message
|
||||||
|
@conversation = ::Conversation.new(
|
||||||
|
account_id: @account.id,
|
||||||
|
inbox_id: @inbox.id,
|
||||||
|
contact_id: @contact.id,
|
||||||
|
contact_inbox_id: @contact_inbox.id,
|
||||||
|
additional_attributes: {
|
||||||
|
in_reply_to: in_reply_to,
|
||||||
|
source: 'email',
|
||||||
|
auto_reply: @processed_mail.auto_reply?,
|
||||||
|
mail_subject: @processed_mail.subject,
|
||||||
|
initiated_at: {
|
||||||
|
timestamp: Time.now.utc
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
def in_reply_to
|
||||||
|
mail['In-Reply-To'].try(:value)
|
||||||
|
end
|
||||||
|
|
||||||
|
def find_conversation_by_in_reply_to
|
||||||
|
return if in_reply_to.blank?
|
||||||
|
|
||||||
|
@account.conversations.where("additional_attributes->>'in_reply_to' = ?", in_reply_to).first
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
class Mailbox::ConversationFinderStrategies::ReceiverUuidStrategy < Mailbox::ConversationFinderStrategies::BaseStrategy
|
||||||
|
# Pattern from ApplicationMailbox::REPLY_EMAIL_UUID_PATTERN
|
||||||
|
UUID_PATTERN = /^reply\+([0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12})$/i
|
||||||
|
|
||||||
|
def find
|
||||||
|
uuid = extract_uuid_from_receivers
|
||||||
|
return nil unless uuid
|
||||||
|
|
||||||
|
Conversation.find_by(uuid: uuid)
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def extract_uuid_from_receivers
|
||||||
|
mail_presenter = MailPresenter.new(mail)
|
||||||
|
return nil if mail_presenter.mail_receiver.blank?
|
||||||
|
|
||||||
|
mail_presenter.mail_receiver.each do |email|
|
||||||
|
username = email.split('@').first
|
||||||
|
match = username.match(UUID_PATTERN)
|
||||||
|
return match[1] if match
|
||||||
|
end
|
||||||
|
|
||||||
|
nil
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,59 @@
|
|||||||
|
class Mailbox::ConversationFinderStrategies::ReferencesStrategy < Mailbox::ConversationFinderStrategies::BaseStrategy
|
||||||
|
# Patterns from ApplicationMailbox
|
||||||
|
MESSAGE_PATTERN = %r{conversation/([a-zA-Z0-9-]+)/messages/(\d+)@}
|
||||||
|
|
||||||
|
# FALLBACK_PATTERN is used when building References headers in ConversationReplyMailer
|
||||||
|
# when there's no actual message to reply to (see app/mailers/conversation_reply_mailer.rb#in_reply_to_email).
|
||||||
|
# This happens when:
|
||||||
|
# - A conversation is started by an agent (no incoming message yet)
|
||||||
|
# - The conversation originated from a non-email channel (widget, WhatsApp, etc.) but is now using email
|
||||||
|
# - The incoming message doesn't have email metadata with a message_id
|
||||||
|
# In these cases, we use a conversation-level identifier instead of a message-level one.
|
||||||
|
FALLBACK_PATTERN = %r{account/(\d+)/conversation/([a-zA-Z0-9-]+)@}
|
||||||
|
|
||||||
|
def initialize(mail)
|
||||||
|
super(mail)
|
||||||
|
# Get channel once upfront to use for scoped queries
|
||||||
|
@channel = EmailChannelFinder.new(mail).perform
|
||||||
|
end
|
||||||
|
|
||||||
|
def find
|
||||||
|
return nil if mail.references.blank?
|
||||||
|
return nil unless @channel # No valid channel found
|
||||||
|
|
||||||
|
references = Array.wrap(mail.references)
|
||||||
|
|
||||||
|
references.each do |reference|
|
||||||
|
conversation = find_conversation_from_reference(reference)
|
||||||
|
return conversation if conversation
|
||||||
|
end
|
||||||
|
|
||||||
|
nil
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def find_conversation_from_reference(reference)
|
||||||
|
# Try extracting UUID from patterns
|
||||||
|
uuid = extract_uuid_from_patterns(reference)
|
||||||
|
if uuid
|
||||||
|
# Query scoped to inbox - prevents cross-account/cross-inbox matches at database level
|
||||||
|
conversation = Conversation.find_by(uuid: uuid, inbox_id: @channel.inbox.id)
|
||||||
|
return conversation if conversation
|
||||||
|
end
|
||||||
|
|
||||||
|
# We scope to the inbox, that way we filter out messages and conversations that don't belong to the channel
|
||||||
|
message = Message.find_by(source_id: reference, inbox_id: @channel.inbox.id)
|
||||||
|
message&.conversation
|
||||||
|
end
|
||||||
|
|
||||||
|
def extract_uuid_from_patterns(message_id)
|
||||||
|
match = MESSAGE_PATTERN.match(message_id)
|
||||||
|
return match[1] if match
|
||||||
|
|
||||||
|
match = FALLBACK_PATTERN.match(message_id)
|
||||||
|
return match[2] if match
|
||||||
|
|
||||||
|
nil
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -41,28 +41,31 @@ RSpec.describe ApplicationMailbox do
|
|||||||
describe 'Support' do
|
describe 'Support' do
|
||||||
let!(:channel_email) { create(:channel_email) }
|
let!(:channel_email) { create(:channel_email) }
|
||||||
|
|
||||||
it 'routes support emails to Support Mailbox when mail is to channel email' do
|
it 'routes support emails to Reply Mailbox when mail is to channel email' do
|
||||||
# this email is hardcoded in the support.eml, that's why we are updating this
|
# this email is hardcoded in the support.eml, that's why we are updating this
|
||||||
|
# With NewConversationStrategy, all channel emails route to ReplyMailbox
|
||||||
channel_email.update(email: 'care@example.com')
|
channel_email.update(email: 'care@example.com')
|
||||||
dbl = double
|
dbl = double
|
||||||
expect(SupportMailbox).to receive(:new).and_return(dbl)
|
expect(ReplyMailbox).to receive(:new).and_return(dbl)
|
||||||
expect(dbl).to receive(:perform_processing).and_return(true)
|
expect(dbl).to receive(:perform_processing).and_return(true)
|
||||||
described_class.route support_mail
|
described_class.route support_mail
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes support emails to Support Mailbox when mail is to channel forward to email' do
|
it 'routes support emails to Reply Mailbox when mail is to channel forward to email' do
|
||||||
# this email is hardcoded in the support.eml, that's why we are updating this
|
# this email is hardcoded in the support.eml, that's why we are updating this
|
||||||
|
# With NewConversationStrategy, all channel emails route to ReplyMailbox
|
||||||
channel_email.update(forward_to_email: 'care@example.com')
|
channel_email.update(forward_to_email: 'care@example.com')
|
||||||
dbl = double
|
dbl = double
|
||||||
expect(SupportMailbox).to receive(:new).and_return(dbl)
|
expect(ReplyMailbox).to receive(:new).and_return(dbl)
|
||||||
expect(dbl).to receive(:perform_processing).and_return(true)
|
expect(dbl).to receive(:perform_processing).and_return(true)
|
||||||
described_class.route support_mail
|
described_class.route support_mail
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes support emails to Support Mailbox with cc email' do
|
it 'routes support emails to Reply Mailbox with cc email' do
|
||||||
|
# With NewConversationStrategy, all channel emails route to ReplyMailbox
|
||||||
channel_email.update(email: 'test@example.com')
|
channel_email.update(email: 'test@example.com')
|
||||||
dbl = double
|
dbl = double
|
||||||
expect(SupportMailbox).to receive(:new).and_return(dbl)
|
expect(ReplyMailbox).to receive(:new).and_return(dbl)
|
||||||
expect(dbl).to receive(:perform_processing).and_return(true)
|
expect(dbl).to receive(:perform_processing).and_return(true)
|
||||||
described_class.route reply_cc_mail
|
described_class.route reply_cc_mail
|
||||||
end
|
end
|
||||||
|
|||||||
@ -264,5 +264,54 @@ RSpec.describe Imap::ImapMailbox do
|
|||||||
expect(conversation.additional_attributes['in_reply_to']).to eq(multiple_in_reply_to_mail.in_reply_to.first)
|
expect(conversation.additional_attributes['in_reply_to']).to eq(multiple_in_reply_to_mail.in_reply_to.first)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'when a reply to a conversation started by an agent' do
|
||||||
|
let(:agent_conversation) { create(:conversation, account: account, inbox: channel.inbox, assignee: agent) }
|
||||||
|
let(:reply_mail_with_fallback_reference) do
|
||||||
|
# Simulate an email reply with a reference that matches FALLBACK_PATTERN
|
||||||
|
reference_id = "account/#{account.id}/conversation/#{agent_conversation.uuid}@chatwoot.com"
|
||||||
|
create_inbound_email_from_mail(
|
||||||
|
from: 'email@gmail.com',
|
||||||
|
to: 'imap@gmail.com',
|
||||||
|
subject: 'Re: Agent started conversation',
|
||||||
|
references: [reference_id]
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'appends email to the existing conversation using FALLBACK_PATTERN' do
|
||||||
|
expect(agent_conversation.messages.size).to eq(0)
|
||||||
|
|
||||||
|
class_instance.process(reply_mail_with_fallback_reference.mail, channel)
|
||||||
|
|
||||||
|
agent_conversation.reload
|
||||||
|
expect(agent_conversation.messages.size).to eq(1)
|
||||||
|
expect(agent_conversation.messages.last.content_attributes['email']['from']).to eq(reply_mail_with_fallback_reference.mail.from)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when references contain both message and fallback patterns' do
|
||||||
|
let(:agent_conversation) { create(:conversation, account: account, inbox: channel.inbox, assignee: agent) }
|
||||||
|
let(:reply_mail_with_multiple_references) do
|
||||||
|
# Multiple references including both patterns
|
||||||
|
fallback_reference = "account/#{account.id}/conversation/#{agent_conversation.uuid}@chatwoot.com"
|
||||||
|
other_reference = 'some-other-message-id@example.com'
|
||||||
|
create_inbound_email_from_mail(
|
||||||
|
from: 'email@gmail.com',
|
||||||
|
to: 'imap@gmail.com',
|
||||||
|
subject: 'Re: Multiple references',
|
||||||
|
references: [other_reference, fallback_reference]
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'finds conversation using fallback pattern when message lookup fails' do
|
||||||
|
expect(agent_conversation.messages.size).to eq(0)
|
||||||
|
|
||||||
|
class_instance.process(reply_mail_with_multiple_references.mail, channel)
|
||||||
|
|
||||||
|
agent_conversation.reload
|
||||||
|
expect(agent_conversation.messages.size).to eq(1)
|
||||||
|
expect(agent_conversation.messages.last.content_attributes['email']['from']).to eq(reply_mail_with_multiple_references.mail.from)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -248,5 +248,448 @@ RSpec.describe ReplyMailbox do
|
|||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'with references header' do
|
||||||
|
let(:reply_mail_with_references) { create_inbound_email_from_fixture('reply_mail_without_uuid.eml') }
|
||||||
|
let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
|
||||||
|
let(:conversation_1) do
|
||||||
|
create(
|
||||||
|
:conversation,
|
||||||
|
assignee: agent,
|
||||||
|
inbox: email_channel.inbox,
|
||||||
|
account: account,
|
||||||
|
additional_attributes: { mail_subject: "Discussion: Let's debate these attachments" }
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
conversation_1.update!(uuid: '6bdc3f4d-0bec-4515-a284-5d916fdde489')
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'with message-specific pattern in references' do
|
||||||
|
before do
|
||||||
|
reply_mail_with_references.mail['References'] = '<conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123@test.com>'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'finds conversation from references header with message pattern' do
|
||||||
|
described_class.receive reply_mail_with_references
|
||||||
|
expect(conversation_1.messages.last.content).to include("Let's talk about these images:")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'with conversation fallback pattern in references' do
|
||||||
|
before do
|
||||||
|
reply_mail_with_references.mail['References'] = "<account/#{account.id}/conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489@test.com>"
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'finds conversation from references header with fallback pattern' do
|
||||||
|
described_class.receive reply_mail_with_references
|
||||||
|
expect(conversation_1.messages.last.content).to include("Let's talk about these images:")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'with multiple references including conversation pattern' do
|
||||||
|
before do
|
||||||
|
reply_mail_with_references.mail['References'] = [
|
||||||
|
'<some-random-message-id@gmail.com>',
|
||||||
|
"<account/#{account.id}/conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489@test.com>",
|
||||||
|
'<another-random-message-id@outlook.com>'
|
||||||
|
].join("\r\n ")
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'finds conversation from any reference in the chain' do
|
||||||
|
described_class.receive reply_mail_with_references
|
||||||
|
expect(conversation_1.messages.last.content).to include("Let's talk about these images:")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'with message source_id in references' do
|
||||||
|
before do
|
||||||
|
conversation_1.messages.create!(
|
||||||
|
source_id: 'original-message-id@test.com',
|
||||||
|
account_id: account.id,
|
||||||
|
message_type: 'outgoing',
|
||||||
|
inbox_id: email_channel.inbox.id,
|
||||||
|
content: 'Original message'
|
||||||
|
)
|
||||||
|
reply_mail_with_references.mail['References'] = '<original-message-id@test.com>'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'finds conversation from message source_id in references' do
|
||||||
|
described_class.receive reply_mail_with_references
|
||||||
|
expect(conversation_1.messages.last.content).to include("Let's talk about these images:")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'with conversation from different channel in references' do
|
||||||
|
let(:other_email_channel) { create(:channel_email, email: 'other@example.com', account: account) }
|
||||||
|
let(:other_conversation) do
|
||||||
|
create(
|
||||||
|
:conversation,
|
||||||
|
assignee: agent,
|
||||||
|
inbox: other_email_channel.inbox,
|
||||||
|
account: account
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
other_conversation.update!(uuid: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee')
|
||||||
|
reply_mail_with_references.mail['References'] = '<conversation/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/messages/456@test.com>'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not use conversation from different channel' do
|
||||||
|
described_class.receive reply_mail_with_references
|
||||||
|
expect(other_conversation.messages.count).to eq(0)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'when a chatwoot notification email is received' do
|
||||||
|
let(:account) { create(:account) }
|
||||||
|
let!(:channel_email) { create(:channel_email, email: 'sojan@chatwoot.com', account: account) }
|
||||||
|
let(:notification_mail) { create_inbound_email_from_fixture('notification.eml') }
|
||||||
|
let(:described_subject) { described_class.receive notification_mail }
|
||||||
|
let(:conversation) { Conversation.where(inbox_id: channel_email.inbox).last }
|
||||||
|
|
||||||
|
it 'shouldnt create a conversation in the channel' do
|
||||||
|
described_subject
|
||||||
|
expect(conversation.present?).to be(false)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'when bounced email with out a sender is recieved' do
|
||||||
|
let(:account) { create(:account) }
|
||||||
|
let(:bounced_email) { create_inbound_email_from_fixture('bounced_with_no_from.eml') }
|
||||||
|
let(:described_subject) { described_class.receive bounced_email }
|
||||||
|
|
||||||
|
it 'shouldnt throw an error' do
|
||||||
|
create(:channel_email, email: 'support@example.com', account: account)
|
||||||
|
expect { described_subject }.not_to raise_error
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'when an account is suspended' do
|
||||||
|
let(:account) { create(:account, status: :suspended) }
|
||||||
|
let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
|
||||||
|
let!(:channel_email) { create(:channel_email, account: account) }
|
||||||
|
let(:support_mail) { create_inbound_email_from_fixture('support.eml') }
|
||||||
|
let(:described_subject) { described_class.receive support_mail }
|
||||||
|
let(:conversation) { Conversation.where(inbox_id: channel_email.inbox).last }
|
||||||
|
|
||||||
|
before do
|
||||||
|
# this email is hardcoded in the support.eml, that's why we are updating this
|
||||||
|
channel_email.email = 'care@example.com'
|
||||||
|
channel_email.save!
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'shouldnt create a conversation in the channel' do
|
||||||
|
described_subject
|
||||||
|
expect(conversation.present?).to be(false)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'add mail as a new ticket in the email inbox' do
|
||||||
|
let(:account) { create(:account) }
|
||||||
|
let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
|
||||||
|
let!(:channel_email) { create(:channel_email, account: account) }
|
||||||
|
let(:support_mail) { create_inbound_email_from_fixture('support.eml') }
|
||||||
|
let(:support_in_reply_to_mail) { create_inbound_email_from_fixture('support_in_reply_to.eml') }
|
||||||
|
let(:described_subject) { described_class.receive support_mail }
|
||||||
|
let(:serialized_attributes) do
|
||||||
|
%w[bcc cc content_type date from html_content in_reply_to message_id multipart number_of_attachments references subject
|
||||||
|
text_content to auto_reply]
|
||||||
|
end
|
||||||
|
let(:conversation) { Conversation.where(inbox_id: channel_email.inbox).last }
|
||||||
|
|
||||||
|
before do
|
||||||
|
# this email is hardcoded in the support.eml, that's why we are updating this
|
||||||
|
channel_email.email = 'care@example.com'
|
||||||
|
channel_email.save!
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'covers email address format' do
|
||||||
|
before do
|
||||||
|
described_class.receive support_in_reply_to_mail
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates contact with proper email address' do
|
||||||
|
expect(support_in_reply_to_mail.mail['reply_to'].try(:value)).to eq('Sony Mathew <sony@chatwoot.com>')
|
||||||
|
expect(conversation.contact.email).to eq('sony@chatwoot.com')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'covers basic ticket creation' do
|
||||||
|
before do
|
||||||
|
described_subject
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'create the conversation in the inbox of the email channel' do
|
||||||
|
expect(conversation.inbox.id).to eq(channel_email.inbox.id)
|
||||||
|
expect(conversation.additional_attributes['source']).to eq('email')
|
||||||
|
expect(conversation.contact.email).to eq(support_mail.mail.from.first)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'create a new contact as the sender of the email' do
|
||||||
|
email_sender = Mail::Address.new(support_mail.mail[:from].value).name
|
||||||
|
expect(conversation.messages.last.sender.email).to eq(support_mail.mail.from.first)
|
||||||
|
expect(conversation.contact.name).to eq(email_sender)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'add the mail content as new message on the conversation' do
|
||||||
|
expect(conversation.messages.last.content).to eq("Let's talk about these images:")
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'add the attachments' do
|
||||||
|
expect(conversation.messages.last.attachments.count).to eq(2)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'have proper content_attributes with details of email' do
|
||||||
|
expect(conversation.messages.last.content_attributes[:email].keys).to eq(serialized_attributes)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'set proper content_type' do
|
||||||
|
expect(conversation.messages.last.content_type).to eq('incoming_email')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'email with references header' do
|
||||||
|
let(:mail_with_references) { create_inbound_email_from_fixture('mail_with_references.eml') }
|
||||||
|
let(:described_subject) { described_class.receive mail_with_references }
|
||||||
|
|
||||||
|
before do
|
||||||
|
# reuse the existing channel_email that's already set to 'care@example.com'
|
||||||
|
described_subject
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'includes references in the message content_attributes' do
|
||||||
|
message = conversation.messages.last
|
||||||
|
email_attributes = message.content_attributes['email']
|
||||||
|
|
||||||
|
expect(email_attributes['references']).to be_present
|
||||||
|
expect(email_attributes['references']).to eq(['4e6e35f5a38b4_479f13bb90078178@small-app-01.mail', 'test-reference-id'])
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'includes references in serialized email attributes' do
|
||||||
|
message = conversation.messages.last
|
||||||
|
expect(message.content_attributes['email'].keys).to include('references')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'Sender without name' do
|
||||||
|
let(:support_mail_without_sender_name) { create_inbound_email_from_fixture('support_without_sender_name.eml') }
|
||||||
|
let(:described_subject) { described_class.receive support_mail_without_sender_name }
|
||||||
|
|
||||||
|
it 'create a new contact with the email' do
|
||||||
|
described_subject
|
||||||
|
email_sender = support_mail_without_sender_name.mail.from.first.split('@').first
|
||||||
|
expect(conversation.messages.last.sender.email).to eq(support_mail.mail.from.first)
|
||||||
|
expect(conversation.contact.name).to eq(email_sender)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'Sender with upcase mail address' do
|
||||||
|
let(:support_mail_without_sender_name) { create_inbound_email_from_fixture('support_without_sender_name.eml') }
|
||||||
|
let(:described_subject) { described_class.receive support_mail_without_sender_name }
|
||||||
|
|
||||||
|
it 'create a new inbox with the email case insensitive' do
|
||||||
|
described_subject
|
||||||
|
expect(conversation.inbox.id).to eq(channel_email.inbox.id)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'handle inbox contacts' do
|
||||||
|
let!(:contact) { create(:contact, account: account, email: support_mail.mail.from.first) }
|
||||||
|
let!(:contact_inbox) { create(:contact_inbox, inbox: channel_email.inbox, contact: contact) }
|
||||||
|
|
||||||
|
it 'does not create new contact if that contact exists in the inbox' do
|
||||||
|
expect do
|
||||||
|
described_subject
|
||||||
|
end
|
||||||
|
.to(not_change { Contact.count }
|
||||||
|
.and(not_change { ContactInbox.count }))
|
||||||
|
|
||||||
|
expect(conversation.messages.last.sender.id).to eq(contact.id)
|
||||||
|
expect(conversation.contact_inbox).to eq(contact_inbox)
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'with uppercase reply-to' do
|
||||||
|
let(:support_mail) { create_inbound_email_from_fixture('support_uppercase.eml') }
|
||||||
|
let!(:contact) { create(:contact, account: account, email: support_mail.mail.from.first) }
|
||||||
|
let!(:contact_inbox) { create(:contact_inbox, inbox: channel_email.inbox, contact: contact) }
|
||||||
|
|
||||||
|
it 'does not create new contact if that contact exists in the inbox' do
|
||||||
|
expect do
|
||||||
|
described_subject
|
||||||
|
end
|
||||||
|
.to(not_change { Contact.count }
|
||||||
|
.and(not_change { ContactInbox.count }))
|
||||||
|
|
||||||
|
expect(conversation.messages.last.sender.id).to eq(contact.id)
|
||||||
|
expect(conversation.contact_inbox).to eq(contact_inbox)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'group email sender' do
|
||||||
|
let(:group_sender_support_mail) { create_inbound_email_from_fixture('group_sender_support.eml') }
|
||||||
|
let(:described_subject) { described_class.receive group_sender_support_mail }
|
||||||
|
|
||||||
|
before do
|
||||||
|
# this email is hardcoded eml fixture file that's why we are updating this
|
||||||
|
channel_email.email = 'support@chatwoot.com'
|
||||||
|
channel_email.save!
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'create new contact with original sender' do
|
||||||
|
described_subject
|
||||||
|
email_sender = Mail::Address.new(group_sender_support_mail.mail[:from].value).name
|
||||||
|
|
||||||
|
expect(conversation.contact.email).to eq(group_sender_support_mail.mail['X-Original-Sender'].value)
|
||||||
|
expect(conversation.contact.name).to eq(email_sender)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'when mail has in reply to email' do
|
||||||
|
let(:reply_mail_without_uuid) { create_inbound_email_from_fixture('reply_mail_without_uuid.eml') }
|
||||||
|
let(:described_subject) { described_class.receive reply_mail_without_uuid }
|
||||||
|
let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
email_channel
|
||||||
|
reply_mail_without_uuid.mail['In-Reply-To'] = 'conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'create channel with reply to mail' do
|
||||||
|
described_subject
|
||||||
|
conversation_1 = Conversation.last
|
||||||
|
|
||||||
|
expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
|
||||||
|
expect(conversation_1.additional_attributes['in_reply_to']).to eq('conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'append message to email conversation with same in reply to' do
|
||||||
|
described_subject
|
||||||
|
conversation_1 = Conversation.last
|
||||||
|
|
||||||
|
expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
|
||||||
|
expect(conversation_1.additional_attributes['in_reply_to']).to eq('conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123')
|
||||||
|
expect(conversation_1.messages.count).to eq(1)
|
||||||
|
|
||||||
|
reply_mail_without_uuid.mail['In-Reply-To'] = 'conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123'
|
||||||
|
reply_mail_without_uuid.mail['Message-Id'] = '0CB459E0-0336-41DA-BC88-E6E28C697SFC@chatwoot.com'
|
||||||
|
|
||||||
|
described_class.receive reply_mail_without_uuid
|
||||||
|
|
||||||
|
expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
|
||||||
|
expect(conversation_1.additional_attributes['in_reply_to']).to eq('conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123')
|
||||||
|
expect(conversation_1.messages.count).to eq(2)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'Sender with reply_to email address' do
|
||||||
|
let(:reply_to_mail) { create_inbound_email_from_fixture('reply_to.eml') }
|
||||||
|
let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
|
||||||
|
|
||||||
|
it 'prefer reply-to over from address' do
|
||||||
|
email_channel
|
||||||
|
described_class.receive reply_to_mail
|
||||||
|
|
||||||
|
conversation_1 = Conversation.last
|
||||||
|
email = conversation_1.messages.last.content_attributes['email']
|
||||||
|
|
||||||
|
expect(reply_to_mail.mail['From'].value).to be_present
|
||||||
|
expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
|
||||||
|
expect(reply_to_mail.mail['Reply-To'].value).to include(email['from'][0])
|
||||||
|
expect(reply_to_mail.mail['Reply-To'].value).to include(conversation_1.contact.email)
|
||||||
|
expect(reply_to_mail.mail['From'].value).not_to include(conversation_1.contact.email)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'when mail part is not present' do
|
||||||
|
let(:support_mail) { create_inbound_email_from_fixture('support_1.eml') }
|
||||||
|
let(:only_text) { create_inbound_email_from_fixture('only_text.eml') }
|
||||||
|
let(:only_html) { create_inbound_email_from_fixture('only_html.eml') }
|
||||||
|
let(:only_attachments) { create_inbound_email_from_fixture('only_attachments.eml') }
|
||||||
|
let(:html_and_attachments) { create_inbound_email_from_fixture('html_and_attachments.eml') }
|
||||||
|
let(:described_subject) { described_class.receive support_mail }
|
||||||
|
|
||||||
|
it 'Considers raw html mail body' do
|
||||||
|
described_subject
|
||||||
|
expect(conversation.inbox.id).to eq(channel_email.inbox.id)
|
||||||
|
|
||||||
|
expect(conversation.messages.last.content_attributes['email']['html_content']['reply']).to include(
|
||||||
|
<<~BODY.chomp
|
||||||
|
Hi,
|
||||||
|
|
||||||
|
We are providing you platform from here you can sell paid posts on your website.
|
||||||
|
|
||||||
|
Chatwoot | CS team | [C](https://d33wubrfki0l68.cloudfront.net/973467c532160fd8b940300a43fa85fa2d060307/dc9a0/static/brand-73f58cdefae282ae74cebfa74c1d7003.svg)
|
||||||
|
|
||||||
|
Skype: live:.cid.something
|
||||||
|
|
||||||
|
[]
|
||||||
|
BODY
|
||||||
|
)
|
||||||
|
expect(conversation.messages.last.content_attributes['email']['subject']).to eq('Get Paid to post an article')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'Considers only text body' do
|
||||||
|
described_class.receive only_text
|
||||||
|
|
||||||
|
expect(conversation.inbox.id).to eq(channel_email.inbox.id)
|
||||||
|
|
||||||
|
expect(conversation.messages.last.content).to eq('text only mail')
|
||||||
|
expect(conversation.messages.last.content_attributes['email']['subject']).to eq('test text only mail')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'Considers only html body' do
|
||||||
|
described_class.receive only_html
|
||||||
|
|
||||||
|
expect(conversation.inbox.id).to eq(channel_email.inbox.id)
|
||||||
|
|
||||||
|
expect(conversation.messages.last.content).to eq(
|
||||||
|
<<~BODY.chomp
|
||||||
|
This is html only mail
|
||||||
|
BODY
|
||||||
|
)
|
||||||
|
expect(conversation.messages.last.content_attributes['email']['subject']).to eq('test html only mail')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'Considers only attachments' do
|
||||||
|
described_class.receive only_attachments
|
||||||
|
|
||||||
|
expect(conversation.inbox.id).to eq(channel_email.inbox.id)
|
||||||
|
|
||||||
|
expect(conversation.messages.last.content).to be_nil
|
||||||
|
expect(conversation.messages.last.attachments.count).to eq(1)
|
||||||
|
expect(conversation.messages.last.content_attributes['email']['subject']).to eq('only attachments')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'Considers html and attachments' do
|
||||||
|
described_class.receive html_and_attachments
|
||||||
|
|
||||||
|
expect(conversation.inbox.id).to eq(channel_email.inbox.id)
|
||||||
|
|
||||||
|
expect(conversation.messages.last.content).to eq('This is html and attachments only mail')
|
||||||
|
expect(conversation.messages.last.attachments.count).to eq(1)
|
||||||
|
expect(conversation.messages.last.content_attributes['email']['subject']).to eq('attachment with html')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'when BCC processing is disabled for account' do
|
||||||
|
before do
|
||||||
|
allow(GlobalConfigService).to receive(:load).with('SKIP_INCOMING_BCC_PROCESSING', '').and_return(account.id.to_s)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not process BCC-only emails' do
|
||||||
|
bcc_mail = create_inbound_email_from_fixture('support.eml')
|
||||||
|
bcc_mail.mail['to'] = nil
|
||||||
|
bcc_mail.mail['bcc'] = 'care@example.com'
|
||||||
|
|
||||||
|
described_class.receive bcc_mail
|
||||||
|
expect(conversation.present?).to be(false)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,352 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe SupportMailbox do
|
|
||||||
include ActionMailbox::TestHelper
|
|
||||||
|
|
||||||
describe 'when a chatwoot notification email is received' do
|
|
||||||
let(:account) { create(:account) }
|
|
||||||
let!(:channel_email) { create(:channel_email, email: 'sojan@chatwoot.com', account: account) }
|
|
||||||
let(:notification_mail) { create_inbound_email_from_fixture('notification.eml') }
|
|
||||||
let(:described_subject) { described_class.receive notification_mail }
|
|
||||||
let(:conversation) { Conversation.where(inbox_id: channel_email.inbox).last }
|
|
||||||
|
|
||||||
it 'shouldnt create a conversation in the channel' do
|
|
||||||
described_subject
|
|
||||||
expect(conversation.present?).to be(false)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'when bounced email with out a sender is recieved' do
|
|
||||||
let(:account) { create(:account) }
|
|
||||||
let(:bounced_email) { create_inbound_email_from_fixture('bounced_with_no_from.eml') }
|
|
||||||
let(:described_subject) { described_class.receive bounced_email }
|
|
||||||
|
|
||||||
it 'shouldnt throw an error' do
|
|
||||||
create(:channel_email, email: 'support@example.com', account: account)
|
|
||||||
expect { described_subject }.not_to raise_error
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'when an account is suspended' do
|
|
||||||
let(:account) { create(:account, status: :suspended) }
|
|
||||||
let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
|
|
||||||
let!(:channel_email) { create(:channel_email, account: account) }
|
|
||||||
let(:support_mail) { create_inbound_email_from_fixture('support.eml') }
|
|
||||||
let(:described_subject) { described_class.receive support_mail }
|
|
||||||
let(:conversation) { Conversation.where(inbox_id: channel_email.inbox).last }
|
|
||||||
|
|
||||||
before do
|
|
||||||
# this email is hardcoded in the support.eml, that's why we are updating this
|
|
||||||
channel_email.email = 'care@example.com'
|
|
||||||
channel_email.save!
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'shouldnt create a conversation in the channel' do
|
|
||||||
described_subject
|
|
||||||
expect(conversation.present?).to be(false)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'add mail as a new ticket in the email inbox' do
|
|
||||||
let(:account) { create(:account) }
|
|
||||||
let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
|
|
||||||
let!(:channel_email) { create(:channel_email, account: account) }
|
|
||||||
let(:support_mail) { create_inbound_email_from_fixture('support.eml') }
|
|
||||||
let(:support_in_reply_to_mail) { create_inbound_email_from_fixture('support_in_reply_to.eml') }
|
|
||||||
let(:described_subject) { described_class.receive support_mail }
|
|
||||||
let(:serialized_attributes) do
|
|
||||||
%w[bcc cc content_type date from html_content in_reply_to message_id multipart number_of_attachments references subject
|
|
||||||
text_content to auto_reply]
|
|
||||||
end
|
|
||||||
let(:conversation) { Conversation.where(inbox_id: channel_email.inbox).last }
|
|
||||||
|
|
||||||
before do
|
|
||||||
# this email is hardcoded in the support.eml, that's why we are updating this
|
|
||||||
channel_email.email = 'care@example.com'
|
|
||||||
channel_email.save!
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'covers email address format' do
|
|
||||||
before do
|
|
||||||
described_class.receive support_in_reply_to_mail
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'creates contact with proper email address' do
|
|
||||||
expect(support_in_reply_to_mail.mail['reply_to'].try(:value)).to eq('Sony Mathew <sony@chatwoot.com>')
|
|
||||||
expect(conversation.contact.email).to eq('sony@chatwoot.com')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'covers basic ticket creation' do
|
|
||||||
before do
|
|
||||||
described_subject
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'create the conversation in the inbox of the email channel' do
|
|
||||||
expect(conversation.inbox.id).to eq(channel_email.inbox.id)
|
|
||||||
expect(conversation.additional_attributes['source']).to eq('email')
|
|
||||||
expect(conversation.contact.email).to eq(support_mail.mail.from.first)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'create a new contact as the sender of the email' do
|
|
||||||
email_sender = Mail::Address.new(support_mail.mail[:from].value).name
|
|
||||||
expect(conversation.messages.last.sender.email).to eq(support_mail.mail.from.first)
|
|
||||||
expect(conversation.contact.name).to eq(email_sender)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'add the mail content as new message on the conversation' do
|
|
||||||
expect(conversation.messages.last.content).to eq("Let's talk about these images:")
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'add the attachments' do
|
|
||||||
expect(conversation.messages.last.attachments.count).to eq(2)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'have proper content_attributes with details of email' do
|
|
||||||
expect(conversation.messages.last.content_attributes[:email].keys).to eq(serialized_attributes)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'set proper content_type' do
|
|
||||||
expect(conversation.messages.last.content_type).to eq('incoming_email')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'email with references header' do
|
|
||||||
let(:mail_with_references) { create_inbound_email_from_fixture('mail_with_references.eml') }
|
|
||||||
let(:described_subject) { described_class.receive mail_with_references }
|
|
||||||
|
|
||||||
before do
|
|
||||||
# reuse the existing channel_email that's already set to 'care@example.com'
|
|
||||||
described_subject
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'includes references in the message content_attributes' do
|
|
||||||
message = conversation.messages.last
|
|
||||||
email_attributes = message.content_attributes['email']
|
|
||||||
|
|
||||||
expect(email_attributes['references']).to be_present
|
|
||||||
expect(email_attributes['references']).to eq(['4e6e35f5a38b4_479f13bb90078178@small-app-01.mail', 'test-reference-id'])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'includes references in serialized email attributes' do
|
|
||||||
message = conversation.messages.last
|
|
||||||
expect(message.content_attributes['email'].keys).to include('references')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'Sender without name' do
|
|
||||||
let(:support_mail_without_sender_name) { create_inbound_email_from_fixture('support_without_sender_name.eml') }
|
|
||||||
let(:described_subject) { described_class.receive support_mail_without_sender_name }
|
|
||||||
|
|
||||||
it 'create a new contact with the email' do
|
|
||||||
described_subject
|
|
||||||
email_sender = support_mail_without_sender_name.mail.from.first.split('@').first
|
|
||||||
expect(conversation.messages.last.sender.email).to eq(support_mail.mail.from.first)
|
|
||||||
expect(conversation.contact.name).to eq(email_sender)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'Sender with upcase mail address' do
|
|
||||||
let(:support_mail_without_sender_name) { create_inbound_email_from_fixture('support_without_sender_name.eml') }
|
|
||||||
let(:described_subject) { described_class.receive support_mail_without_sender_name }
|
|
||||||
|
|
||||||
it 'create a new inbox with the email case insensitive' do
|
|
||||||
described_subject
|
|
||||||
expect(conversation.inbox.id).to eq(channel_email.inbox.id)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'handle inbox contacts' do
|
|
||||||
let!(:contact) { create(:contact, account: account, email: support_mail.mail.from.first) }
|
|
||||||
let!(:contact_inbox) { create(:contact_inbox, inbox: channel_email.inbox, contact: contact) }
|
|
||||||
|
|
||||||
it 'does not create new contact if that contact exists in the inbox' do
|
|
||||||
expect do
|
|
||||||
described_subject
|
|
||||||
end
|
|
||||||
.to(not_change { Contact.count }
|
|
||||||
.and(not_change { ContactInbox.count }))
|
|
||||||
|
|
||||||
expect(conversation.messages.last.sender.id).to eq(contact.id)
|
|
||||||
expect(conversation.contact_inbox).to eq(contact_inbox)
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'with uppercase reply-to' do
|
|
||||||
let(:support_mail) { create_inbound_email_from_fixture('support_uppercase.eml') }
|
|
||||||
let!(:contact) { create(:contact, account: account, email: support_mail.mail.from.first) }
|
|
||||||
let!(:contact_inbox) { create(:contact_inbox, inbox: channel_email.inbox, contact: contact) }
|
|
||||||
|
|
||||||
it 'does not create new contact if that contact exists in the inbox' do
|
|
||||||
expect do
|
|
||||||
described_subject
|
|
||||||
end
|
|
||||||
.to(not_change { Contact.count }
|
|
||||||
.and(not_change { ContactInbox.count }))
|
|
||||||
|
|
||||||
expect(conversation.messages.last.sender.id).to eq(contact.id)
|
|
||||||
expect(conversation.contact_inbox).to eq(contact_inbox)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'group email sender' do
|
|
||||||
let(:group_sender_support_mail) { create_inbound_email_from_fixture('group_sender_support.eml') }
|
|
||||||
let(:described_subject) { described_class.receive group_sender_support_mail }
|
|
||||||
|
|
||||||
before do
|
|
||||||
# this email is hardcoded eml fixture file that's why we are updating this
|
|
||||||
channel_email.email = 'support@chatwoot.com'
|
|
||||||
channel_email.save!
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'create new contact with original sender' do
|
|
||||||
described_subject
|
|
||||||
email_sender = Mail::Address.new(group_sender_support_mail.mail[:from].value).name
|
|
||||||
|
|
||||||
expect(conversation.contact.email).to eq(group_sender_support_mail.mail['X-Original-Sender'].value)
|
|
||||||
expect(conversation.contact.name).to eq(email_sender)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'when mail has in reply to email' do
|
|
||||||
let(:reply_mail_without_uuid) { create_inbound_email_from_fixture('reply_mail_without_uuid.eml') }
|
|
||||||
let(:described_subject) { described_class.receive reply_mail_without_uuid }
|
|
||||||
let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
|
|
||||||
|
|
||||||
before do
|
|
||||||
email_channel
|
|
||||||
reply_mail_without_uuid.mail['In-Reply-To'] = 'conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123'
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'create channel with reply to mail' do
|
|
||||||
described_subject
|
|
||||||
conversation_1 = Conversation.last
|
|
||||||
|
|
||||||
expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
|
|
||||||
expect(conversation_1.additional_attributes['in_reply_to']).to eq('conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'append message to email conversation with same in reply to' do
|
|
||||||
described_subject
|
|
||||||
conversation_1 = Conversation.last
|
|
||||||
|
|
||||||
expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
|
|
||||||
expect(conversation_1.additional_attributes['in_reply_to']).to eq('conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123')
|
|
||||||
expect(conversation_1.messages.count).to eq(1)
|
|
||||||
|
|
||||||
reply_mail_without_uuid.mail['In-Reply-To'] = 'conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123'
|
|
||||||
reply_mail_without_uuid.mail['Message-Id'] = '0CB459E0-0336-41DA-BC88-E6E28C697SFC@chatwoot.com'
|
|
||||||
|
|
||||||
described_class.receive reply_mail_without_uuid
|
|
||||||
|
|
||||||
expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
|
|
||||||
expect(conversation_1.additional_attributes['in_reply_to']).to eq('conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123')
|
|
||||||
expect(conversation_1.messages.count).to eq(2)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'Sender with reply_to email address' do
|
|
||||||
let(:reply_to_mail) { create_inbound_email_from_fixture('reply_to.eml') }
|
|
||||||
let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
|
|
||||||
|
|
||||||
it 'prefer reply-to over from address' do
|
|
||||||
email_channel
|
|
||||||
described_class.receive reply_to_mail
|
|
||||||
|
|
||||||
conversation_1 = Conversation.last
|
|
||||||
email = conversation_1.messages.last.content_attributes['email']
|
|
||||||
|
|
||||||
expect(reply_to_mail.mail['From'].value).to be_present
|
|
||||||
expect(conversation_1.messages.last.content).to eq("Let's talk about these images:")
|
|
||||||
expect(reply_to_mail.mail['Reply-To'].value).to include(email['from'][0])
|
|
||||||
expect(reply_to_mail.mail['Reply-To'].value).to include(conversation_1.contact.email)
|
|
||||||
expect(reply_to_mail.mail['From'].value).not_to include(conversation_1.contact.email)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'when mail part is not present' do
|
|
||||||
let(:support_mail) { create_inbound_email_from_fixture('support_1.eml') }
|
|
||||||
let(:only_text) { create_inbound_email_from_fixture('only_text.eml') }
|
|
||||||
let(:only_html) { create_inbound_email_from_fixture('only_html.eml') }
|
|
||||||
let(:only_attachments) { create_inbound_email_from_fixture('only_attachments.eml') }
|
|
||||||
let(:html_and_attachments) { create_inbound_email_from_fixture('html_and_attachments.eml') }
|
|
||||||
let(:described_subject) { described_class.receive support_mail }
|
|
||||||
|
|
||||||
it 'Considers raw html mail body' do
|
|
||||||
described_subject
|
|
||||||
expect(conversation.inbox.id).to eq(channel_email.inbox.id)
|
|
||||||
|
|
||||||
expect(conversation.messages.last.content_attributes['email']['html_content']['reply']).to include(
|
|
||||||
<<~BODY.chomp
|
|
||||||
Hi,
|
|
||||||
|
|
||||||
We are providing you platform from here you can sell paid posts on your website.
|
|
||||||
|
|
||||||
Chatwoot | CS team | [C](https://d33wubrfki0l68.cloudfront.net/973467c532160fd8b940300a43fa85fa2d060307/dc9a0/static/brand-73f58cdefae282ae74cebfa74c1d7003.svg)
|
|
||||||
|
|
||||||
Skype: live:.cid.something
|
|
||||||
|
|
||||||
[]
|
|
||||||
BODY
|
|
||||||
)
|
|
||||||
expect(conversation.messages.last.content_attributes['email']['subject']).to eq('Get Paid to post an article')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'Considers only text body' do
|
|
||||||
described_class.receive only_text
|
|
||||||
|
|
||||||
expect(conversation.inbox.id).to eq(channel_email.inbox.id)
|
|
||||||
|
|
||||||
expect(conversation.messages.last.content).to eq('text only mail')
|
|
||||||
expect(conversation.messages.last.content_attributes['email']['subject']).to eq('test text only mail')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'Considers only html body' do
|
|
||||||
described_class.receive only_html
|
|
||||||
|
|
||||||
expect(conversation.inbox.id).to eq(channel_email.inbox.id)
|
|
||||||
|
|
||||||
expect(conversation.messages.last.content).to eq(
|
|
||||||
<<~BODY.chomp
|
|
||||||
This is html only mail
|
|
||||||
BODY
|
|
||||||
)
|
|
||||||
expect(conversation.messages.last.content_attributes['email']['subject']).to eq('test html only mail')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'Considers only attachments' do
|
|
||||||
described_class.receive only_attachments
|
|
||||||
|
|
||||||
expect(conversation.inbox.id).to eq(channel_email.inbox.id)
|
|
||||||
|
|
||||||
expect(conversation.messages.last.content).to be_nil
|
|
||||||
expect(conversation.messages.last.attachments.count).to eq(1)
|
|
||||||
expect(conversation.messages.last.content_attributes['email']['subject']).to eq('only attachments')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'Considers html and attachments' do
|
|
||||||
described_class.receive html_and_attachments
|
|
||||||
|
|
||||||
expect(conversation.inbox.id).to eq(channel_email.inbox.id)
|
|
||||||
|
|
||||||
expect(conversation.messages.last.content).to eq('This is html and attachments only mail')
|
|
||||||
expect(conversation.messages.last.attachments.count).to eq(1)
|
|
||||||
expect(conversation.messages.last.content_attributes['email']['subject']).to eq('attachment with html')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'when BCC processing is disabled for account' do
|
|
||||||
before do
|
|
||||||
allow(GlobalConfigService).to receive(:load).with('SKIP_INCOMING_BCC_PROCESSING', '').and_return(account.id.to_s)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not process BCC-only emails' do
|
|
||||||
bcc_mail = create_inbound_email_from_fixture('support.eml')
|
|
||||||
bcc_mail.mail['to'] = nil
|
|
||||||
bcc_mail.mail['bcc'] = 'care@example.com'
|
|
||||||
|
|
||||||
expect { described_class.receive bcc_mail }.to raise_error('Email channel/inbox not found')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
133
spec/services/mailbox/conversation_finder_spec.rb
Normal file
133
spec/services/mailbox/conversation_finder_spec.rb
Normal file
@ -0,0 +1,133 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Mailbox::ConversationFinder do
|
||||||
|
let(:account) { create(:account) }
|
||||||
|
let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
|
||||||
|
let(:conversation) { create(:conversation, inbox: email_channel.inbox, account: account) }
|
||||||
|
let(:mail) { Mail.new }
|
||||||
|
|
||||||
|
describe '#find' do
|
||||||
|
context 'when receiver uuid strategy finds conversation' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
|
||||||
|
mail.to = 'reply+12345678-1234-1234-1234-123456789012@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns the conversation' do
|
||||||
|
finder = described_class.new(mail)
|
||||||
|
expect(finder.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'logs which strategy succeeded' do
|
||||||
|
allow(Rails.logger).to receive(:info)
|
||||||
|
finder = described_class.new(mail)
|
||||||
|
finder.find
|
||||||
|
|
||||||
|
expect(Rails.logger).to have_received(:info).with('Conversation found via receiver_uuid_strategy strategy')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when in_reply_to strategy finds conversation' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
|
||||||
|
mail.in_reply_to = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns the conversation' do
|
||||||
|
finder = described_class.new(mail)
|
||||||
|
expect(finder.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'logs which strategy succeeded' do
|
||||||
|
allow(Rails.logger).to receive(:info)
|
||||||
|
finder = described_class.new(mail)
|
||||||
|
finder.find
|
||||||
|
|
||||||
|
expect(Rails.logger).to have_received(:info).with('Conversation found via in_reply_to_strategy strategy')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when references strategy finds conversation' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
|
||||||
|
mail.to = 'test@example.com'
|
||||||
|
mail.references = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns the conversation' do
|
||||||
|
finder = described_class.new(mail)
|
||||||
|
expect(finder.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'logs which strategy succeeded' do
|
||||||
|
allow(Rails.logger).to receive(:info)
|
||||||
|
finder = described_class.new(mail)
|
||||||
|
finder.find
|
||||||
|
|
||||||
|
expect(Rails.logger).to have_received(:info).with('Conversation found via references_strategy strategy')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when no strategy finds conversation' do
|
||||||
|
# With NewConversationStrategy in default strategies, this scenario only happens
|
||||||
|
# when using custom strategies that exclude NewConversationStrategy
|
||||||
|
let(:finding_strategies) do
|
||||||
|
[
|
||||||
|
Mailbox::ConversationFinderStrategies::ReceiverUuidStrategy,
|
||||||
|
Mailbox::ConversationFinderStrategies::InReplyToStrategy,
|
||||||
|
Mailbox::ConversationFinderStrategies::ReferencesStrategy
|
||||||
|
]
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns nil' do
|
||||||
|
finder = described_class.new(mail, strategies: finding_strategies)
|
||||||
|
expect(finder.find).to be_nil
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'logs that no conversation was found' do
|
||||||
|
allow(Rails.logger).to receive(:error)
|
||||||
|
finder = described_class.new(mail, strategies: finding_strategies)
|
||||||
|
finder.find
|
||||||
|
|
||||||
|
expect(Rails.logger).to have_received(:error).with('No conversation found via any strategy (NewConversationStrategy missing?)')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'with custom strategies' do
|
||||||
|
let(:custom_strategy_class) do
|
||||||
|
Class.new(Mailbox::ConversationFinderStrategies::BaseStrategy) do
|
||||||
|
def find
|
||||||
|
# Always return nil for testing
|
||||||
|
nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'uses provided strategies instead of defaults' do
|
||||||
|
finder = described_class.new(mail, strategies: [custom_strategy_class])
|
||||||
|
expect(finder.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'with strategy execution order' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
|
||||||
|
|
||||||
|
# Set up mail so all strategies could match
|
||||||
|
mail.to = 'reply+12345678-1234-1234-1234-123456789012@example.com'
|
||||||
|
mail.in_reply_to = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
|
||||||
|
mail.references = 'conversation/12345678-1234-1234-1234-123456789012/messages/456@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns conversation from first matching strategy' do
|
||||||
|
allow(Rails.logger).to receive(:info)
|
||||||
|
finder = described_class.new(mail)
|
||||||
|
result = finder.find
|
||||||
|
|
||||||
|
expect(result).to eq(conversation)
|
||||||
|
# Should only log the first strategy that succeeded (ReceiverUuidStrategy)
|
||||||
|
expect(Rails.logger).to have_received(:info).once.with('Conversation found via receiver_uuid_strategy strategy')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,118 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Mailbox::ConversationFinderStrategies::InReplyToStrategy do
|
||||||
|
let(:account) { create(:account) }
|
||||||
|
let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
|
||||||
|
let(:conversation) { create(:conversation, inbox: email_channel.inbox, account: account) }
|
||||||
|
let(:mail) { Mail.new }
|
||||||
|
|
||||||
|
describe '#find' do
|
||||||
|
context 'when in_reply_to has message-specific pattern' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
|
||||||
|
mail.in_reply_to = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'extracts UUID and returns conversation' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when in_reply_to has conversation fallback pattern' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee')
|
||||||
|
mail.in_reply_to = "account/#{account.id}/conversation/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee@example.com"
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'extracts UUID and returns conversation' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when in_reply_to matches message source_id' do
|
||||||
|
let(:message) do
|
||||||
|
conversation.messages.create!(
|
||||||
|
source_id: 'original-message-id@example.com',
|
||||||
|
account_id: account.id,
|
||||||
|
message_type: 'outgoing',
|
||||||
|
inbox_id: email_channel.inbox.id,
|
||||||
|
content: 'Original message'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
message # Create the message
|
||||||
|
mail.in_reply_to = 'original-message-id@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'finds conversation from message source_id' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when in_reply_to has multiple values' do
|
||||||
|
let(:message) do
|
||||||
|
conversation.messages.create!(
|
||||||
|
source_id: 'message-123@example.com',
|
||||||
|
account_id: account.id,
|
||||||
|
message_type: 'outgoing',
|
||||||
|
inbox_id: email_channel.inbox.id,
|
||||||
|
content: 'Test message'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
message # Create the message
|
||||||
|
mail.in_reply_to = ['some-other-id@example.com', 'message-123@example.com']
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'finds conversation from any in_reply_to value' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when in_reply_to is blank' do
|
||||||
|
it 'returns nil' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when in_reply_to does not match any pattern or source_id' do
|
||||||
|
before do
|
||||||
|
mail.in_reply_to = 'random-message-id@gmail.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns nil' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when UUID exists but conversation does not' do
|
||||||
|
before do
|
||||||
|
mail.in_reply_to = 'conversation/99999999-9999-9999-9999-999999999999/messages/123@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns nil' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'with malformed in_reply_to pattern' do
|
||||||
|
before do
|
||||||
|
mail.in_reply_to = 'conversation/not-a-uuid/messages/123@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns nil' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,161 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Mailbox::ConversationFinderStrategies::NewConversationStrategy do
|
||||||
|
let(:account) { create(:account) }
|
||||||
|
let(:email_channel) { create(:channel_email, account: account) }
|
||||||
|
let(:mail) { Mail.new }
|
||||||
|
|
||||||
|
before do
|
||||||
|
mail.to = [email_channel.email]
|
||||||
|
mail.from = 'sender@example.com'
|
||||||
|
mail.subject = 'Test Subject'
|
||||||
|
mail.message_id = '<test@example.com>'
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '#find' do
|
||||||
|
context 'when channel is found' do
|
||||||
|
context 'with new contact' do
|
||||||
|
it 'builds a new conversation with new contact' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
|
||||||
|
expect do
|
||||||
|
conversation = strategy.find
|
||||||
|
expect(conversation).to be_a(Conversation)
|
||||||
|
expect(conversation.new_record?).to be(true) # Not persisted yet
|
||||||
|
expect(conversation.inbox).to eq(email_channel.inbox)
|
||||||
|
expect(conversation.account).to eq(account)
|
||||||
|
end.to not_change(Conversation, :count) # No conversation created yet
|
||||||
|
.and change(Contact, :count).by(1) # Contact is created
|
||||||
|
.and change(ContactInbox, :count).by(1)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'sets conversation attributes correctly' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
conversation = strategy.find
|
||||||
|
|
||||||
|
expect(conversation.additional_attributes['source']).to eq('email')
|
||||||
|
expect(conversation.additional_attributes['mail_subject']).to eq('Test Subject')
|
||||||
|
expect(conversation.additional_attributes['initiated_at']).to have_key('timestamp')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'sets contact attributes correctly' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
conversation = strategy.find
|
||||||
|
|
||||||
|
expect(conversation.contact.email).to eq('sender@example.com')
|
||||||
|
expect(conversation.contact.name).to eq('sender')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'with existing contact' do
|
||||||
|
let!(:existing_contact) { create(:contact, email: 'sender@example.com', account: account) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
create(:contact_inbox, contact: existing_contact, inbox: email_channel.inbox)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'builds conversation with existing contact' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
|
||||||
|
expect do
|
||||||
|
conversation = strategy.find
|
||||||
|
expect(conversation).to be_a(Conversation)
|
||||||
|
expect(conversation.new_record?).to be(true) # Not persisted yet
|
||||||
|
expect(conversation.contact).to eq(existing_contact)
|
||||||
|
end.to not_change(Conversation, :count) # No conversation created yet
|
||||||
|
.and not_change(Contact, :count)
|
||||||
|
.and not_change(ContactInbox, :count)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when mail has In-Reply-To header' do
|
||||||
|
before do
|
||||||
|
mail['In-Reply-To'] = '<previous-message@example.com>'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'stores in_reply_to in additional_attributes' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
conversation = strategy.find
|
||||||
|
|
||||||
|
expect(conversation.additional_attributes['in_reply_to']).to eq('<previous-message@example.com>')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when mail is auto reply' do
|
||||||
|
before do
|
||||||
|
mail['X-Autoreply'] = 'yes'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'marks conversation as auto_reply' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
conversation = strategy.find
|
||||||
|
|
||||||
|
expect(conversation.additional_attributes['auto_reply']).to be true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when sender has name in From header' do
|
||||||
|
before do
|
||||||
|
mail.from = 'John Doe <john@example.com>'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'uses sender name from mail' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
conversation = strategy.find
|
||||||
|
|
||||||
|
expect(conversation.contact.name).to eq('John Doe')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when channel is not found' do
|
||||||
|
before do
|
||||||
|
mail.to = ['nonexistent@example.com']
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns nil' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
|
||||||
|
expect do
|
||||||
|
result = strategy.find
|
||||||
|
expect(result).to be_nil
|
||||||
|
end.not_to change(Conversation, :count)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when contact creation fails' do
|
||||||
|
before do
|
||||||
|
builder = instance_double(ContactInboxWithContactBuilder)
|
||||||
|
allow(ContactInboxWithContactBuilder).to receive(:new).and_return(builder)
|
||||||
|
allow(builder).to receive(:perform).and_raise(ActiveRecord::RecordInvalid)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'rolls back the transaction' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
|
||||||
|
expect do
|
||||||
|
strategy.find
|
||||||
|
end.to raise_error(ActiveRecord::RecordInvalid)
|
||||||
|
.and not_change(Conversation, :count)
|
||||||
|
.and not_change(Contact, :count)
|
||||||
|
.and not_change(ContactInbox, :count)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when conversation creation fails' do
|
||||||
|
before do
|
||||||
|
# Make conversation build fail with invalid attributes
|
||||||
|
allow(Conversation).to receive(:new).and_return(Conversation.new)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns invalid conversation object' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
|
||||||
|
conversation = strategy.find
|
||||||
|
expect(conversation).to be_a(Conversation)
|
||||||
|
expect(conversation.new_record?).to be(true)
|
||||||
|
expect(conversation.valid?).to be(false)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,99 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Mailbox::ConversationFinderStrategies::ReceiverUuidStrategy do
|
||||||
|
let(:account) { create(:account) }
|
||||||
|
let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
|
||||||
|
let(:conversation) { create(:conversation, inbox: email_channel.inbox, account: account) }
|
||||||
|
let(:mail) { Mail.new }
|
||||||
|
|
||||||
|
describe '#find' do
|
||||||
|
context 'when mail has valid reply+uuid format' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
|
||||||
|
mail.to = 'reply+12345678-1234-1234-1234-123456789012@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns the conversation' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when mail has uppercase UUID' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
|
||||||
|
mail.to = 'reply+12345678-1234-1234-1234-123456789012@EXAMPLE.COM'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns the conversation (case-insensitive matching)' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when mail has multiple recipients with valid UUID' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee')
|
||||||
|
mail.to = ['other@example.com', 'reply+aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee@example.com']
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'extracts UUID from any recipient' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when UUID does not exist in database' do
|
||||||
|
before do
|
||||||
|
mail.to = 'reply+99999999-9999-9999-9999-999999999999@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns nil' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when mail has no recipients' do
|
||||||
|
it 'returns nil' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when mail recipient has malformed UUID' do
|
||||||
|
before do
|
||||||
|
mail.to = 'reply+not-a-valid-uuid@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns nil' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when mail recipient has no reply+ prefix' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
|
||||||
|
mail.to = 'test+12345678-1234-1234-1234-123456789012@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns nil' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when mail recipient has additional text after UUID' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
|
||||||
|
mail.to = 'reply+12345678-1234-1234-1234-123456789012-extra@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns nil (UUID must be exact)' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,208 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Mailbox::ConversationFinderStrategies::ReferencesStrategy do
|
||||||
|
let(:account) { create(:account) }
|
||||||
|
let(:email_channel) { create(:channel_email, email: 'test@example.com', account: account) }
|
||||||
|
let(:conversation) { create(:conversation, inbox: email_channel.inbox, account: account) }
|
||||||
|
let(:mail) { Mail.new }
|
||||||
|
|
||||||
|
describe '#find' do
|
||||||
|
context 'when references has message-specific pattern' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
|
||||||
|
mail.to = 'test@example.com'
|
||||||
|
mail.references = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'extracts UUID and returns conversation' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when references has conversation fallback pattern' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee')
|
||||||
|
mail.to = 'test@example.com'
|
||||||
|
mail.references = "account/#{account.id}/conversation/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee@example.com"
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'extracts UUID and returns conversation' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when references matches message source_id' do
|
||||||
|
let(:message) do
|
||||||
|
conversation.messages.create!(
|
||||||
|
source_id: 'original-message-id@example.com',
|
||||||
|
account_id: account.id,
|
||||||
|
message_type: 'outgoing',
|
||||||
|
inbox_id: email_channel.inbox.id,
|
||||||
|
content: 'Original message'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
message # Create the message
|
||||||
|
mail.to = 'test@example.com'
|
||||||
|
mail.references = 'original-message-id@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'finds conversation from message source_id' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when references has multiple values' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
|
||||||
|
mail.to = 'test@example.com'
|
||||||
|
mail.references = [
|
||||||
|
'some-random-message@gmail.com',
|
||||||
|
'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com',
|
||||||
|
'another-message@outlook.com'
|
||||||
|
]
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'finds conversation from any reference' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when references is blank' do
|
||||||
|
it 'returns nil' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when references does not match any pattern or source_id' do
|
||||||
|
before do
|
||||||
|
mail.references = 'random-message-id@gmail.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns nil' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'with channel validation' do
|
||||||
|
context 'when conversation belongs to the correct channel' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
|
||||||
|
mail.to = 'test@example.com'
|
||||||
|
mail.references = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns the conversation' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when conversation belongs to a different channel' do
|
||||||
|
let(:other_email_channel) { create(:channel_email, email: 'other@example.com', account: account) }
|
||||||
|
let(:other_conversation) do
|
||||||
|
create(
|
||||||
|
:conversation,
|
||||||
|
inbox: other_email_channel.inbox,
|
||||||
|
account: account
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
other_conversation.update!(uuid: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee')
|
||||||
|
# Mail is addressed to test@example.com but references conversation from other@example.com
|
||||||
|
mail.to = 'test@example.com'
|
||||||
|
mail.references = 'conversation/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/messages/456@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns nil (prevents cross-channel hijacking)' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when channel cannot be determined from mail' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
|
||||||
|
mail.to = 'unknown@example.com' # Email not associated with any channel
|
||||||
|
mail.references = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns nil' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when mail has multiple recipients including correct channel' do
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
|
||||||
|
mail.to = ['other@example.com', 'test@example.com']
|
||||||
|
mail.references = 'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'finds the correct channel and returns conversation' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when UUID exists but conversation does not' do
|
||||||
|
before do
|
||||||
|
mail.to = 'test@example.com'
|
||||||
|
mail.references = 'conversation/99999999-9999-9999-9999-999999999999/messages/123@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns nil' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'with malformed references pattern' do
|
||||||
|
before do
|
||||||
|
mail.references = 'conversation/not-a-uuid/messages/123@example.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns nil' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when first reference fails channel validation but second succeeds' do
|
||||||
|
let(:other_email_channel) { create(:channel_email, email: 'other@example.com', account: account) }
|
||||||
|
let(:other_conversation) do
|
||||||
|
create(
|
||||||
|
:conversation,
|
||||||
|
inbox: other_email_channel.inbox,
|
||||||
|
account: account
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
conversation.update!(uuid: '12345678-1234-1234-1234-123456789012')
|
||||||
|
other_conversation.update!(uuid: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee')
|
||||||
|
|
||||||
|
mail.to = 'test@example.com'
|
||||||
|
mail.references = [
|
||||||
|
'conversation/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/messages/456@example.com', # Wrong channel
|
||||||
|
'conversation/12345678-1234-1234-1234-123456789012/messages/123@example.com' # Correct channel
|
||||||
|
]
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'skips invalid reference and returns conversation from valid reference' do
|
||||||
|
strategy = described_class.new(mail)
|
||||||
|
expect(strategy.find).to eq(conversation)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
Loading…
Reference in New Issue
Block a user