gitlab-org--gitlab-foss/app/services/merge_requests/build_service.rb
Rydkin Maxim 14326c88f7 refactor merge request build service
add changelog entry

replace local variables `merge_request` with instance ones

modify `MergeRequests::BuildService` to fix failed tests

extract `assign_target_project` method

remove unnecessary instance variables

remove exclamation marks and rewrite conditionals to improve readability

extract `params_does_not_contain_branches?` method, rename `unprepared_merge_request` method to `uncreatable_merge_request`

replace instance variables `merge_request` and `error_messages` with getters and setters; divide `set_title_and_description` method on two separate ones

refactor `execute` method

return `set_title_and_description` method

rename `branches_selected?` method to `branches_present?` to make it more different from `branches_specified?`

fixes after discussion

renamed method branches_valid?

fix space

return assigning methods into `execute` method

simplify `find_target_branch` and `find_source_project` methods

fix spec `merge request issuable record that supports slash commands in its description and notes`
2017-01-31 10:06:00 +03:00

134 lines
3.9 KiB
Ruby

module MergeRequests
class BuildService < MergeRequests::BaseService
def execute
self.merge_request = MergeRequest.new(params)
merge_request.can_be_created = true
merge_request.compare_commits = []
merge_request.source_project = find_source_project
merge_request.target_project = find_target_project
merge_request.target_branch = find_target_branch
if branches_specified? && branches_valid?
compare_branches
assign_title_and_description
else
merge_request.can_be_created = false
end
merge_request
end
private
attr_accessor :merge_request
delegate :target_branch, :source_branch, :source_project, :target_project, :compare_commits, :wip_title, :description, :errors, to: :merge_request
def find_source_project
source_project || project
end
def find_target_project
return target_project if target_project.present? && can?(current_user, :read_project, target_project)
project.forked_from_project || project
end
def find_target_branch
target_branch || target_project.default_branch
end
def branches_specified?
params[:source_branch] && params[:target_branch]
end
def branches_valid?
validate_branches
errors.blank?
end
def compare_branches
compare = CompareService.new.execute(
source_project,
source_branch,
target_project,
target_branch
)
merge_request.compare_commits = compare.commits
merge_request.compare = compare
end
def validate_branches
add_error('You must select source and target branch') unless branches_present?
add_error('You must select different branches') if same_source_and_target?
add_error("Source branch \"#{source_branch}\" does not exist") unless source_branch_exists?
add_error("Target branch \"#{target_branch}\" does not exist") unless target_branch_exists?
end
def add_error(message)
errors.add(:base, message)
end
def branches_present?
target_branch.present? && source_branch.present?
end
def same_source_and_target?
source_project == target_project && target_branch == source_branch
end
def source_branch_exists?
source_branch.blank? || source_project.commit(source_branch)
end
def target_branch_exists?
target_branch.blank? || target_project.commit(target_branch)
end
# When your branch name starts with an iid followed by a dash this pattern will be
# interpreted as the user wants to close that issue on this project.
#
# For example:
# - Issue 112 exists, title: Emoji don't show up in commit title
# - Source branch is: 112-fix-mep-mep
#
# Will lead to:
# - Appending `Closes #112` to the description
# - Setting the title as 'Resolves "Emoji don't show up in commit title"' if there is
# more than one commit in the MR
#
def assign_title_and_description
if match = source_branch.match(/\A(\d+)-/)
iid = match[1]
end
commits = compare_commits
if commits && commits.count == 1
commit = commits.first
merge_request.title = commit.title
merge_request.description ||= commit.description.try(:strip)
elsif iid && issue = target_project.get_issue(iid, current_user)
case issue
when Issue
merge_request.title = "Resolve \"#{issue.title}\""
when ExternalIssue
merge_request.title = "Resolve #{issue.title}"
end
else
merge_request.title = source_branch.titleize.humanize
end
if iid
closes_issue = "Closes ##{iid}"
if description.present?
merge_request.description += closes_issue.prepend("\n\n")
else
merge_request.description = closes_issue
end
end
merge_request.title = wip_title if commits.empty?
end
end
end