refactor observers. Added BaseObserver with helper methods

Dmitriy Zaporozhets
1 parent 6abf5846
Showing 9 changed files with 26 additions and 45 deletions Show diff stats
app/observers/base_observer.rb
app/observers/issue_observer.rb
app/observers/key_observer.rb
app/observers/merge_request_observer.rb
app/observers/note_observer.rb
app/observers/project_observer.rb
app/observers/system_hook_observer.rb
app/observers/user_observer.rb
app/observers/users_project_observer.rb
@@ -0,0 +1,11 @@
+class BaseObserver < ActiveRecord::Observer
+  protected
+
+  def notification
+    NotificationService.new
+  end
+
+  def log_info message
+    Gitlab::AppLogger.info message
+  end
+end
-class IssueObserver < ActiveRecord::Observer
+class IssueObserver < BaseObserver
   cattr_accessor :current_user
   def after_create(issue)
@@ -27,8 +27,4 @@ class IssueObserver &lt; ActiveRecord::Observer
   def create_note(issue)
     Note.create_status_change_note(issue, current_user, issue.state)
   end
-
-  def notification
-    NotificationService.new
-  end
 end
-class KeyObserver < ActiveRecord::Observer
-  include Gitlab::ShellAdapter
-
+class KeyObserver < BaseObserver
   def after_save(key)
     GitlabShellWorker.perform_async(
       :add_key,
@@ -8,8 +6,7 @@ class KeyObserver &lt; ActiveRecord::Observer
       key.key
     )
-    # Notify about ssh key being added
-    NotificationService.new.new_key(key)
+    notification.new_key(key)
   end
   def after_destroy(key)
-class MergeRequestObserver < ActiveRecord::Observer
+class MergeRequestObserver < BaseObserver
   cattr_accessor :current_user
   def after_create(merge_request)
@@ -16,10 +16,4 @@ class MergeRequestObserver &lt; ActiveRecord::Observer
   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
-class NoteObserver < ActiveRecord::Observer
+class NoteObserver < BaseObserver
   def after_create(note)
     notification.new_note(note)
   end
-
-  protected
-
-  def notification
-    NotificationService.new
-  end
 end
-class ProjectObserver < ActiveRecord::Observer
+class ProjectObserver < BaseObserver
   def after_create(project)
     GitlabShellWorker.perform_async(
       :add_repository,
@@ -27,10 +27,4 @@ class ProjectObserver &lt; ActiveRecord::Observer
     log_info("Project \"#{project.name}\" was removed")
   end
-
-  protected
-
-  def log_info message
-    Gitlab::AppLogger.info message
-  end
 end
-class SystemHookObserver < ActiveRecord::Observer
+class SystemHookObserver < BaseObserver
   observe :user, :project, :users_project
   def after_create(model)
-class UserObserver < ActiveRecord::Observer
+class UserObserver < BaseObserver
   def after_create(user)
     log_info("User \"#{user.name}\" (#{user.email}) was created")
@@ -18,14 +18,4 @@ class UserObserver &lt; ActiveRecord::Observer
       end
     end
   end
-
-  protected
-
-  def log_info message
-    Gitlab::AppLogger.info message
-  end
-
-  def notification
-    NotificationService.new
-  end
 end
-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 @@ class UsersProjectObserver &lt; ActiveRecord::Observer
       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,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class BaseObserver < ActiveRecord::Observer
	2	+ protected
	3	+
	4	+ def notification
	5	+ NotificationService.new
	6	+ end
	7	+
	8	+ def log_info message
	9	+ Gitlab::AppLogger.info message
	10	+ end
	11	+end
1	-class NoteObserver < ActiveRecord::Observer	1	+class NoteObserver < BaseObserver
2	def after_create(note)	2	def after_create(note)
3	notification.new_note(note)	3	notification.new_note(note)
4	end	4	end
5	-
6	- protected
7	-
8	- def notification
9	- NotificationService.new
10	- end
11	end	5	end
1	-class SystemHookObserver < ActiveRecord::Observer	1	+class SystemHookObserver < BaseObserver
2	observe :user, :project, :users_project	2	observe :user, :project, :users_project
3		3
4	def after_create(model)	4	def after_create(model)
1	-class UserObserver < ActiveRecord::Observer	1	+class UserObserver < BaseObserver
2	def after_create(user)	2	def after_create(user)
3	log_info("User \"#{user.name}\" (#{user.email}) was created")	3	log_info("User \"#{user.name}\" (#{user.email}) was created")
4		4
	@@ -18,14 +18,4 @@ class UserObserver < ActiveRecord::Observer		@@ -18,14 +18,4 @@ class UserObserver < ActiveRecord::Observer
18	end	18	end
19	end	19	end
20	end	20	end
21	-
22	- protected
23	-
24	- def log_info message
25	- Gitlab::AppLogger.info message
26	- end
27	-
28	- def notification
29	- NotificationService.new
30	- end
31	end	21	end