ADD mergeable column for get pull api

This commit is contained in:
jasder 2021-05-21 11:39:50 +08:00
parent 27d9d806ce
commit 8a47761afb
3 changed files with 14 additions and 12 deletions

View File

@ -136,7 +136,8 @@ class PullRequestsController < ApplicationController
def show
@issue_user = @issue.user
@issue_assign_to = @issue.get_assign_user
@gitea_pull = Gitea::PullRequest::GetService.call(@owner.login,
@repository.identifier, @pull_request.gpid, current_user&.gitea_token)
end
def pr_merge

View File

@ -1,15 +1,14 @@
# Get a pull request
class Gitea::PullRequest::GetService < Gitea::ClientService
attr_reader :user, :repo, :pull_request_id
attr_reader :owner, :repo, :number, :token
# user: 用户
# repo: 仓库名称/标识
# pull_request_id: pull request主键id
def initialize(user, repo, pull_request_id)
super({token: user.gitea_token})
@user = user
#eq:
# Gitea::PullRequest::GetService.call(user.login, repository.identifier, pull.gpid, user.gitea_token)
def initialize(owner, repo, number, token=nil)
@owner = owner
@repo = repo
@pull_request_id = pull_request_id
@number = number
@token = token
end
def call
@ -19,11 +18,11 @@ class Gitea::PullRequest::GetService < Gitea::ClientService
private
def params
Hash.new.merge(token: user.gitea_token)
Hash.new.merge(token: token)
end
def url
"/repos/#{user.login}/#{repo}/pulls/#{pull_request_id}".freeze
"/repos/#{owner}/#{repo}/pulls/#{number}".freeze
end
def render_result(response)
@ -31,7 +30,7 @@ class Gitea::PullRequest::GetService < Gitea::ClientService
when 200
JSON.parse(response.body)
else
nil
{}
end
end
end

View File

@ -12,6 +12,8 @@ json.pull_request do
json.pull_request_staus @pull_request.status == 1 ? "merged" : (@pull_request.status == 2 ? "closed" : "open")
json.fork_project_user @pull_request&.fork_project&.owner.try(:login)
json.create_user @pull_request&.user&.login
json.mergeable @gitea_pull["mergeable"]
json.state @gitea_pull["state"]
end
json.issue do