2018-11-18 11:00:15 +05:30
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
module MergeRequests
|
|
|
|
class CreateFromIssueService < MergeRequests::CreateService
|
2021-06-08 01:23:25 +05:30
|
|
|
# TODO: This constructor does not use the "params:" argument from the superclass,
|
|
|
|
# but instead has a custom "mr_params:" argument. This is because historically,
|
|
|
|
# prior to named arguments being introduced to the constructor, it never passed
|
|
|
|
# along the third positional argument when calling `super`.
|
|
|
|
# This should be changed, in order to be consistent (all subclasses should pass
|
|
|
|
# along all of the arguments to the superclass, otherwise it is probably not an
|
|
|
|
# "is a" relationship). However, we need to be sure that passing the params
|
|
|
|
# argument to `super` (especially target_project_id) will not cause any unexpected
|
|
|
|
# behavior in the superclass. Since the addition of the named arguments is
|
|
|
|
# intended to be a low-risk pure refactor, we will defer this fix
|
|
|
|
# to this follow-on issue:
|
|
|
|
# https://gitlab.com/gitlab-org/gitlab/-/issues/328726
|
|
|
|
def initialize(project:, current_user:, mr_params: {})
|
2018-03-17 18:26:18 +05:30
|
|
|
# branch - the name of new branch
|
|
|
|
# ref - the source of new branch.
|
|
|
|
|
2021-06-08 01:23:25 +05:30
|
|
|
@branch_name = mr_params[:branch_name]
|
|
|
|
@issue_iid = mr_params[:issue_iid]
|
|
|
|
@ref = mr_params[:ref]
|
|
|
|
@target_project_id = mr_params[:target_project_id]
|
2018-03-17 18:26:18 +05:30
|
|
|
|
2021-06-08 01:23:25 +05:30
|
|
|
super(project: project, current_user: current_user)
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
def execute
|
2019-09-30 21:07:59 +05:30
|
|
|
return error('Project not found') if target_project.blank?
|
|
|
|
return error('Not allowed to create merge request') unless can_create_merge_request?
|
2018-03-17 18:26:18 +05:30
|
|
|
return error('Invalid issue iid') unless @issue_iid.present? && issue.present?
|
|
|
|
|
2020-01-01 13:55:28 +05:30
|
|
|
result = ::Branches::CreateService.new(target_project, current_user).execute(branch_name, ref)
|
2017-08-17 22:00:37 +05:30
|
|
|
return result if result[:status] == :error
|
|
|
|
|
|
|
|
new_merge_request = create(merge_request)
|
|
|
|
|
|
|
|
if new_merge_request.valid?
|
2021-03-11 19:13:27 +05:30
|
|
|
merge_request_activity_counter.track_mr_create_from_issue(user: current_user)
|
2019-02-15 15:39:39 +05:30
|
|
|
SystemNoteService.new_merge_request(issue, project, current_user, new_merge_request)
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
success(new_merge_request)
|
|
|
|
else
|
2019-09-30 21:07:59 +05:30
|
|
|
SystemNoteService.new_issue_branch(issue, project, current_user, branch_name, branch_project: target_project)
|
2019-02-15 15:39:39 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
error(new_merge_request.errors)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
private
|
|
|
|
|
2019-09-30 21:07:59 +05:30
|
|
|
def can_create_merge_request?
|
|
|
|
can?(current_user, :create_merge_request_from, target_project)
|
|
|
|
end
|
|
|
|
|
2018-12-05 23:21:45 +05:30
|
|
|
# rubocop: disable CodeReuse/ActiveRecord
|
2017-08-17 22:00:37 +05:30
|
|
|
def issue
|
2018-03-17 18:26:18 +05:30
|
|
|
@issue ||= IssuesFinder.new(current_user, project_id: project.id).find_by(iid: @issue_iid)
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
2018-12-05 23:21:45 +05:30
|
|
|
# rubocop: enable CodeReuse/ActiveRecord
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
def branch_name
|
2018-03-17 18:26:18 +05:30
|
|
|
@branch ||= @branch_name || issue.to_branch_name
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
def ref
|
2019-12-04 20:38:33 +05:30
|
|
|
if valid_ref?
|
|
|
|
@ref
|
|
|
|
else
|
|
|
|
default_branch
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def valid_ref?
|
|
|
|
ref_is_branch? || ref_is_tag?
|
|
|
|
end
|
|
|
|
|
|
|
|
def ref_is_branch?
|
|
|
|
target_project.repository.branch_exists?(@ref)
|
|
|
|
end
|
2018-11-08 19:23:39 +05:30
|
|
|
|
2019-12-04 20:38:33 +05:30
|
|
|
def ref_is_tag?
|
|
|
|
target_project.repository.tag_exists?(@ref)
|
|
|
|
end
|
|
|
|
|
|
|
|
def default_branch
|
2021-06-08 01:23:25 +05:30
|
|
|
target_project.default_branch_or_main
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
def merge_request
|
2021-06-08 01:23:25 +05:30
|
|
|
MergeRequests::BuildService.new(project: target_project, current_user: current_user, params: merge_request_params).execute
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
def merge_request_params
|
|
|
|
{
|
2018-03-17 18:26:18 +05:30
|
|
|
issue_iid: @issue_iid,
|
2019-09-30 21:07:59 +05:30
|
|
|
source_project_id: target_project.id,
|
2017-08-17 22:00:37 +05:30
|
|
|
source_branch: branch_name,
|
2019-09-30 21:07:59 +05:30
|
|
|
target_project_id: target_project.id,
|
2021-03-08 18:12:59 +05:30
|
|
|
target_branch: target_branch,
|
|
|
|
assignee_ids: [current_user.id]
|
2017-08-17 22:00:37 +05:30
|
|
|
}
|
|
|
|
end
|
|
|
|
|
2019-12-04 20:38:33 +05:30
|
|
|
def target_branch
|
|
|
|
if ref_is_branch?
|
|
|
|
@ref
|
|
|
|
else
|
|
|
|
default_branch
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
def success(merge_request)
|
|
|
|
super().merge(merge_request: merge_request)
|
|
|
|
end
|
2019-09-30 21:07:59 +05:30
|
|
|
|
|
|
|
def target_project
|
|
|
|
@target_project ||=
|
|
|
|
if @target_project_id.present?
|
|
|
|
project.forks.find_by_id(@target_project_id)
|
|
|
|
else
|
|
|
|
project
|
|
|
|
end
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
end
|