Permalink
Browse files

refactor observers. Added BaseObserver with helper methods

  • Loading branch information...
1 parent 6abf584 commit ce0945efcd36cc89d1b633500e4bdecf373fc304 @dzaporozhets dzaporozhets committed Mar 26, 2013
@@ -0,0 +1,11 @@
+class BaseObserver < ActiveRecord::Observer
+ protected
+
+ def notification
+ NotificationService.new
+ end
+
+ def log_info message
+ Gitlab::AppLogger.info message
+ end
+end
@@ -1,4 +1,4 @@
-class IssueObserver < ActiveRecord::Observer
+class IssueObserver < BaseObserver
cattr_accessor :current_user
def after_create(issue)
@@ -27,8 +27,4 @@ def after_update(issue)
def create_note(issue)
Note.create_status_change_note(issue, current_user, issue.state)
end
-
- def notification
- NotificationService.new
- end
end
@@ -1,15 +1,12 @@
-class KeyObserver < ActiveRecord::Observer
- include Gitlab::ShellAdapter
-
+class KeyObserver < BaseObserver
def after_save(key)
GitlabShellWorker.perform_async(
:add_key,
key.shell_id,
key.key
)
- # Notify about ssh key being added
- NotificationService.new.new_key(key)
+ notification.new_key(key)
end
def after_destroy(key)
@@ -1,4 +1,4 @@
-class MergeRequestObserver < ActiveRecord::Observer
+class MergeRequestObserver < BaseObserver
cattr_accessor :current_user
def after_create(merge_request)
@@ -16,10 +16,4 @@ def after_reopen(merge_request, transition)
def after_update(merge_request)
notification.reassigned_merge_request(merge_request) if merge_request.is_being_reassigned?
end
-
- protected
-
- def notification
- NotificationService.new
- end
end
@@ -1,11 +1,5 @@
-class NoteObserver < ActiveRecord::Observer
+class NoteObserver < BaseObserver
def after_create(note)
notification.new_note(note)
end
-
- protected
-
- def notification
- NotificationService.new
- end
end
@@ -1,4 +1,4 @@
-class ProjectObserver < ActiveRecord::Observer
+class ProjectObserver < BaseObserver
def after_create(project)
GitlabShellWorker.perform_async(
:add_repository,
@@ -27,10 +27,4 @@ def after_destroy(project)
log_info("Project \"#{project.name}\" was removed")
end
-
- protected
-
- def log_info message
- Gitlab::AppLogger.info message
- end
end
@@ -1,4 +1,4 @@
-class SystemHookObserver < ActiveRecord::Observer
+class SystemHookObserver < BaseObserver
observe :user, :project, :users_project
def after_create(model)
@@ -1,4 +1,4 @@
-class UserObserver < ActiveRecord::Observer
+class UserObserver < BaseObserver
def after_create(user)
log_info("User \"#{user.name}\" (#{user.email}) was created")
@@ -18,14 +18,4 @@ def after_save user
end
end
end
-
- protected
-
- def log_info message
- Gitlab::AppLogger.info message
- end
-
- def notification
- NotificationService.new
- end
end
@@ -1,7 +1,6 @@
-class UsersProjectObserver < ActiveRecord::Observer
+class UsersProjectObserver < BaseObserver
def after_commit(users_project)
return if users_project.destroyed?
- Notify.delay.project_access_granted_email(users_project.id)
end
def after_create(users_project)
@@ -10,6 +9,12 @@ def after_create(users_project)
action: Event::JOINED,
author_id: users_project.user.id
)
+
+ notification.new_team_member(users_project)
+ end
+
+ def after_update(users_project)
+ notification.update_team_member(users_project)
end
def after_destroy(users_project)

0 comments on commit ce0945e

Please sign in to comment.