b5042e5301
The NotificationService has to do quite a lot of work to calculate the
recipients for an email. Where possible, we should try to avoid doing this in an
HTTP request, because the mail are sent by Sidekiq anyway, so there's no need to
schedule those emails immediately.
This commit creates a generic Sidekiq worker that uses Global ID to serialise
and deserialise its arguments, then forwards them to the NotificationService.
The NotificationService gains an `#async` method, so you can replace:
notification_service.new_issue(issue, current_user)
With:
notification_service.async.new_issue(issue, current_user)
And have everything else work as normal, except that calculating the recipients
will be done by Sidekiq, which will then schedule further Sidekiq jobs to send
each email.
34 lines
1.1 KiB
Ruby
34 lines
1.1 KiB
Ruby
module MergeRequests
|
|
class CloseService < MergeRequests::BaseService
|
|
def execute(merge_request, commit = nil)
|
|
return merge_request unless can?(current_user, :update_merge_request, merge_request)
|
|
|
|
# If we close MergeRequest we want to ignore validation
|
|
# so we can close broken one (Ex. fork project removed)
|
|
merge_request.allow_broken = true
|
|
|
|
if merge_request.close
|
|
create_event(merge_request)
|
|
create_note(merge_request)
|
|
notification_service.async.close_mr(merge_request, current_user)
|
|
todo_service.close_merge_request(merge_request, current_user)
|
|
execute_hooks(merge_request, 'close')
|
|
invalidate_cache_counts(merge_request, users: merge_request.assignees)
|
|
merge_request.update_project_counter_caches
|
|
end
|
|
|
|
merge_request
|
|
end
|
|
|
|
private
|
|
|
|
def create_event(merge_request)
|
|
# Making sure MergeRequest::Metrics updates are in sync with
|
|
# Event creation.
|
|
Event.transaction do
|
|
close_event = event_service.close_mr(merge_request, current_user)
|
|
merge_request_metrics_service(merge_request).close(close_event)
|
|
end
|
|
end
|
|
end
|
|
end
|