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.
112 lines
3.8 KiB
Ruby
112 lines
3.8 KiB
Ruby
module MergeRequests
|
|
class UpdateService < MergeRequests::BaseService
|
|
def execute(merge_request)
|
|
# We don't allow change of source/target projects and source branch
|
|
# after merge request was created
|
|
params.except!(:source_project_id)
|
|
params.except!(:target_project_id)
|
|
params.except!(:source_branch)
|
|
|
|
merge_from_quick_action(merge_request) if params[:merge]
|
|
|
|
if merge_request.closed_without_fork?
|
|
params.except!(:target_branch, :force_remove_source_branch)
|
|
end
|
|
|
|
if params[:force_remove_source_branch].present?
|
|
merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch)
|
|
end
|
|
|
|
handle_wip_event(merge_request)
|
|
update(merge_request)
|
|
end
|
|
|
|
# rubocop:disable Metrics/AbcSize
|
|
def handle_changes(merge_request, options)
|
|
old_associations = options.fetch(:old_associations, {})
|
|
old_labels = old_associations.fetch(:labels, [])
|
|
old_mentioned_users = old_associations.fetch(:mentioned_users, [])
|
|
|
|
if has_changes?(merge_request, old_labels: old_labels)
|
|
todo_service.mark_pending_todos_as_done(merge_request, current_user)
|
|
end
|
|
|
|
if merge_request.previous_changes.include?('title') ||
|
|
merge_request.previous_changes.include?('description')
|
|
todo_service.update_merge_request(merge_request, current_user, old_mentioned_users)
|
|
end
|
|
|
|
if merge_request.previous_changes.include?('target_branch')
|
|
create_branch_change_note(merge_request, 'target',
|
|
merge_request.previous_changes['target_branch'].first,
|
|
merge_request.target_branch)
|
|
end
|
|
|
|
if merge_request.previous_changes.include?('assignee_id')
|
|
old_assignee_id = merge_request.previous_changes['assignee_id'].first
|
|
old_assignee = User.find(old_assignee_id) if old_assignee_id
|
|
|
|
create_assignee_note(merge_request)
|
|
notification_service.async.reassigned_merge_request(merge_request, current_user, old_assignee)
|
|
todo_service.reassigned_merge_request(merge_request, current_user)
|
|
end
|
|
|
|
if merge_request.previous_changes.include?('target_branch') ||
|
|
merge_request.previous_changes.include?('source_branch')
|
|
merge_request.mark_as_unchecked
|
|
end
|
|
|
|
added_labels = merge_request.labels - old_labels
|
|
if added_labels.present?
|
|
notification_service.async.relabeled_merge_request(
|
|
merge_request,
|
|
added_labels,
|
|
current_user
|
|
)
|
|
end
|
|
|
|
added_mentions = merge_request.mentioned_users - old_mentioned_users
|
|
if added_mentions.present?
|
|
notification_service.async.new_mentions_in_merge_request(
|
|
merge_request,
|
|
added_mentions,
|
|
current_user
|
|
)
|
|
end
|
|
end
|
|
# rubocop:enable Metrics/AbcSize
|
|
|
|
def merge_from_quick_action(merge_request)
|
|
last_diff_sha = params.delete(:merge)
|
|
return unless merge_request.mergeable_with_quick_action?(current_user, last_diff_sha: last_diff_sha)
|
|
|
|
merge_request.update(merge_error: nil)
|
|
|
|
if merge_request.head_pipeline && merge_request.head_pipeline.active?
|
|
MergeRequests::MergeWhenPipelineSucceedsService.new(project, current_user).execute(merge_request)
|
|
else
|
|
merge_request.merge_async(current_user.id, {})
|
|
end
|
|
end
|
|
|
|
def reopen_service
|
|
MergeRequests::ReopenService
|
|
end
|
|
|
|
def close_service
|
|
MergeRequests::CloseService
|
|
end
|
|
|
|
def after_update(issuable)
|
|
issuable.cache_merge_request_closes_issues!(current_user)
|
|
end
|
|
|
|
private
|
|
|
|
def create_branch_change_note(issuable, branch_type, old_branch, new_branch)
|
|
SystemNoteService.change_branch(
|
|
issuable, issuable.project, current_user, branch_type,
|
|
old_branch, new_branch)
|
|
end
|
|
end
|
|
end
|