修复合并请求的后端bug

forge
sylor_huang@126.com 5 years ago
parent 1429e150bb
commit 15444d43cf

@ -277,7 +277,7 @@ class PullRequestsController < ApplicationController
MergeTitleField: params[:title]
}
merge_pr = Gitea::PullRequest::MergeService.new(current_user, @repository.try(:identifier), @pull_request.try(:gpid), requests_params).call
if @pull_request.update_attribute(:status, 1) && merge_pr
if @pull_request.update_attribute(:status, 1) && merge_pr[:status].to_i == 200
# @pull_request.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "merge")
@pull_request&.project_trends&.update_all(action_type: "close")
@ -380,9 +380,7 @@ class PullRequestsController < ApplicationController
end
def find_pull_request
Rails.logger.info("#########___________#######{params[:id]}")
@pull_request = PullRequest.find_by_id(params[:id])
Rails.logger.info("#########________@pull_request___#######{@pull_request}")
@issue = @pull_request&.issue
if @pull_request.blank?
normal_status(-1, "合并请求不存在")

@ -136,13 +136,13 @@ class Gitea::ClientService < ApplicationService
puts "[gitea] "
raise Error, "[gitea] delete ok"
else
if response&.body.blank?
message = "出现错误"
else
result = JSON.parse(response&.body)
message = result['message']
end
raise Error, mark + message
# if response&.body.blank?
# message = "出现错误"
# else
# result = JSON.parse(response&.body)
# message = result['message']
# end
raise Error, "该请求不存在"
end
end

@ -16,8 +16,7 @@ class Gitea::PullRequest::MergeService < Gitea::ClientService
end
def call
response = post(url, request_params)
render_status(response)
post(url, request_params)
end
private
@ -29,17 +28,4 @@ class Gitea::PullRequest::MergeService < Gitea::ClientService
Hash.new.merge(token: user.gitea_token, data: params)
end
def render_status(response)
case response.status
when 404
raise Error, "合并请求不存在"
else
if response.body.size > 0
JSON.parse(response&.body)
else
{status: 200}
end
end
end
end

Loading…
Cancel
Save