Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
b1334ed9
Commit
b1334ed9
authored
Jul 20, 2017
by
http://jneen.net/
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move the builders to classes with a #build
parent
cce1bc9a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
257 additions
and
219 deletions
+257
-219
app/services/notification_recipient_service.rb
app/services/notification_recipient_service.rb
+257
-219
No files found.
app/services/notification_recipient_service.rb
View file @
b1334ed9
...
@@ -20,106 +20,16 @@ class NotificationRecipientService
...
@@ -20,106 +20,16 @@ class NotificationRecipientService
@project
=
project
@project
=
project
end
end
def
build_recipients
(
target
,
current_user
,
action
:,
previous_assignee:
nil
,
skip_current_user:
true
)
module
Builder
custom_action
=
build_custom_key
(
action
,
target
)
recipients
=
participants
(
target
,
current_user
)
class
Base
recipients
=
add_project_watchers
(
recipients
)
attr_reader
:project
recipients
=
add_custom_notifications
(
recipients
,
custom_action
)
def
initialize
(
project
)
recipients
=
reject_mention_users
(
recipients
)
@project
=
project
# Re-assign is considered as a mention of the new assignee so we add the
# new assignee to the list of recipients after we rejected users with
# the "on mention" notification level
case
custom_action
when
:reassign_merge_request
recipients
<<
previous_assignee
if
previous_assignee
recipients
<<
target
.
assignee
when
:reassign_issue
previous_assignees
=
Array
(
previous_assignee
)
recipients
.
concat
(
previous_assignees
)
recipients
.
concat
(
target
.
assignees
)
end
recipients
=
reject_muted_users
(
recipients
)
recipients
=
add_subscribed_users
(
recipients
,
target
)
if
[
:new_issue
,
:new_merge_request
].
include?
(
custom_action
)
recipients
=
add_labels_subscribers
(
recipients
,
target
)
end
recipients
=
reject_unsubscribed_users
(
recipients
,
target
)
recipients
=
reject_users_without_access
(
recipients
,
target
)
recipients
.
delete
(
current_user
)
if
skip_current_user
&&
!
current_user
.
notified_of_own_activity?
recipients
.
uniq
end
def
build_pipeline_recipients
(
target
,
current_user
,
action
:)
return
[]
unless
current_user
custom_action
=
case
action
.
to_s
when
'failed'
:failed_pipeline
when
'success'
:success_pipeline
end
notification_setting
=
NotificationRecipientService
.
notification_setting_for_user_project
(
current_user
,
target
.
project
)
return
[]
if
notification_setting
.
mention?
||
notification_setting
.
disabled?
return
[]
if
notification_setting
.
custom?
&&
!
notification_setting
.
event_enabled?
(
custom_action
)
return
[]
if
(
notification_setting
.
watch?
||
notification_setting
.
participating?
)
&&
NotificationSetting
::
EXCLUDED_WATCHER_EVENTS
.
include?
(
custom_action
)
reject_users_without_access
([
current_user
],
target
)
end
def
build_relabeled_recipients
(
target
,
current_user
,
labels
:)
recipients
=
add_labels_subscribers
([],
target
,
labels:
labels
)
recipients
=
reject_unsubscribed_users
(
recipients
,
target
)
recipients
=
reject_users_without_access
(
recipients
,
target
)
recipients
.
delete
(
current_user
)
unless
current_user
.
notified_of_own_activity?
recipients
.
uniq
end
def
build_new_note_recipients
(
note
)
target
=
note
.
noteable
ability
,
subject
=
if
note
.
for_personal_snippet?
[
:read_personal_snippet
,
note
.
noteable
]
else
[
:read_project
,
note
.
project
]
end
mentioned_users
=
note
.
mentioned_users
.
select
{
|
user
|
user
.
can?
(
ability
,
subject
)
}
# Add all users participating in the thread (author, assignee, comment authors)
recipients
=
participants
(
target
,
note
.
author
)
||
mentioned_users
unless
note
.
for_personal_snippet?
# Merge project watchers
recipients
=
add_project_watchers
(
recipients
)
# Merge project with custom notification
recipients
=
add_custom_notifications
(
recipients
,
:new_note
)
end
end
# Reject users with Mention notification level, except those mentioned in _this_ note.
def
build
(
*
)
recipients
=
reject_mention_users
(
recipients
-
mentioned_users
)
raise
'abstract'
recipients
=
recipients
+
mentioned_users
recipients
=
reject_muted_users
(
recipients
)
recipients
=
add_subscribed_users
(
recipients
,
note
.
noteable
)
recipients
=
reject_unsubscribed_users
(
recipients
,
note
.
noteable
)
recipients
=
reject_users_without_access
(
recipients
,
note
.
noteable
)
recipients
.
delete
(
note
.
author
)
unless
note
.
author
.
notified_of_own_activity?
recipients
.
uniq
end
end
# Remove users with disabled notifications from array
# Remove users with disabled notifications from array
...
@@ -313,4 +223,132 @@ class NotificationRecipientService
...
@@ -313,4 +223,132 @@ 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
end
class
Default
<
Base
def
build
(
target
,
current_user
,
action
:,
previous_assignee:
nil
,
skip_current_user:
true
)
custom_action
=
build_custom_key
(
action
,
target
)
recipients
=
participants
(
target
,
current_user
)
recipients
=
add_project_watchers
(
recipients
)
recipients
=
add_custom_notifications
(
recipients
,
custom_action
)
recipients
=
reject_mention_users
(
recipients
)
# Re-assign is considered as a mention of the new assignee so we add the
# new assignee to the list of recipients after we rejected users with
# the "on mention" notification level
case
custom_action
when
:reassign_merge_request
recipients
<<
previous_assignee
if
previous_assignee
recipients
<<
target
.
assignee
when
:reassign_issue
previous_assignees
=
Array
(
previous_assignee
)
recipients
.
concat
(
previous_assignees
)
recipients
.
concat
(
target
.
assignees
)
end
recipients
=
reject_muted_users
(
recipients
)
recipients
=
add_subscribed_users
(
recipients
,
target
)
if
[
:new_issue
,
:new_merge_request
].
include?
(
custom_action
)
recipients
=
add_labels_subscribers
(
recipients
,
target
)
end
recipients
=
reject_unsubscribed_users
(
recipients
,
target
)
recipients
=
reject_users_without_access
(
recipients
,
target
)
recipients
.
delete
(
current_user
)
if
skip_current_user
&&
!
current_user
.
notified_of_own_activity?
recipients
.
uniq
end
end
class
Pipeline
<
Base
def
build
(
target
,
current_user
,
action
:)
return
[]
unless
current_user
custom_action
=
case
action
.
to_s
when
'failed'
:failed_pipeline
when
'success'
:success_pipeline
end
notification_setting
=
NotificationRecipientService
.
notification_setting_for_user_project
(
current_user
,
target
.
project
)
return
[]
if
notification_setting
.
mention?
||
notification_setting
.
disabled?
return
[]
if
notification_setting
.
custom?
&&
!
notification_setting
.
event_enabled?
(
custom_action
)
return
[]
if
(
notification_setting
.
watch?
||
notification_setting
.
participating?
)
&&
NotificationSetting
::
EXCLUDED_WATCHER_EVENTS
.
include?
(
custom_action
)
reject_users_without_access
([
current_user
],
target
)
end
end
class
Relabeled
<
Base
def
build
(
target
,
current_user
,
labels
:)
recipients
=
add_labels_subscribers
([],
target
,
labels:
labels
)
recipients
=
reject_unsubscribed_users
(
recipients
,
target
)
recipients
=
reject_users_without_access
(
recipients
,
target
)
recipients
.
delete
(
current_user
)
unless
current_user
.
notified_of_own_activity?
recipients
.
uniq
end
end
class
NewNote
<
Base
def
build
(
note
)
target
=
note
.
noteable
ability
,
subject
=
if
note
.
for_personal_snippet?
[
:read_personal_snippet
,
note
.
noteable
]
else
[
:read_project
,
note
.
project
]
end
mentioned_users
=
note
.
mentioned_users
.
select
{
|
user
|
user
.
can?
(
ability
,
subject
)
}
# Add all users participating in the thread (author, assignee, comment authors)
recipients
=
participants
(
target
,
note
.
author
)
||
mentioned_users
unless
note
.
for_personal_snippet?
# Merge project watchers
recipients
=
add_project_watchers
(
recipients
)
# Merge project with custom notification
recipients
=
add_custom_notifications
(
recipients
,
:new_note
)
end
# Reject users with Mention notification level, except those mentioned in _this_ note.
recipients
=
reject_mention_users
(
recipients
-
mentioned_users
)
recipients
=
recipients
+
mentioned_users
recipients
=
reject_muted_users
(
recipients
)
recipients
=
add_subscribed_users
(
recipients
,
note
.
noteable
)
recipients
=
reject_unsubscribed_users
(
recipients
,
note
.
noteable
)
recipients
=
reject_users_without_access
(
recipients
,
note
.
noteable
)
recipients
.
delete
(
note
.
author
)
unless
note
.
author
.
notified_of_own_activity?
recipients
.
uniq
end
end
end
def
build_recipients
(
*
a
)
Builder
::
Default
.
new
(
@project
).
build
(
*
a
)
end
def
build_pipeline_recipients
(
*
a
)
Builder
::
Pipeline
.
new
(
@project
).
build
(
*
a
)
end
def
build_relabeled_recipients
(
*
a
)
Builder
::
Relabeled
.
new
(
@project
).
build
(
*
a
)
end
def
build_new_note_recipients
(
note
)
Builder
::
NewNote
.
new
(
@project
).
build
(
note
)
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment