LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix: Automations condition based quoted text (#7272)

Browse Source
This commit is contained in:
Tejaswini Chile
2023-06-09 17:00:05 +05:30
committed by GitHub
parent f64f2138db
commit 879a244f93
8 changed files with 107 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/models/message.rb
View File

@@ -2,23 +2,24 @@
#
# Table name: messages
#
# id :integer not null, primary key
# additional_attributes :jsonb
# content :text
# content_attributes :json
# content_type :integer default("text"), not null
# external_source_ids :jsonb
# message_type :integer not null
# private :boolean default(FALSE)
# sender_type :string
# status :integer default("sent")
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer not null
# conversation_id :integer not null
# inbox_id :integer not null
# sender_id :bigint
# source_id :string
# id :integer not null, primary key
# additional_attributes :jsonb
# content :text
# content_attributes :json
# content_type :integer default("text"), not null
# external_source_ids :jsonb
# message_type :integer not null
# private :boolean default(FALSE)
# processed_message_content :text
# sender_type :string
# status :integer default("sent")
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer not null
# conversation_id :integer not null
# inbox_id :integer not null
# sender_id :bigint
# source_id :string
#
# Indexes
#
@@ -57,6 +58,7 @@ class Message < ApplicationRecord
}.to_json.freeze
before_validation :ensure_content_type
before_save :ensure_processed_message_content
validates :account_id, presence: true
validates :inbox_id, presence: true
@@ -214,6 +216,13 @@ class Message < ApplicationRecord
private
def ensure_processed_message_content
text_content_quoted = content_attributes.dig(:email, :text_content, :quoted)
html_content_quoted = content_attributes.dig(:email, :html_content, :quoted)
self.processed_message_content = text_content_quoted || html_content_quoted || content
end
def ensure_content_type
self.content_type ||= Message.content_types[:text]
end

3
app/services/automation_rules/conditions_filter_service.rb
View File

@@ -27,6 +27,7 @@ class AutomationRules::ConditionsFilterService < FilterService
end
records = base_relation.where(@query_string, @filter_values.with_indifferent_access)
records = perform_attribute_changed_filter(records) if @attribute_changed_query_filter.any?
records.any?
@@ -93,6 +94,8 @@ class AutomationRules::ConditionsFilterService < FilterService
attribute_key = query_hash['attribute_key']
query_operator = query_hash['query_operator']
attribute_key = 'processed_message_content' if attribute_key == 'content'
filter_operator_value = filter_operation(query_hash, current_index)
case current_filter['attribute_type']