deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use notificationService for MR reassigned

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-26 17:23:28 +02:00
parent 38ffb8220c
commit f93c4dc0d8
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/observers/merge_request_observer.rb
View file

@ -6,29 +6,20 @@ class MergeRequestObserver < ActiveRecord::Observer
end end
def after_close(merge_request, transition) def after_close(merge_request, transition)
send_reassigned_email(merge_request) if merge_request.is_being_reassigned?
Note.create_status_change_note(merge_request, current_user, merge_request.state) Note.create_status_change_note(merge_request, current_user, merge_request.state)
end end
def after_reopen(merge_request, transition) def after_reopen(merge_request, transition)
send_reassigned_email(merge_request) if merge_request.is_being_reassigned?
Note.create_status_change_note(merge_request, current_user, merge_request.state) Note.create_status_change_note(merge_request, current_user, merge_request.state)
end end
def after_update(merge_request) def after_update(merge_request)
send_reassigned_email(merge_request) if merge_request.is_being_reassigned? notification.reassigned_merge_request(merge_request) if merge_request.is_being_reassigned?
end end
protected protected
def send_reassigned_email(merge_request) def notification
recipients_ids = merge_request.assignee_id_was, merge_request.assignee_id NotificationService.new
recipients_ids.delete current_user.id
recipients_ids.each do |recipient_id|
Notify.delay.reassigned_merge_request_email(recipient_id, merge_request.id, merge_request.assignee_id_was)
end
end end
end end

18
app/services/notification_service.rb
View file

@ -33,8 +33,8 @@ class NotificationService
# When we reassign an issue we should send next emails: # When we reassign an issue we should send next emails:
# #
# * issue author if his notification level is not Disabled # * issue old assignee if his notification level is not Disabled
# * issue assignee if his notification level is not Disabled # * issue new assignee if his notification level is not Disabled
# #
def reassigned_issue(issue, current_user) def reassigned_issue(issue, current_user)
recipient_ids = [issue.assignee_id, issue.assignee_id_was].compact.uniq recipient_ids = [issue.assignee_id, issue.assignee_id_was].compact.uniq
@ -66,4 +66,18 @@ class NotificationService
Notify.delay.new_merge_request_email(merge_request.id) Notify.delay.new_merge_request_email(merge_request.id)
end end
end end
# When we reassign a merge_request we should send next emails:
#
# * merge_request old assignee if his notification level is not Disabled
# * merge_request assignee if his notification level is not Disabled
#
def reassigned_merge_request(merge_request, current_user)
recipients_ids = merge_request.assignee_id_was, merge_request.assignee_id
recipients_ids.delete current_user.id
recipients_ids.each do |recipient_id|
Notify.delay.reassigned_merge_request_email(recipient_id, merge_request.id, merge_request.assignee_id_was)
end
end
end end