Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved postmaster database filter.

Browse source
This commit is contained in:
Martin Edenhofer 2017-06-24 00:06:08 +02:00
parent 9e03183e9e
commit 306cd6c3db
2 changed files with 100 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/models/channel/filter/database.rb
View file

@ -13,13 +13,13 @@ module Channel::Filter::Database
min_one_rule_exists = false
filter[:match].each { |key, meta|
begin
next if !meta || !meta['value'] || meta['value'].empty?
next if meta.blank? || meta['value'].blank?
min_one_rule_exists = true
scan = []
if mail
scan = mail[ key.downcase.to_sym ].scan(/#{meta['value']}/i)
has_matched = false
if mail[ key.downcase.to_sym ].present? && mail[ key.downcase.to_sym ] =~ /#{meta['value']}/i
has_matched = true
end
if scan[0]
if has_matched
if meta[:operator] == 'contains not'
all_matches_ok = false
end

95
test/unit/email_postmaster_test.rb
View file

@ -396,6 +396,101 @@ Some Text'
assert_equal('2 normal', ticket.priority.name)
PostmasterFilter.destroy_all
PostmasterFilter.create!(
name: 'Autoresponder',
match: {
'auto-submitted' => {
'operator' => 'contains not',
'value' => 'auto-generated',
},
'from' => {
'operator' => 'contains',
'value' => '@example.com',
}
},
perform: {
'x-zammad-article-internal' => {
'value' => 'true',
},
'x-zammad-article-type_id' => {
'value' => Ticket::Article::Type.find_by(name: 'note').id.to_s,
},
'x-zammad-ignore' => {
'value' => 'false',
},
},
channel: 'email',
active: true,
created_by_id: 1,
updated_by_id: 1,
)
data = 'From: ME Bob <me@example.com>
To: customer@example.com
Subject: some subject
Some Text'
parser = Channel::EmailParser.new
ticket, article, user = parser.process({ group_id: group_default.id, trusted: false }, data)
assert_equal('Users', ticket.group.name)
assert_equal('2 normal', ticket.priority.name)
assert_equal('some subject', ticket.title)
assert_equal('me@example.com', ticket.customer.email)
assert_equal('2 normal', ticket.priority.name)
assert_equal('Customer', article.sender.name)
assert_equal('note', article.type.name)
assert_equal(true, article.internal)
PostmasterFilter.destroy_all
PostmasterFilter.create!(
name: 'Autoresponder',
match: {
'auto-submitted' => {
'operator' => 'contains',
'value' => 'auto-generated',
},
'from' => {
'operator' => 'contains',
'value' => '@example.com',
}
},
perform: {
'x-zammad-article-internal' => {
'value' => 'true',
},
'x-zammad-article-type_id' => {
'value' => Ticket::Article::Type.find_by(name: 'note').id.to_s,
},
'x-zammad-ignore' => {
'value' => 'false',
},
},
channel: 'email',
active: true,
created_by_id: 1,
updated_by_id: 1,
)
data = 'From: ME Bob <me@example.com>
To: customer@example.com
Subject: some subject
Some Text'
parser = Channel::EmailParser.new
ticket, article, user = parser.process({ group_id: group_default.id, trusted: false }, data)
assert_equal('Users', ticket.group.name)
assert_equal('2 normal', ticket.priority.name)
assert_equal('some subject', ticket.title)
assert_equal('me@example.com', ticket.customer.email)
assert_equal('2 normal', ticket.priority.name)
assert_equal('Customer', article.sender.name)
assert_equal('email', article.type.name)
assert_equal(false, article.internal)
end
end