6e29368118
1. Avoid suggestions being applied on the same file from reverting previous changes 2. Gracefully use and handle file changes error when updating the file (though, it does not totally solves the sync problem for multiple suggestion applications at once)
72 lines
2.1 KiB
Ruby
72 lines
2.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Suggestions
|
|
class ApplyService < ::BaseService
|
|
def initialize(current_user)
|
|
@current_user = current_user
|
|
end
|
|
|
|
def execute(suggestion)
|
|
unless suggestion.appliable?
|
|
return error('Suggestion is not appliable')
|
|
end
|
|
|
|
unless latest_diff_refs?(suggestion)
|
|
return error('The file has been changed')
|
|
end
|
|
|
|
params = file_update_params(suggestion)
|
|
result = ::Files::UpdateService.new(suggestion.project, @current_user, params).execute
|
|
|
|
if result[:status] == :success
|
|
suggestion.update(commit_id: result[:result], applied: true)
|
|
end
|
|
|
|
result
|
|
rescue Files::UpdateService::FileChangedError
|
|
error('The file has been changed')
|
|
end
|
|
|
|
private
|
|
|
|
# Checks whether the latest diff refs for the branch matches with
|
|
# the position refs we're using to update the file content. Since
|
|
# the persisted refs are updated async (for MergeRequest),
|
|
# it's more consistent to fetch this data directly from the repository.
|
|
def latest_diff_refs?(suggestion)
|
|
suggestion.position.diff_refs == suggestion.noteable.repository_diff_refs
|
|
end
|
|
|
|
def file_update_params(suggestion)
|
|
blob = suggestion.diff_file.new_blob
|
|
file_path = suggestion.file_path
|
|
branch_name = suggestion.branch
|
|
file_content = new_file_content(suggestion, blob)
|
|
commit_message = "Apply suggestion to #{file_path}"
|
|
|
|
file_last_commit =
|
|
Gitlab::Git::Commit.last_for_path(suggestion.project.repository,
|
|
blob.commit_id,
|
|
blob.path)
|
|
|
|
{
|
|
file_path: file_path,
|
|
branch_name: branch_name,
|
|
start_branch: branch_name,
|
|
commit_message: commit_message,
|
|
file_content: file_content,
|
|
last_commit_sha: file_last_commit&.id
|
|
}
|
|
end
|
|
|
|
def new_file_content(suggestion, blob)
|
|
range = suggestion.from_line_index..suggestion.to_line_index
|
|
|
|
blob.load_all_data!
|
|
content = blob.data.lines
|
|
content[range] = suggestion.to_content
|
|
|
|
content.join
|
|
end
|
|
end
|
|
end
|