Vishnu NarayananandGitHub
ce34f93917
## Summary Outbound email messages never populate `content_attributes.email.subject`. The subject lives only on the parent conversation's `additional_attributes.mail_subject`. The search index doc built by `Messages::SearchDataPresenter` pulls from the message-level field only, so outbound email subjects are unsearchable for accounts on the advanced_search (Elasticsearch) path. This change makes the presenter fall back to `conversation.additional_attributes.mail_subject` when the message-level subject is blank. Inbound email messages keep their existing behavior (message-level subject takes precedence). Closes https://linear.app/chatwoot/issue/CW-6877 ## What changes - `Messages::SearchDataPresenter#content_attributes_data` now falls back to the conversation's `mail_subject` when the message-level subject is blank. - Added specs covering the fallback, precedence, and the neither-set case. ## What does not change - No schema changes, no migrations, no backfill of existing OpenSearch documents. - Searchkick's `after_commit :reindex_for_search` on `Message` will pick up the new field for all newly created or updated messages via the existing indexing path. - Postgres search path (free accounts, fallback) is untouched. Broader subject search for those users is a separate follow-up.
59 lines
1.3 KiB
Ruby
59 lines
1.3 KiB
Ruby
class Messages::SearchDataPresenter < SimpleDelegator
|
|
def search_data
|
|
{
|
|
**searchable_content,
|
|
**message_attributes,
|
|
additional_attributes: additional_attributes_data,
|
|
conversation: conversation_data
|
|
}
|
|
end
|
|
|
|
private
|
|
|
|
def searchable_content
|
|
{
|
|
content: content,
|
|
attachments: attachment_data,
|
|
content_attributes: content_attributes_data
|
|
}
|
|
end
|
|
|
|
def message_attributes
|
|
{
|
|
account_id: account_id,
|
|
inbox_id: inbox_id,
|
|
conversation_id: conversation_id,
|
|
message_type: message_type,
|
|
private: private,
|
|
created_at: created_at,
|
|
source_id: source_id,
|
|
sender_id: sender_id,
|
|
sender_type: sender_type
|
|
}
|
|
end
|
|
|
|
def attachment_data
|
|
attachments.filter_map do |a|
|
|
{ transcribed_text: a.meta&.dig('transcribed_text') }
|
|
end.presence
|
|
end
|
|
|
|
def content_attributes_data
|
|
email_subject = content_attributes.dig(:email, :subject).presence ||
|
|
conversation.additional_attributes&.dig('mail_subject').presence
|
|
return {} if email_subject.blank?
|
|
|
|
{ email: { subject: email_subject } }
|
|
end
|
|
|
|
def conversation_data
|
|
{ id: conversation.display_id }
|
|
end
|
|
|
|
def additional_attributes_data
|
|
{
|
|
automation_rule_id: content_attributes&.dig('automation_rule_id')
|
|
}
|
|
end
|
|
end
|