Use NotificationService for observers pt1
This commit is contained in:
parent
f7e630c452
commit
448152ab94
|
@ -2,41 +2,33 @@ class IssueObserver < ActiveRecord::Observer
|
|||
cattr_accessor :current_user
|
||||
|
||||
def after_create(issue)
|
||||
if issue.assignee && issue.assignee != current_user
|
||||
Notify.delay.new_issue_email(issue.id)
|
||||
end
|
||||
notification.new_issue(issue, current_user)
|
||||
end
|
||||
|
||||
def after_close(issue, transition)
|
||||
send_reassigned_email(issue) if issue.is_being_reassigned?
|
||||
notification.close_issue(issue, current_user)
|
||||
|
||||
create_note(issue)
|
||||
end
|
||||
|
||||
def after_reopen(issue, transition)
|
||||
send_reassigned_email(issue) if issue.is_being_reassigned?
|
||||
|
||||
create_note(issue)
|
||||
end
|
||||
|
||||
def after_update(issue)
|
||||
send_reassigned_email(issue) if issue.is_being_reassigned?
|
||||
if issue.is_being_reassigned?
|
||||
notification.reassigned_issue(issue, current_user)
|
||||
end
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
# Create issue note with service comment like 'Status changed to closed'
|
||||
def create_note(issue)
|
||||
Note.create_status_change_note(issue, current_user, issue.state)
|
||||
[issue.author, issue.assignee].compact.uniq.each do |recipient|
|
||||
Notify.delay.issue_status_changed_email(recipient.id, issue.id, issue.state, current_user.id)
|
||||
end
|
||||
end
|
||||
|
||||
def send_reassigned_email(issue)
|
||||
recipient_ids = [issue.assignee_id, issue.assignee_id_was].keep_if {|id| id && id != current_user.id }
|
||||
|
||||
recipient_ids.each do |recipient_id|
|
||||
Notify.delay.reassigned_issue_email(recipient_id, issue.id, issue.assignee_id_was)
|
||||
end
|
||||
def notification
|
||||
NotificationService.new
|
||||
end
|
||||
end
|
||||
|
|
|
@ -9,7 +9,7 @@ class KeyObserver < ActiveRecord::Observer
|
|||
)
|
||||
|
||||
# Notify about ssh key being added
|
||||
Notify.delay.new_ssh_key_email(key.id) if key.user
|
||||
NotificationService.new.new_key(key)
|
||||
end
|
||||
|
||||
def after_destroy(key)
|
||||
|
|
|
@ -35,4 +35,8 @@ class NoteObserver < ActiveRecord::Observer
|
|||
def team_without_note_author(note)
|
||||
note.project.users.reject { |u| u.id == note.author.id }
|
||||
end
|
||||
|
||||
def notification
|
||||
NotificationService.new
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue