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

Refine email followup search logic (fixes #2038)

Browse source
This commit is contained in:
Ryan Lue 2018-06-19 12:41:18 +08:00
parent 2da68fa177
commit adda2dfa5e
4 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/channel/filter/follow_up_check.rb
View file

@ -18,7 +18,7 @@ module Channel::Filter::FollowUpCheck
# get ticket# from body
if setting.include?('body')
ticket = Ticket::Number.check(mail[:body])
ticket = Ticket::Number.check(mail[:body].html2text)
if ticket
Rails.logger.debug { "Follow up for '##{ticket.number}' in body." }
mail['x-zammad-ticket-id'.to_sym] = ticket.id
@ -30,7 +30,7 @@ module Channel::Filter::FollowUpCheck
if setting.include?('attachment') && mail[:attachments]
mail[:attachments].each do |attachment|
next if !attachment[:data]
ticket = Ticket::Number.check(attachment[:data])
ticket = Ticket::Number.check(attachment[:data].html2text)
next if !ticket
Rails.logger.debug { "Follow up for '##{ticket.number}' in attachment." }
mail['x-zammad-ticket-id'.to_sym] = ticket.id

4
app/models/ticket/number/date.rb
View file

@ -86,12 +86,12 @@ module Ticket::Number::Date
end
# probe format
string.scan(/#{Regexp.quote(ticket_hook)}#{Regexp.quote(ticket_hook_divider)}(\d{4,10}#{system_id}\d{2,40})/i) do
string.scan(/\b#{Regexp.quote(ticket_hook)}#{Regexp.quote(ticket_hook_divider)}(\d{4,10}#{system_id}\d{2,40})\b/i) do
ticket = Ticket.find_by(number: $1)
break if ticket
end
if !ticket
string.scan(/#{Regexp.quote(ticket_hook)}\s{0,2}(\d{4,10}#{system_id}\d{2,40})/i) do
string.scan(/\b#{Regexp.quote(ticket_hook)}\s{0,2}(\d{4,10}#{system_id}\d{2,40})\b/i) do
ticket = Ticket.find_by(number: $1)
break if ticket
end

4
app/models/ticket/number/increment.rb
View file

@ -83,12 +83,12 @@ module Ticket::Number::Increment
end
# probe format
string.scan(/#{Regexp.quote(ticket_hook)}#{Regexp.quote(ticket_hook_divider)}(#{system_id}\d{2,48})/i) do
string.scan(/\b#{Regexp.quote(ticket_hook)}#{Regexp.quote(ticket_hook_divider)}(#{system_id}\d{2,48})\b/i) do
ticket = Ticket.find_by(number: $1)
break if ticket
end
if !ticket
string.scan(/#{Regexp.quote(ticket_hook)}\s{0,2}(#{system_id}\d{2,48})/i) do
string.scan(/\b#{Regexp.quote(ticket_hook)}\s{0,2}(#{system_id}\d{2,48})\b/i) do
ticket = Ticket.find_by(number: $1)
break if ticket
end

18
spec/models/channel/email_parser_spec.rb
View file

@ -28,6 +28,24 @@ RSpec.describe Channel::EmailParser, type: :model do
.to change { ticket.articles.length }
end
end
context 'as part of a larger word' do
let(:raw_mail) { File.read(mail_file).sub(/(?<=Hallo) =\n(?=Martin,<o:p>)/, test_string) }
it 'creates a separate ticket' do
expect { described_class.new.process({}, raw_mail) }
.not_to change { ticket.articles.length }
end
end
context 'in html attributes' do
let(:raw_mail) { File.read(mail_file).sub(%r{<a href.*?/a>}m, %(<table bgcolor="#{test_string}"> </table>)) }
it 'creates a separate ticket' do
expect { described_class.new.process({}, raw_mail) }
.not_to change { ticket.articles.length }
end
end
end
end
end