Commit b188e1b9 authored by http://jneen.net/'s avatar http://jneen.net/

move notification_setting_for_user_project to a public class method

parent 80647364
...@@ -4,6 +4,18 @@ ...@@ -4,6 +4,18 @@
class NotificationRecipientService class NotificationRecipientService
attr_reader :project attr_reader :project
def self.notification_setting_for_user_project(user, project)
project_setting = user.notification_settings_for(project)
return project_setting unless project_setting.global?
group_setting = user.notification_settings_for(project.group)
return group_setting unless group_setting.global?
user.global_notification_setting
end
def initialize(project) def initialize(project)
@project = project @project = project
end end
...@@ -55,7 +67,7 @@ class NotificationRecipientService ...@@ -55,7 +67,7 @@ class NotificationRecipientService
:success_pipeline :success_pipeline
end end
notification_setting = notification_setting_for_user_project(current_user, target.project) notification_setting = NotificationRecipientService.notification_setting_for_user_project(current_user, target.project)
return [] if notification_setting.mention? || notification_setting.disabled? return [] if notification_setting.mention? || notification_setting.disabled?
...@@ -317,16 +329,4 @@ class NotificationRecipientService ...@@ -317,16 +329,4 @@ class NotificationRecipientService
def build_custom_key(action, object) def build_custom_key(action, object)
"#{action}_#{object.class.model_name.name.underscore}".to_sym "#{action}_#{object.class.model_name.name.underscore}".to_sym
end end
def notification_setting_for_user_project(user, project)
project_setting = user.notification_settings_for(project)
return project_setting unless project_setting.global?
group_setting = user.notification_settings_for(project.group)
return group_setting unless group_setting.global?
user.global_notification_setting
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment