Only send notifications if not bulk mail has initiated.
This commit is contained in:
parent
cb2913a401
commit
9301d03b37
6 changed files with 245 additions and 5 deletions
|
@ -9,7 +9,8 @@ class Channel::EmailParser
|
||||||
|
|
||||||
=begin
|
=begin
|
||||||
|
|
||||||
mail = parse(msg_as_string)
|
parser = Channel::EmailParser.new
|
||||||
|
mail = parser.parse(msg_as_string)
|
||||||
|
|
||||||
mail = {
|
mail = {
|
||||||
from: 'Some Name <some@example.com>',
|
from: 'Some Name <some@example.com>',
|
||||||
|
|
|
@ -635,11 +635,11 @@ condition example
|
||||||
|
|
||||||
perform changes on ticket
|
perform changes on ticket
|
||||||
|
|
||||||
ticket.perform_changes({}, 'trigger')
|
ticket.perform_changes({}, 'trigger', item)
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|
||||||
def perform_changes(perform, log)
|
def perform_changes(perform, log, item = nil)
|
||||||
logger.debug "Perform #{log} #{perform.inspect} on Ticket.find(#{id})"
|
logger.debug "Perform #{log} #{perform.inspect} on Ticket.find(#{id})"
|
||||||
changed = false
|
changed = false
|
||||||
perform.each do |key, value|
|
perform.each do |key, value|
|
||||||
|
@ -662,8 +662,14 @@ perform changes on ticket
|
||||||
recipient_string = ''
|
recipient_string = ''
|
||||||
recipient_already = {}
|
recipient_already = {}
|
||||||
recipients.each {|user|
|
recipients.each {|user|
|
||||||
|
|
||||||
|
# send notifications only to email adresses
|
||||||
next if !user.email
|
next if !user.email
|
||||||
next if user.email !~ /@/
|
next if user.email !~ /@/
|
||||||
|
|
||||||
|
# do not sent notifications to this recipients
|
||||||
|
next if user.email =~ /(mailer-daemon|postmaster|abuse|root)@.+?\..+?/i
|
||||||
|
|
||||||
email = user.email.downcase.strip
|
email = user.email.downcase.strip
|
||||||
next if recipient_already[email]
|
next if recipient_already[email]
|
||||||
recipient_already[email] = true
|
recipient_already[email] = true
|
||||||
|
@ -679,6 +685,39 @@ perform changes on ticket
|
||||||
next if !email_address
|
next if !email_address
|
||||||
next if !email_address.channel_id
|
next if !email_address.channel_id
|
||||||
|
|
||||||
|
# check if notification should be send because of customer emails
|
||||||
|
if item && item[:article_id]
|
||||||
|
article = Ticket::Article.lookup(id: item[:article_id])
|
||||||
|
if article
|
||||||
|
type = Ticket::Article::Type.lookup(id: article.type_id)
|
||||||
|
sender = Ticket::Article::Sender.lookup(id: article.sender_id)
|
||||||
|
if sender && sender.name == 'Customer' && type && type.name == 'email'
|
||||||
|
|
||||||
|
# get attachment
|
||||||
|
list = Store.list(
|
||||||
|
object: 'Ticket::Article::Mail',
|
||||||
|
o_id: article.id,
|
||||||
|
)
|
||||||
|
if list && list[0]
|
||||||
|
file = Store.find(list[0].id)
|
||||||
|
if file
|
||||||
|
content = file.content
|
||||||
|
if content
|
||||||
|
parser = Channel::EmailParser.new
|
||||||
|
mail = parser.parse(content)
|
||||||
|
|
||||||
|
# check headers
|
||||||
|
next if mail['x-loop'.to_sym] =~ /yes/i
|
||||||
|
next if mail['precedence'.to_sym] =~ /bulk/i
|
||||||
|
next if mail['auto-submitted'.to_sym] =~ /auto-generated/i
|
||||||
|
next if mail['x-auto-response-suppress'.to_sym] =~ /yes/i
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
objects = {
|
objects = {
|
||||||
ticket: self,
|
ticket: self,
|
||||||
article: articles.last,
|
article: articles.last,
|
||||||
|
@ -703,7 +742,6 @@ perform changes on ticket
|
||||||
)
|
)
|
||||||
Ticket::Article.create(
|
Ticket::Article.create(
|
||||||
ticket_id: id,
|
ticket_id: id,
|
||||||
#from: 'some_sender@example.com',
|
|
||||||
to: recipient_string,
|
to: recipient_string,
|
||||||
subject: subject,
|
subject: subject,
|
||||||
content_type: 'text/html',
|
content_type: 'text/html',
|
||||||
|
|
|
@ -70,7 +70,7 @@ class Transaction::Trigger
|
||||||
next if !match
|
next if !match
|
||||||
end
|
end
|
||||||
|
|
||||||
ticket.perform_changes(trigger.perform, 'trigger')
|
ticket.perform_changes(trigger.perform, 'trigger', @item)
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
17
test/fixtures/ticket_trigger/mail1.box
vendored
Normal file
17
test/fixtures/ticket_trigger/mail1.box
vendored
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
From: Martin Edenhofer <martin@example.com>
|
||||||
|
To: me@example.com
|
||||||
|
Content-Type: text/plain;
|
||||||
|
charset=iso-8859-1
|
||||||
|
Content-Transfer-Encoding: quoted-printable
|
||||||
|
Subject: =?iso-8859-1?Q?aa=E4=F6=FC=DFad_asd?=
|
||||||
|
X-Universally-Unique-Identifier: d12c15d2-e6d6-4ccd-86c7-abc2c3d0a2a2
|
||||||
|
Date: Fri, 4 May 2012 14:01:03 +0200
|
||||||
|
Message-Id: <BC182994-03FA-4DC5-8202-98CBFACA0887@example.com>
|
||||||
|
Mime-Version: 1.0 (Apple Message framework v1257)
|
||||||
|
|
||||||
|
=E4=F6=FC=DF ad asd
|
||||||
|
|
||||||
|
-Martin
|
||||||
|
|
||||||
|
--
|
||||||
|
Old programmers never die. They just branch to a new address.
|
18
test/fixtures/ticket_trigger/mail2.box
vendored
Normal file
18
test/fixtures/ticket_trigger/mail2.box
vendored
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
From: Martin Edenhofer <martin@example.com>
|
||||||
|
To: me@example.com
|
||||||
|
Content-Type: text/plain;
|
||||||
|
charset=iso-8859-1
|
||||||
|
Content-Transfer-Encoding: quoted-printable
|
||||||
|
Subject: =?iso-8859-1?Q?aa=E4=F6=FC=DFad_asd?=
|
||||||
|
X-Universally-Unique-Identifier: d12c15d2-e6d6-4ccd-86c7-abc2c3d0a2a2
|
||||||
|
Date: Fri, 4 May 2012 14:01:03 +0200
|
||||||
|
Precedence: bulk
|
||||||
|
Message-Id: <BC182994-03FA-4DC5-8202-98CBFACA0887-1@example.com>
|
||||||
|
Mime-Version: 1.0 (Apple Message framework v1257)
|
||||||
|
|
||||||
|
=E4=F6=FC=DF ad asd
|
||||||
|
|
||||||
|
-Martin
|
||||||
|
|
||||||
|
--
|
||||||
|
Old programmers never die. They just branch to a new address.
|
|
@ -334,4 +334,170 @@ class TicketTriggerTest < ActiveSupport::TestCase
|
||||||
Trigger.destroy_all
|
Trigger.destroy_all
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test '3 auto replys' do
|
||||||
|
roles = Role.where(name: 'Customer')
|
||||||
|
customer1 = User.create_or_update(
|
||||||
|
login: 'postmaster@example.com',
|
||||||
|
firstname: 'Notification',
|
||||||
|
lastname: 'Customer1',
|
||||||
|
email: 'postmaster@example.com',
|
||||||
|
password: 'customerpw',
|
||||||
|
active: true,
|
||||||
|
roles: roles,
|
||||||
|
updated_at: '2015-02-05 16:37:00',
|
||||||
|
updated_by_id: 1,
|
||||||
|
created_by_id: 1,
|
||||||
|
)
|
||||||
|
customer2 = User.create_or_update(
|
||||||
|
login: 'ticket-auto-reply-customer2@example.com',
|
||||||
|
firstname: 'Notification',
|
||||||
|
lastname: 'Customer2',
|
||||||
|
email: 'ticket-auto-reply-customer2@example.com',
|
||||||
|
password: 'customerpw',
|
||||||
|
active: true,
|
||||||
|
organization_id: nil,
|
||||||
|
roles: roles,
|
||||||
|
updated_at: '2015-02-05 16:37:00',
|
||||||
|
updated_by_id: 1,
|
||||||
|
created_by_id: 1,
|
||||||
|
)
|
||||||
|
|
||||||
|
trigger1 = Trigger.create_or_update(
|
||||||
|
name: 'auto reply - new ticket',
|
||||||
|
condition: {
|
||||||
|
'ticket.action' => {
|
||||||
|
'operator' => 'is',
|
||||||
|
'value' => 'create',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
perform: {
|
||||||
|
'notification.email' => {
|
||||||
|
'body' => 'some text<br>#{ticket.customer.lastname}<br>#{ticket.title}',
|
||||||
|
'recipient' => 'ticket_customer',
|
||||||
|
'subject' => 'Thanks for your inquiry (#{ticket.title})!',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
disable_notification: true,
|
||||||
|
active: true,
|
||||||
|
created_by_id: 1,
|
||||||
|
updated_by_id: 1,
|
||||||
|
)
|
||||||
|
|
||||||
|
trigger2 = Trigger.create_or_update(
|
||||||
|
name: 'not matching',
|
||||||
|
condition: {
|
||||||
|
'ticket.action' => {
|
||||||
|
'operator' => 'is',
|
||||||
|
'value' => 'create',
|
||||||
|
},
|
||||||
|
'ticket.state_id' => {
|
||||||
|
'operator' => 'is',
|
||||||
|
'value' => Ticket::State.lookup(name: 'closed').id.to_s,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
perform: {
|
||||||
|
'notification.email' => {
|
||||||
|
'body' => '2some text<br>#{ticket.customer.lastname}<br>#{ticket.title}',
|
||||||
|
'recipient' => 'ticket_customer',
|
||||||
|
'subject' => '2Thanks for your inquiry (#{ticket.title})!',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
disable_notification: true,
|
||||||
|
active: true,
|
||||||
|
created_by_id: 1,
|
||||||
|
updated_by_id: 1,
|
||||||
|
)
|
||||||
|
|
||||||
|
# ticket #1
|
||||||
|
ticket1 = Ticket.create(
|
||||||
|
title: 'test auto reply 1',
|
||||||
|
group: Group.lookup(name: 'Users'),
|
||||||
|
customer_id: customer1.id,
|
||||||
|
state: Ticket::State.lookup(name: 'new'),
|
||||||
|
priority: Ticket::Priority.lookup(name: '2 normal'),
|
||||||
|
updated_by_id: 1,
|
||||||
|
created_by_id: 1,
|
||||||
|
)
|
||||||
|
assert(ticket1, 'ticket1 created')
|
||||||
|
|
||||||
|
assert_equal('test auto reply 1', ticket1.title, 'ticket1.title verify')
|
||||||
|
assert_equal('Users', ticket1.group.name, 'ticket1.group verify')
|
||||||
|
assert_equal('new', ticket1.state.name, 'ticket1.state verify')
|
||||||
|
assert_equal(0, ticket1.articles.count, 'ticket1.articles verify')
|
||||||
|
|
||||||
|
Observer::Transaction.commit
|
||||||
|
|
||||||
|
ticket1 = Ticket.lookup(id: ticket1.id)
|
||||||
|
assert_equal('test auto reply 1', ticket1.title, 'ticket1.title verify')
|
||||||
|
assert_equal('Users', ticket1.group.name, 'ticket1.group verify')
|
||||||
|
assert_equal('new', ticket1.state.name, 'ticket1.state verify')
|
||||||
|
assert_equal(0, ticket1.articles.count, 'ticket1.articles verify')
|
||||||
|
|
||||||
|
ticket1.priority = Ticket::Priority.lookup(name: '2 normal')
|
||||||
|
ticket1.save
|
||||||
|
|
||||||
|
Observer::Transaction.commit
|
||||||
|
|
||||||
|
assert_equal('test auto reply 1', ticket1.title, 'ticket1.title verify')
|
||||||
|
assert_equal('Users', ticket1.group.name, 'ticket1.group verify')
|
||||||
|
assert_equal('new', ticket1.state.name, 'ticket1.state verify')
|
||||||
|
assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify')
|
||||||
|
assert_equal(0, ticket1.articles.count, 'ticket1.articles verify')
|
||||||
|
|
||||||
|
# ticket #2
|
||||||
|
ticket2 = Ticket.create(
|
||||||
|
title: 'test auto reply 2',
|
||||||
|
group: Group.lookup(name: 'Users'),
|
||||||
|
customer_id: customer2.id,
|
||||||
|
state: Ticket::State.lookup(name: 'new'),
|
||||||
|
priority: Ticket::Priority.lookup(name: '2 normal'),
|
||||||
|
updated_by_id: 1,
|
||||||
|
created_by_id: 1,
|
||||||
|
)
|
||||||
|
assert(ticket2, 'ticket2 created')
|
||||||
|
|
||||||
|
assert_equal('test auto reply 2', ticket2.title, 'ticket2.title verify')
|
||||||
|
assert_equal('Users', ticket2.group.name, 'ticket2.group verify')
|
||||||
|
assert_equal('new', ticket2.state.name, 'ticket2.state verify')
|
||||||
|
assert_equal(0, ticket2.articles.count, 'ticket2.articles verify')
|
||||||
|
|
||||||
|
Observer::Transaction.commit
|
||||||
|
|
||||||
|
ticket2 = Ticket.lookup(id: ticket2.id)
|
||||||
|
assert_equal('test auto reply 2', ticket2.title, 'ticket2.title verify')
|
||||||
|
assert_equal('Users', ticket2.group.name, 'ticket2.group verify')
|
||||||
|
assert_equal('new', ticket2.state.name, 'ticket2.state verify')
|
||||||
|
assert_equal(1, ticket2.articles.count, 'ticket2.articles verify')
|
||||||
|
article1 = ticket2.articles.last
|
||||||
|
assert_match('Thanks for your inquiry (test auto reply 2)!', article1.subject)
|
||||||
|
assert_equal('text/html', article1.content_type)
|
||||||
|
|
||||||
|
ticket2.priority = Ticket::Priority.lookup(name: '2 normal')
|
||||||
|
ticket2.save
|
||||||
|
|
||||||
|
Observer::Transaction.commit
|
||||||
|
|
||||||
|
assert_equal('test auto reply 2', ticket2.title, 'ticket2.title verify')
|
||||||
|
assert_equal('Users', ticket2.group.name, 'ticket2.group verify')
|
||||||
|
assert_equal('new', ticket2.state.name, 'ticket2.state verify')
|
||||||
|
assert_equal('2 normal', ticket2.priority.name, 'ticket2.priority verify')
|
||||||
|
assert_equal(1, ticket2.articles.count, 'ticket2.articles verify')
|
||||||
|
|
||||||
|
# process mail without Precedence header
|
||||||
|
content = IO.binread('test/fixtures/ticket_trigger/mail1.box')
|
||||||
|
ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, content)
|
||||||
|
|
||||||
|
assert_equal('new', ticket_p.state.name)
|
||||||
|
assert_equal(2, ticket_p.articles.count)
|
||||||
|
|
||||||
|
# process mail with Precedence header (no auto response)
|
||||||
|
content = IO.binread('test/fixtures/ticket_trigger/mail2.box')
|
||||||
|
ticket_p, article_p, user_p, mail = Channel::EmailParser.new.process({}, content)
|
||||||
|
|
||||||
|
assert_equal('new', ticket_p.state.name)
|
||||||
|
assert_equal(1, ticket_p.articles.count)
|
||||||
|
|
||||||
|
Trigger.destroy_all
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue