From 864564261263f77b957b05844962a91bcd1444ef Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 22 Jul 2022 09:35:47 +0800 Subject: [PATCH 01/53] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=BA=AF=E6=BA=90=E8=AE=BE=E7=BD=AEcookie=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/traces/projects_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/traces/projects_controller.rb b/app/controllers/traces/projects_controller.rb index e39d77a9e..7aebf8723 100644 --- a/app/controllers/traces/projects_controller.rb +++ b/app/controllers/traces/projects_controller.rb @@ -3,6 +3,7 @@ class Traces::ProjectsController < Traces::BaseController before_action :require_login before_action :load_project + before_action :set_trace_token_to_cookie before_action :authorizate_user_can_edit_project!, except: [:task_results] def tasks @@ -86,4 +87,8 @@ class Traces::ProjectsController < Traces::BaseController puts exception.message normal_status(-1, exception.message) end + + def set_trace_token_to_cookie + cookies[:vue_admin_template_token] = current_user&.trace_token + end end \ No newline at end of file From b21f44b59efe0e8b16f95ffd8bf2b3e8408f5daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Fri, 22 Jul 2022 10:11:21 +0800 Subject: [PATCH 02/53] =?UTF-8?q?fixed=20=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=97=A5=E5=BF=97=E6=A0=B9=E6=8D=AE=E6=8F=90=E4=BA=A4?= =?UTF-8?q?commit=E8=AE=B0=E5=BD=95=E5=A4=9A=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/commit_logs_controller.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/commit_logs_controller.rb b/app/controllers/commit_logs_controller.rb index c02d199b0..c62c13000 100644 --- a/app/controllers/commit_logs_controller.rb +++ b/app/controllers/commit_logs_controller.rb @@ -3,8 +3,6 @@ class CommitLogsController < ApplicationController def create tip_exception "未认证" unless params[:token].to_s == "7917908927b6f1b792f2027a08a8b24a2de42c1692c2fd45da0dee5cf90a5af5" ref = params[:ref] - commit_id = params[:commits][0][:id] - message = params[:commits][0][:message] user_name = params[:pusher][:login] user_mail = params[:pusher][:email] user = User.find_by(mail: user_mail) @@ -17,9 +15,13 @@ class CommitLogsController < ApplicationController owner = User.find_by(login: owner_name) project = Project.where(identifier: repository_name).where(user_id: owner&.id)&.first project = Project.where(identifier: repository_name).where(gpid: repository_id)&.first if project.blank? - CommitLog.create(user: user, project: project, repository_id: repository_id, - name: repository_name, full_name: repository_full_name, - ref: ref, commit_id: commit_id, message: message) + params[:commits].each do |commit| + commit_id = commit[:id] + message = commit[:message] + CommitLog.create(user: user, project: project, repository_id: repository_id, + name: repository_name, full_name: repository_full_name, + ref: ref, commit_id: commit_id, message: message) + end end end From 913057658e11bb1611d904e8cdedcb6d63c0f325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Fri, 22 Jul 2022 10:12:13 +0800 Subject: [PATCH 03/53] =?UTF-8?q?fixed=20=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=97=A5=E5=BF=97=E6=A0=B9=E6=8D=AE=E6=8F=90=E4=BA=A4?= =?UTF-8?q?commit=E8=AE=B0=E5=BD=95=E5=A4=9A=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/commit_logs_controller.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/commit_logs_controller.rb b/app/controllers/commit_logs_controller.rb index c02d199b0..c62c13000 100644 --- a/app/controllers/commit_logs_controller.rb +++ b/app/controllers/commit_logs_controller.rb @@ -3,8 +3,6 @@ class CommitLogsController < ApplicationController def create tip_exception "未认证" unless params[:token].to_s == "7917908927b6f1b792f2027a08a8b24a2de42c1692c2fd45da0dee5cf90a5af5" ref = params[:ref] - commit_id = params[:commits][0][:id] - message = params[:commits][0][:message] user_name = params[:pusher][:login] user_mail = params[:pusher][:email] user = User.find_by(mail: user_mail) @@ -17,9 +15,13 @@ class CommitLogsController < ApplicationController owner = User.find_by(login: owner_name) project = Project.where(identifier: repository_name).where(user_id: owner&.id)&.first project = Project.where(identifier: repository_name).where(gpid: repository_id)&.first if project.blank? - CommitLog.create(user: user, project: project, repository_id: repository_id, - name: repository_name, full_name: repository_full_name, - ref: ref, commit_id: commit_id, message: message) + params[:commits].each do |commit| + commit_id = commit[:id] + message = commit[:message] + CommitLog.create(user: user, project: project, repository_id: repository_id, + name: repository_name, full_name: repository_full_name, + ref: ref, commit_id: commit_id, message: message) + end end end From e3e4cb6a5bef4a36eba3f690b96f27d86cd0f8d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Fri, 22 Jul 2022 10:19:20 +0800 Subject: [PATCH 04/53] =?UTF-8?q?fixed=20=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=97=A5=E5=BF=97=E6=A0=B9=E6=8D=AE=E6=8F=90=E4=BA=A4?= =?UTF-8?q?commit=E8=AE=B0=E5=BD=95=E5=A4=9A=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/commit_logs_controller.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/commit_logs_controller.rb b/app/controllers/commit_logs_controller.rb index c02d199b0..c62c13000 100644 --- a/app/controllers/commit_logs_controller.rb +++ b/app/controllers/commit_logs_controller.rb @@ -3,8 +3,6 @@ class CommitLogsController < ApplicationController def create tip_exception "未认证" unless params[:token].to_s == "7917908927b6f1b792f2027a08a8b24a2de42c1692c2fd45da0dee5cf90a5af5" ref = params[:ref] - commit_id = params[:commits][0][:id] - message = params[:commits][0][:message] user_name = params[:pusher][:login] user_mail = params[:pusher][:email] user = User.find_by(mail: user_mail) @@ -17,9 +15,13 @@ class CommitLogsController < ApplicationController owner = User.find_by(login: owner_name) project = Project.where(identifier: repository_name).where(user_id: owner&.id)&.first project = Project.where(identifier: repository_name).where(gpid: repository_id)&.first if project.blank? - CommitLog.create(user: user, project: project, repository_id: repository_id, - name: repository_name, full_name: repository_full_name, - ref: ref, commit_id: commit_id, message: message) + params[:commits].each do |commit| + commit_id = commit[:id] + message = commit[:message] + CommitLog.create(user: user, project: project, repository_id: repository_id, + name: repository_name, full_name: repository_full_name, + ref: ref, commit_id: commit_id, message: message) + end end end From 81b684e4698ee5f8be1f124dfeb81fdd5118f85d Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 22 Jul 2022 10:22:22 +0800 Subject: [PATCH 05/53] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=BA=AF=E6=BA=90cookie=20domain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/traces/projects_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/traces/projects_controller.rb b/app/controllers/traces/projects_controller.rb index 7aebf8723..acbbccaa3 100644 --- a/app/controllers/traces/projects_controller.rb +++ b/app/controllers/traces/projects_controller.rb @@ -89,6 +89,10 @@ class Traces::ProjectsController < Traces::BaseController end def set_trace_token_to_cookie - cookies[:vue_admin_template_token] = current_user&.trace_token + cookies[:vue_admin_template_token] = { + :value => current_user&.trace_token, + :expires => 1.hours.from_now, + :domain => Trace.trace_config[:domain] + } end end \ No newline at end of file From 4aebba2f2576d9a4d2657f33629f8e969cb55603 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 22 Jul 2022 11:16:04 +0800 Subject: [PATCH 06/53] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=BA=AF=E6=BA=90cookie=20domain=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/traces/projects_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/traces/projects_controller.rb b/app/controllers/traces/projects_controller.rb index acbbccaa3..b9b0bb791 100644 --- a/app/controllers/traces/projects_controller.rb +++ b/app/controllers/traces/projects_controller.rb @@ -92,7 +92,7 @@ class Traces::ProjectsController < Traces::BaseController cookies[:vue_admin_template_token] = { :value => current_user&.trace_token, :expires => 1.hours.from_now, - :domain => Trace.trace_config[:domain] + :domain => Trace.trace_config[:cookie_domain] } end end \ No newline at end of file From 3a12b7b16cfe146f00670f72f808f307f9cbb0ff Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 22 Jul 2022 13:44:07 +0800 Subject: [PATCH 07/53] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=BA=AF=E6=BA=90=E5=B1=95=E7=A4=BA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?url=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/traces/projects_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/traces/projects_controller.rb b/app/controllers/traces/projects_controller.rb index b9b0bb791..8f2f2b9ec 100644 --- a/app/controllers/traces/projects_controller.rb +++ b/app/controllers/traces/projects_controller.rb @@ -36,7 +36,7 @@ class Traces::ProjectsController < Traces::BaseController return render :json => {left_tasks_count: 5, data: []} if current_user.trace_user.nil? code, data, error = Trace::CheckResultService.call(current_user.trace_token, @project, nil, page, limit) if code == 200 - render :json => {left_tasks_count: 5 - @project.user_trace_tasks.size, data: data} + render :json => {left_tasks_count: 5 - @project.user_trace_tasks.size, data: data, view_base: "#{Trace.trace_config[:view_domain]}/analysis/analysis-results/" } else render_error("获取检测记录失败 Error:#{error}") end From 8ba70a33becf0bad66780f6d2f4fb93548d902e5 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 22 Jul 2022 17:33:08 +0800 Subject: [PATCH 08/53] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20pr=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=88=97=E8=A1=A8=E5=92=8Cdiff=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 +- .../projects/pull_requests/base_controller.rb | 20 +++++++++++ .../pull_requests/versions_controller.rb | 10 ++++++ .../versions/get_diff_service.rb | 35 ++++++++++++++++++ .../pull_requests/versions/list_service.rb | 36 +++++++++++++++++++ ...imple_gitea_diff_file_detail.json.jbuilder | 35 ++++++++++++++++++ .../pull_requests/versions/diff.json.jbuilder | 6 ++++ .../versions/index.json.jbuilder | 13 +++++++ config/routes/api.rb | 9 ++++- 9 files changed, 164 insertions(+), 2 deletions(-) create mode 100644 app/controllers/api/v1/projects/pull_requests/base_controller.rb create mode 100644 app/controllers/api/v1/projects/pull_requests/versions_controller.rb create mode 100644 app/services/api/v1/projects/pull_requests/versions/get_diff_service.rb create mode 100644 app/services/api/v1/projects/pull_requests/versions/list_service.rb create mode 100644 app/views/api/v1/projects/_simple_gitea_diff_file_detail.json.jbuilder create mode 100644 app/views/api/v1/projects/pull_requests/versions/diff.json.jbuilder create mode 100644 app/views/api/v1/projects/pull_requests/versions/index.json.jbuilder diff --git a/Gemfile b/Gemfile index 3da6f273d..dd8885df7 100644 --- a/Gemfile +++ b/Gemfile @@ -135,4 +135,4 @@ gem 'doorkeeper' gem 'doorkeeper-jwt' -gem 'gitea-client', '~> 0.10.2' \ No newline at end of file +gem 'gitea-client', '~> 0.10.4' \ No newline at end of file diff --git a/app/controllers/api/v1/projects/pull_requests/base_controller.rb b/app/controllers/api/v1/projects/pull_requests/base_controller.rb new file mode 100644 index 000000000..089a2bf7f --- /dev/null +++ b/app/controllers/api/v1/projects/pull_requests/base_controller.rb @@ -0,0 +1,20 @@ +class Api::V1::Projects::PullRequests::BaseController < Api::V1::BaseController + before_action :require_public_and_member_above + before_action :load_pull_request + + def load_pull_request + pull_request_id = params[:pull_request_id] || params[:id] + @pull_request = @project.pull_requests.where(gitea_number: pull_request_id).where.not(id: pull_request_id).take || PullRequest.find_by_id(pull_request_id) + @issue = @pull_request&.issue + if @pull_request + logger.info "###########pull_request founded" + @pull_request + else + logger.info "###########pull_request not found" + @pull_request = nil + render_not_found and return + end + + @pull_request + end +end \ No newline at end of file diff --git a/app/controllers/api/v1/projects/pull_requests/versions_controller.rb b/app/controllers/api/v1/projects/pull_requests/versions_controller.rb new file mode 100644 index 000000000..abeaf7fd8 --- /dev/null +++ b/app/controllers/api/v1/projects/pull_requests/versions_controller.rb @@ -0,0 +1,10 @@ +class Api::V1::Projects::PullRequests::VersionsController < Api::V1::Projects::PullRequests::BaseController + + def index + @result_object = Api::V1::Projects::PullRequests::Versions::ListService.call(@project, @pull_request, {page: page, limit: limit}, current_user&.gitea_token) + end + + def diff + @result_object = Api::V1::Projects::PullRequests::Versions::GetDiffService.call(@project, @pull_request, params[:id], {filepath: params[:filepath]}, current_user&.gitea_token) + end +end \ No newline at end of file diff --git a/app/services/api/v1/projects/pull_requests/versions/get_diff_service.rb b/app/services/api/v1/projects/pull_requests/versions/get_diff_service.rb new file mode 100644 index 000000000..7c15fc6a4 --- /dev/null +++ b/app/services/api/v1/projects/pull_requests/versions/get_diff_service.rb @@ -0,0 +1,35 @@ +class Api::V1::Projects::PullRequests::Versions::GetDiffService < ApplicationService + + attr_reader :project, :pull_request, :version_id, :owner, :repo, :index, :filepath, :token + attr_accessor :gitea_data + + def initialize(project, pull_request, version_id, params, token=nil) + @project = project + @pull_request = pull_request + @version_id = version_id + @owner = project&.owner.login + @repo = project&.identifier + @index = pull_request.gitea_number + @filepath = params[:filepath] + @token = token + end + + def call + load_gitea_data + + gitea_data + end + + private + def request_params + params = { + access_token: token + } + params.merge!(filepath: filepath) if filepath.present? + end + + def load_gitea_data + @gitea_data = $gitea_client.get_repos_pulls_versions_diff_by_owner_repo_index_version_id(owner, repo, index, version_id, {query: request_params}) + raise Error, '获取合并请求版本diff失败！' unless @gitea_data.is_a?(Hash) + end +end \ No newline at end of file diff --git a/app/services/api/v1/projects/pull_requests/versions/list_service.rb b/app/services/api/v1/projects/pull_requests/versions/list_service.rb new file mode 100644 index 000000000..f33145b91 --- /dev/null +++ b/app/services/api/v1/projects/pull_requests/versions/list_service.rb @@ -0,0 +1,36 @@ +class Api::V1::Projects::PullRequests::Versions::ListService < ApplicationService + + attr_reader :project, :pull_request, :token, :owner, :repo, :index, :page, :limit + attr_accessor :gitea_data + + def initialize(project, pull_request, params, token = nil) + @project = project + @pull_request = pull_request + @owner = project&.owner.login + @repo = project&.identifier + @page = params[:page] || 1 + @limit = params[:limit] || 15 + @index = pull_request.gitea_number + @token = token + end + + def call + load_gitea_data + + gitea_data + end + + private + def request_params + { + access_token: token, + page: page, + limit: limit + } + end + + def load_gitea_data + @gitea_data = $gitea_client.get_repos_pulls_versions_by_owner_repo_index(owner, repo, index, {query: request_params}) + raise Error, '获取合并请求版本失败！' unless @gitea_data.is_a?(Hash) + end +end \ No newline at end of file diff --git a/app/views/api/v1/projects/_simple_gitea_diff_file_detail.json.jbuilder b/app/views/api/v1/projects/_simple_gitea_diff_file_detail.json.jbuilder new file mode 100644 index 000000000..13f833338 --- /dev/null +++ b/app/views/api/v1/projects/_simple_gitea_diff_file_detail.json.jbuilder @@ -0,0 +1,35 @@ +json.name file['Name'] + json.oldname file['OldName'] + json.addition file['Addition'] + json.deletion file['Deletion'] + json.type file['Type'] + json.is_created file['IsCreated'] + json.is_deleted file['IsDeleted'] + json.is_bin file['IsBin'] + json.is_lfs_file file['IsLFSFile'] + json.is_renamed file['IsRenamed'] + json.is_ambiguous file['IsAmbiguous'] + json.is_submodule file['IsSubmodule'] + json.sections file['Sections'] do |section| + json.file_name section['FileName'] + json.name section['Name'] + json.lines section['Lines'] do |line| + json.left_index line['LeftIdx'] + json.right_index line['RightIdx'] + json.match line['Match'] + json.type line['Type'] + json.content line['Content'] + unless line['SectionInfo'].blank? + json.section_path line['SectionInfo']['Path'] + json.section_last_left_index line['SectionInfo']['LastLeftIdx'] + json.section_last_right_index line['SectionInfo']['LastRightIdx'] + json.section_left_index line['SectionInfo']['LeftIdx'] + json.section_right_index line['SectionInfo']['RightIdx'] + json.section_left_hunk_size line['SectionInfo']['LeftHunkSize'] + json.section_right_hunk_size line['SectionInfo']['RightHunkSize'] + end + end + end + json.is_incomplete file['IsIncomplete'] + json.is_incomplete_line_too_long file['IsIncompleteLineTooLong'] + json.is_protected file['IsProtected'] \ No newline at end of file diff --git a/app/views/api/v1/projects/pull_requests/versions/diff.json.jbuilder b/app/views/api/v1/projects/pull_requests/versions/diff.json.jbuilder new file mode 100644 index 000000000..9e2c3430d --- /dev/null +++ b/app/views/api/v1/projects/pull_requests/versions/diff.json.jbuilder @@ -0,0 +1,6 @@ + +if @result_object.has_key?("NumFiles") + json.partial! "api/v1/projects/simple_gitea_diff_detail", diff: @result_object +else + json.partial! "api/v1/projects/simple_gitea_diff_file_detail", file: @result_object +end \ No newline at end of file diff --git a/app/views/api/v1/projects/pull_requests/versions/index.json.jbuilder b/app/views/api/v1/projects/pull_requests/versions/index.json.jbuilder new file mode 100644 index 000000000..4888c4f08 --- /dev/null +++ b/app/views/api/v1/projects/pull_requests/versions/index.json.jbuilder @@ -0,0 +1,13 @@ +json.total_count @result_object[:total_data].to_i +json.versions @result_object[:data].each do |version| + json.id version['id'] + json.add_line_num version['add_line_num'] + json.del_line_num version['del_line_num'] + json.commits_count version['commits_count'] + json.files_count version['files_count'] + json.base_commit_sha version['base_commit_sha'] + json.head_commit_sha version['head_commit_sha'] + json.start_commit_sha version['start_commit_sha'] + json.created_time render_unix_time(version['created_at']) + json.updated_time render_unix_time(version['updated_at']) +end \ No newline at end of file diff --git a/config/routes/api.rb b/config/routes/api.rb index 81668804e..4f59995bd 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -19,7 +19,14 @@ defaults format: :json do # projects文件夹下的 scope module: :projects do resources :issues - resources :pull_requests + resources :pull_requests, module: 'pull_requests' do + resources :versions, only: [:index] do + member do + get :diff + end + end + end + resources :versions resources :release_versions resources :webhooks do From 0df1e5fdd016c6308b1b74b1e07596fc4928abc1 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 22 Jul 2022 18:08:16 +0800 Subject: [PATCH 09/53] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E7=89=88=E6=9C=AC=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=92=8Cdiff=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pull_requests/versions_controller.rb | 10 - .../base_controller.rb | 4 +- .../v1/projects/pulls/versions_controller.rb | 10 + app/controllers/reviews_controller.rb | 2 +- app/docs/slate/source/includes/_pulls.md | 315 ++++++++ .../slate/source/includes/_repositories.md | 24 +- .../reviews/create_service.rb | 2 +- .../versions/get_diff_service.rb | 2 +- .../versions/list_service.rb | 2 +- .../versions/diff.json.jbuilder | 0 .../versions/index.json.jbuilder | 0 config/routes/api.rb | 2 +- public/docs/api.html | 705 +++++++++++++++++- 13 files changed, 1040 insertions(+), 38 deletions(-) delete mode 100644 app/controllers/api/v1/projects/pull_requests/versions_controller.rb rename app/controllers/api/v1/projects/{pull_requests => pulls}/base_controller.rb (79%) create mode 100644 app/controllers/api/v1/projects/pulls/versions_controller.rb rename app/services/api/v1/projects/{pull_requests => pulls}/reviews/create_service.rb (93%) rename app/services/api/v1/projects/{pull_requests => pulls}/versions/get_diff_service.rb (91%) rename app/services/api/v1/projects/{pull_requests => pulls}/versions/list_service.rb (91%) rename app/views/api/v1/projects/{pull_requests => pulls}/versions/diff.json.jbuilder (100%) rename app/views/api/v1/projects/{pull_requests => pulls}/versions/index.json.jbuilder (100%) diff --git a/app/controllers/api/v1/projects/pull_requests/versions_controller.rb b/app/controllers/api/v1/projects/pull_requests/versions_controller.rb deleted file mode 100644 index abeaf7fd8..000000000 --- a/app/controllers/api/v1/projects/pull_requests/versions_controller.rb +++ /dev/null @@ -1,10 +0,0 @@ -class Api::V1::Projects::PullRequests::VersionsController < Api::V1::Projects::PullRequests::BaseController - - def index - @result_object = Api::V1::Projects::PullRequests::Versions::ListService.call(@project, @pull_request, {page: page, limit: limit}, current_user&.gitea_token) - end - - def diff - @result_object = Api::V1::Projects::PullRequests::Versions::GetDiffService.call(@project, @pull_request, params[:id], {filepath: params[:filepath]}, current_user&.gitea_token) - end -end \ No newline at end of file diff --git a/app/controllers/api/v1/projects/pull_requests/base_controller.rb b/app/controllers/api/v1/projects/pulls/base_controller.rb similarity index 79% rename from app/controllers/api/v1/projects/pull_requests/base_controller.rb rename to app/controllers/api/v1/projects/pulls/base_controller.rb index 089a2bf7f..0d5ae08b5 100644 --- a/app/controllers/api/v1/projects/pull_requests/base_controller.rb +++ b/app/controllers/api/v1/projects/pulls/base_controller.rb @@ -1,9 +1,9 @@ -class Api::V1::Projects::PullRequests::BaseController < Api::V1::BaseController +class Api::V1::Projects::Pulls::BaseController < Api::V1::BaseController before_action :require_public_and_member_above before_action :load_pull_request def load_pull_request - pull_request_id = params[:pull_request_id] || params[:id] + pull_request_id = params[:pull_id] || params[:id] @pull_request = @project.pull_requests.where(gitea_number: pull_request_id).where.not(id: pull_request_id).take || PullRequest.find_by_id(pull_request_id) @issue = @pull_request&.issue if @pull_request diff --git a/app/controllers/api/v1/projects/pulls/versions_controller.rb b/app/controllers/api/v1/projects/pulls/versions_controller.rb new file mode 100644 index 000000000..dfd5d9e9d --- /dev/null +++ b/app/controllers/api/v1/projects/pulls/versions_controller.rb @@ -0,0 +1,10 @@ +class Api::V1::Projects::Pulls::VersionsController < Api::V1::Projects::Pulls::BaseController + + def index + @result_object = Api::V1::Projects::Pulls::Versions::ListService.call(@project, @pull_request, {page: page, limit: limit}, current_user&.gitea_token) + end + + def diff + @result_object = Api::V1::Projects::Pulls::Versions::GetDiffService.call(@project, @pull_request, params[:id], {filepath: params[:filepath]}, current_user&.gitea_token) + end +end \ No newline at end of file diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index eec57113d..e12016904 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -5,7 +5,7 @@ class ReviewsController < ApplicationController def create return render_forbidden('您不是审查人员，无法进行审查！') if current_user&.id != @pull_request.issue.assigned_to_id - @journal, @review = Api::V1::Projects::PullRequests::Reviews::CreateService.call(@project, @pull_request, review_params, current_user) + @journal, @review = Api::V1::Projects::Pulls::Reviews::CreateService.call(@project, @pull_request, review_params, current_user) end private diff --git a/app/docs/slate/source/includes/_pulls.md b/app/docs/slate/source/includes/_pulls.md index b9ad3b0ba..e7df64097 100644 --- a/app/docs/slate/source/includes/_pulls.md +++ b/app/docs/slate/source/includes/_pulls.md @@ -499,4 +499,319 @@ await octokit.request('GET /api/Jasder/gitlink/pulls.json') } ] } +``` + +## 获取合并请求版本列表 +获取合并请求版本列表 + +> 示例: + +```shell +curl -X GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions.json +``` + +```javascript +await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/versions.json') +``` + +### HTTP 请求 +`GET /api/v1/:owner/:repo/pulls/:index/versions.json` + +### 请求参数: +参数 | 必选 | 默认 | 类型 | 字段说明 +--------- | ------- | ------- | -------- | ---------- +|owner |是| |string |用户登录名 | +|repo |是| |string |项目标识identifier | +|index |是|| int |合并请求序号| + + +### 返回字段说明: +参数 | 类型 | 字段说明 +--------- | ----------- | ----------- +|total_count |int |合并请求版本总数| +|versions.id |int |版本ID| +|versions.add_line_num |int |该版本新增行数| +|versions.del_line_num |int |该版本删除行数| +|versions.commits_count |int |该版本提交总数| +|versions.files_count |int |该版本提交文件总数| +|versions.base_commit_sha |string |目标commit ID| +|versions.head_commit_sha |string |源commit ID| +|versions.start_commit_sha|string |该版本起始commit ID| +|versions.created_time |int |版本创建时间| +|versions.updated_time |int |版本更新时间| + +> 返回的JSON示例: + +```json +{ + "total_count": 1, + "versions": [ + { + "id": 33, + "add_line_num": 5, + "del_line_num": 2, + "commits_count": 31, + "files_count": 29, + "base_commit_sha": "4a277037093c1248e46d2946ee30b61cccdb9df9", + "head_commit_sha": "fa3b1cdc8e0727d0fb9c96d28c545867c39815b8", + "start_commit_sha": "e49b1fd335e093a440fcf35a21e050afd48ef932", + "created_time": 1658469499, + "updated_time": 1658469499 + } + ] +} +``` + +## 获取合并请求版本Diff +获取合并请求版本Diff（支持获取单文件Diff） + +> 示例: + +```shell +curl -X GET \ +-d "filepath=ceshi_dir_1/new_file_1" \ +http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json +``` + +```javascript +await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json') +``` + +### HTTP 请求 +`GET /api/v1/:owner/:repo/pulls/:index/versions/:version_id/diff.json` + +### 请求参数: +参数 | 必选 | 默认 | 类型 | 字段说明 +--------- | ------- | ------- | -------- | ---------- +|owner |是| |string |用户登录名 | +|repo |是| |string |项目标识identifier | +|index |是|| int |合并请求序号| +|version_id|是|| int |版本ID| +|filepath|否||string|文件路径| + +### 列表返回字段说明: +参数 | 类型 | 字段说明 +--------- | ----------- | ----------- +|file_nums|int|文件数量| +|total_addition|int|新增行数| +|total_deletion|int|删除行数| +|files.name|string|文件名称| +|files.oldname|string|文件修改前名称| +|files.addition|int|文件新增行数| +|files.deletion|int|文件删除行数| +|files.type|int|文件类型 1: 新增 2: 更改 3: 删除 4: 重命名 5: 复制| +|files.is_created|bool|是否为新建文件| +|files.is_deleted|bool|是否为删除文件| +|files.is_bin|bool|是否为二进制文件| +|files.is_lfs_file|bool|是否为LFS文件| +|files.is_renamed|bool|是否重命名| +|files.is_ambiguous|bool|| +|files.is_submodule|bool|是否为子模块| +|files.sections.file_name|string|文件名称| +|files.sections.name|string|| +|files.sections.lines.left_index|int|文件变动之前所在行数| +|files.sections.lines.right_index|int|文件变动之后所在行数| +|files.sections.lines.match|int|| +|files.sections.lines.type|int|文件变更类型| +|files.sections.lines.content|string|文件变更内容| +|files.sections.lines.section_path|string|文件路径| +|files.sections.lines.section_last_left_index|int|| +|files.sections.lines.section_last_right_index|int|| +|files.sections.lines.section_left_index|int|文件变更之前所在行数| +|files.sections.lines.section_right_index|int|文件变更之后所在行数(即：页面编辑器开始显示的行数)| +|files.sections.lines.section_left_hunk_size|int|文件变更之前的行数| +|files.sections.lines.section_right_hunk_size|int|文件变更之后的行数(及当前页面编辑器显示的总行数)| +|files.is_incomplete|bool|是否不完整| +|files.is_incomplete_line_too_long|bool|文件是否不完整是因为太长了| +|files.is_protected|bool|文件是否被保护| + +> 列表返回的JSON示例: + +```json +{ + "file_nums": 29, + "total_addition": 5, + "total_deletion": 2, + "files": [ + { + "name": "README.md", + "oldname": "README.md", + "addition": 1, + "deletion": 2, + "type": 2, + "is_created": false, + "is_deleted": false, + "is_bin": false, + "is_lfs_file": false, + "is_renamed": false, + "is_ambiguous": false, + "is_submodule": false, + "sections": [ + { + "file_name": "README.md", + "name": "", + "lines": [ + { + "left_index": 0, + "right_index": 0, + "match": 0, + "type": 4, + "content": "@@ -1,2 +1 @@", + "section_path": "README.md", + "section_last_left_index": 0, + "section_last_right_index": 0, + "section_left_index": 1, + "section_right_index": 1, + "section_left_hunk_size": 2, + "section_right_hunk_size": 0 + }, + { + "left_index": 1, + "right_index": 0, + "match": 3, + "type": 3, + "content": "-# ceshi_commit" + }, + { + "left_index": 2, + "right_index": 0, + "match": -1, + "type": 3, + "content": "-" + }, + { + "left_index": 0, + "right_index": 1, + "match": 1, + "type": 2, + "content": "+adsa" + } + ] + }, + {} + ], + "is_incomplete": false, + "is_incomplete_line_too_long": false, + "is_protected": false + } + ] +} +``` + +### 单个文件返回字段说明: +参数 | 类型 | 字段说明 +--------- | ----------- | ----------- +|name|string|文件名称| +|oldname|string|文件修改前名称| +|addition|int|文件新增行数| +|deletion|int|文件删除行数| +|type|int|文件类型 1: 新增 2: 更改 3: 删除 4: 重命名 5: 复制| +|is_created|bool|是否为新建文件| +|is_deleted|bool|是否为删除文件| +|is_bin|bool|是否为二进制文件| +|is_lfs_file|bool|是否为LFS文件| +|is_renamed|bool|是否重命名| +|is_ambiguous|bool|| +|is_submodule|bool|是否为子模块| +|sections.file_name|string|文件名称| +|sections.name|string|| +|sections.lines.left_index|int|文件变动之前所在行数| +|sections.lines.right_index|int|文件变动之后所在行数| +|sections.lines.match|int|| +|sections.lines.type|int|文件变更类型| +|sections.lines.content|string|文件变更内容| +|sections.lines.section_path|string|文件路径| +|sections.lines.section_last_left_index|int|| +|sections.lines.section_last_right_index|int|| +|sections.lines.section_left_index|int|文件变更之前所在行数| +|sections.lines.section_right_index|int|文件变更之后所在行数(即：页面编辑器开始显示的行数)| +|sections.lines.section_left_hunk_size|int|文件变更之前的行数| +|sections.lines.section_right_hunk_size|int|文件变更之后的行数(及当前页面编辑器显示的总行数)| +|is_incomplete|bool|是否不完整| +|is_incomplete_line_too_long|bool|文件是否不完整是因为太长了| +|is_protected|bool|文件是否被保护| + +> 单个文件返回的JSON示例: + +```json +{ + "name": "README.md", + "oldname": "README.md", + "addition": 1, + "deletion": 2, + "type": 2, + "is_created": false, + "is_deleted": false, + "is_bin": false, + "is_lfs_file": false, + "is_renamed": false, + "is_ambiguous": false, + "is_submodule": false, + "sections": [ + { + "file_name": "README.md", + "name": "", + "lines": [ + { + "left_index": 0, + "right_index": 0, + "match": 0, + "type": 4, + "content": "@@ -1,2 +1 @@", + "section_path": "README.md", + "section_last_left_index": 0, + "section_last_right_index": 0, + "section_left_index": 1, + "section_right_index": 1, + "section_left_hunk_size": 2, + "section_right_hunk_size": 0 + }, + { + "left_index": 1, + "right_index": 0, + "match": 3, + "type": 3, + "content": "-# ceshi_commit" + }, + { + "left_index": 2, + "right_index": 0, + "match": -1, + "type": 3, + "content": "-" + }, + { + "left_index": 0, + "right_index": 1, + "match": 1, + "type": 2, + "content": "+adsa" + } + ] + }, + { + "file_name": "README.md", + "name": "", + "lines": [ + { + "left_index": 0, + "right_index": 0, + "match": 0, + "type": 4, + "content": " ", + "section_path": "README.md", + "section_last_left_index": 0, + "section_last_right_index": 1, + "section_left_index": 3, + "section_right_index": 2, + "section_left_hunk_size": 0, + "section_right_hunk_size": 0 + } + ] + } + ], + "is_incomplete": false, + "is_incomplete_line_too_long": false, + "is_protected": false +} ``` \ No newline at end of file diff --git a/app/docs/slate/source/includes/_repositories.md b/app/docs/slate/source/includes/_repositories.md index ae74dac7f..a07f23513 100644 --- a/app/docs/slate/source/includes/_repositories.md +++ b/app/docs/slate/source/includes/_repositories.md @@ -1990,25 +1990,27 @@ await octokit.request('GET /api/v1/yystopf/csfjkkj/compare.json') |diff.files.is_created|bool|是否为新建文件| |diff.files.is_deleted|bool|是否为删除文件| |diff.files.is_bin|bool|是否为二进制文件| -|diff.files.is_lfs_file|bool|| +|diff.files.is_lfs_file|bool|是否为LFS文件| |diff.files.is_renamed|bool|是否重命名| |diff.files.is_ambiguous|bool|| |diff.files.is_submodule|bool|是否为子模块| |diff.files.sections.file_name|string|文件名称| |diff.files.sections.name|string|| -|diff.files.sections.lines.left_index|int|| -|diff.files.sections.lines.right_index|int|| +|diff.files.sections.lines.left_index|int|文件变动之前所在行数| +|diff.files.sections.lines.right_index|int|文件变动之后所在行数| |diff.files.sections.lines.match|int|| -|diff.files.sections.lines.type|int|| -|diff.files.sections.lines.content|string|| -|diff.files.sections.lines.section_path|string|| +|diff.files.sections.lines.type|int|文件变更类型| +|diff.files.sections.lines.content|string|文件变更内容| +|diff.files.sections.lines.section_path|string|文件路径| |diff.files.sections.lines.section_last_left_index|int|| |diff.files.sections.lines.section_last_right_index|int|| -|diff.files.sections.lines.section_left_index|int|| -|diff.files.sections.lines.section_right_index|int|| -|diff.files.sections.lines.section_left_hunk_size|int|| -|diff.files.sections.lines.section_right_hunk_size|int|| - +|diff.files.sections.lines.section_left_index|int|文件变更之前所在行数| +|diff.files.sections.lines.section_right_index|int|文件变更之后所在行数(即：页面编辑器开始显示的行数)| +|diff.files.sections.lines.section_left_hunk_size|int|文件变更之前的行数| +|diff.files.sections.lines.section_right_hunk_size|int|文件变更之后的行数(及当前页面编辑器显示的总行数)| +|diff.files.is_incomplete|bool|是否不完整| +|diff.files.is_incomplete_line_too_long|bool|文件是否不完整是因为太长了| +|diff.files.is_protected|bool|文件是否被保护| > 返回的JSON示例: diff --git a/app/services/api/v1/projects/pull_requests/reviews/create_service.rb b/app/services/api/v1/projects/pulls/reviews/create_service.rb similarity index 93% rename from app/services/api/v1/projects/pull_requests/reviews/create_service.rb rename to app/services/api/v1/projects/pulls/reviews/create_service.rb index c003256dc..13ec9f7e7 100644 --- a/app/services/api/v1/projects/pull_requests/reviews/create_service.rb +++ b/app/services/api/v1/projects/pulls/reviews/create_service.rb @@ -1,4 +1,4 @@ -class Api::V1::Projects::PullRequests::Reviews::CreateService < ApplicationService +class Api::V1::Projects::Pulls::Reviews::CreateService < ApplicationService include ActiveModel::Model attr_reader :project, :pull_request, :issue, :status, :commit_id, :content, :current_user diff --git a/app/services/api/v1/projects/pull_requests/versions/get_diff_service.rb b/app/services/api/v1/projects/pulls/versions/get_diff_service.rb similarity index 91% rename from app/services/api/v1/projects/pull_requests/versions/get_diff_service.rb rename to app/services/api/v1/projects/pulls/versions/get_diff_service.rb index 7c15fc6a4..1a4f144af 100644 --- a/app/services/api/v1/projects/pull_requests/versions/get_diff_service.rb +++ b/app/services/api/v1/projects/pulls/versions/get_diff_service.rb @@ -1,4 +1,4 @@ -class Api::V1::Projects::PullRequests::Versions::GetDiffService < ApplicationService +class Api::V1::Projects::Pulls::Versions::GetDiffService < ApplicationService attr_reader :project, :pull_request, :version_id, :owner, :repo, :index, :filepath, :token attr_accessor :gitea_data diff --git a/app/services/api/v1/projects/pull_requests/versions/list_service.rb b/app/services/api/v1/projects/pulls/versions/list_service.rb similarity index 91% rename from app/services/api/v1/projects/pull_requests/versions/list_service.rb rename to app/services/api/v1/projects/pulls/versions/list_service.rb index f33145b91..ca88ff1f6 100644 --- a/app/services/api/v1/projects/pull_requests/versions/list_service.rb +++ b/app/services/api/v1/projects/pulls/versions/list_service.rb @@ -1,4 +1,4 @@ -class Api::V1::Projects::PullRequests::Versions::ListService < ApplicationService +class Api::V1::Projects::Pulls::Versions::ListService < ApplicationService attr_reader :project, :pull_request, :token, :owner, :repo, :index, :page, :limit attr_accessor :gitea_data diff --git a/app/views/api/v1/projects/pull_requests/versions/diff.json.jbuilder b/app/views/api/v1/projects/pulls/versions/diff.json.jbuilder similarity index 100% rename from app/views/api/v1/projects/pull_requests/versions/diff.json.jbuilder rename to app/views/api/v1/projects/pulls/versions/diff.json.jbuilder diff --git a/app/views/api/v1/projects/pull_requests/versions/index.json.jbuilder b/app/views/api/v1/projects/pulls/versions/index.json.jbuilder similarity index 100% rename from app/views/api/v1/projects/pull_requests/versions/index.json.jbuilder rename to app/views/api/v1/projects/pulls/versions/index.json.jbuilder diff --git a/config/routes/api.rb b/config/routes/api.rb index 4f59995bd..8340097ee 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -19,7 +19,7 @@ defaults format: :json do # projects文件夹下的 scope module: :projects do resources :issues - resources :pull_requests, module: 'pull_requests' do + resources :pulls, module: 'pulls' do resources :versions, only: [:index] do member do get :diff diff --git a/public/docs/api.html b/public/docs/api.html index 52e114d72..297c1dc87 100644 --- a/public/docs/api.html +++ b/public/docs/api.html @@ -609,6 +609,12 @@
  • List pull requests
    • +
  • + 获取合并请求版本列表 +
    • +
  • + 获取合并请求版本Diff +
  • @@ -10786,7 +10792,7 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json diff.files.is_lfs_file bool - +是否为LFS文件 diff.files.is_renamed @@ -10816,12 +10822,12 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json diff.files.sections.lines.left_index int - +文件变动之前所在行数 diff.files.sections.lines.right_index int - +文件变动之后所在行数 diff.files.sections.lines.match @@ -10831,17 +10837,17 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json diff.files.sections.lines.type int - +文件变更类型 diff.files.sections.lines.content string - +文件变更内容 diff.files.sections.lines.section_path string - +文件路径 diff.files.sections.lines.section_last_left_index @@ -10856,22 +10862,37 @@ http://localhost:3000/api/v1/yystopf/csfjkkj/compare.json diff.files.sections.lines.section_left_index int - +文件变更之前所在行数 diff.files.sections.lines.section_right_index int - +文件变更之后所在行数(即：页面编辑器开始显示的行数) diff.files.sections.lines.section_left_hunk_size int - +文件变更之前的行数 diff.files.sections.lines.section_right_hunk_size int - +文件变更之后的行数(及当前页面编辑器显示的总行数) + + +diff.files.is_incomplete +bool +是否不完整 + + +diff.files.is_incomplete_line_too_long +bool +文件是否不完整是因为太长了 + + +diff.files.is_protected +bool +文件是否被保护 @@ -12936,6 +12957,670 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop } ] } +

    获取合并请求版本列表

    +

    获取合并请求版本列表

    + +
    +

    示例:

    +
    +
    curl -X GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions.json
+
    await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/versions.json')
+

    HTTP 请求

    +

    GET /api/v1/:owner/:repo/pulls/:index/versions.json

    +

    请求参数:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数必选默认类型字段说明
    owner是string用户登录名
    repo是string项目标识identifier
    index是int合并请求序号
    +

    返回字段说明:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数类型字段说明
    total_countint合并请求版本总数
    versions.idint版本ID
    versions.add_line_numint该版本新增行数
    versions.del_line_numint该版本删除行数
    versions.commits_countint该版本提交总数
    versions.files_countint该版本提交文件总数
    versions.base_commit_shastring目标commit ID
    versions.head_commit_shastring源commit ID
    versions.start_commit_shastring该版本起始commit ID
    versions.created_timeint版本创建时间
    versions.updated_timeint版本更新时间
    + +
    +

    返回的JSON示例:

    +
    +
    {
+    "total_count": 1,
+    "versions": [
+        {
+            "id": 33,
+            "add_line_num": 5,
+            "del_line_num": 2,
+            "commits_count": 31,
+            "files_count": 29,
+            "base_commit_sha": "4a277037093c1248e46d2946ee30b61cccdb9df9",
+            "head_commit_sha": "fa3b1cdc8e0727d0fb9c96d28c545867c39815b8",
+            "start_commit_sha": "e49b1fd335e093a440fcf35a21e050afd48ef932",
+            "created_time": 1658469499,
+            "updated_time": 1658469499
+        }
+    ]
+}
+

    获取合并请求版本Diff

    +

    获取合并请求版本Diff（支持获取单文件Diff）

    + +
    +

    示例:

    +
    +
    curl -X GET \
+-d "filepath=ceshi_dir_1/new_file_1" \
+http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json
+
    await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json')
+

    HTTP 请求

    +

    GET /api/v1/:owner/:repo/pulls/:index/versions/:version_id/diff.json

    +

    请求参数:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数必选默认类型字段说明
    owner是string用户登录名
    repo是string项目标识identifier
    index是int合并请求序号
    version_id是int版本ID
    filepath否string文件路径
    +

    列表返回字段说明:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数类型字段说明
    file_numsint文件数量
    total_additionint新增行数
    total_deletionint删除行数
    files.namestring文件名称
    files.oldnamestring文件修改前名称
    files.additionint文件新增行数
    files.deletionint文件删除行数
    files.typeint文件类型 1: 新增 2: 更改 3: 删除 4: 重命名 5: 复制
    files.is_createdbool是否为新建文件
    files.is_deletedbool是否为删除文件
    files.is_binbool是否为二进制文件
    files.is_lfs_filebool是否为LFS文件
    files.is_renamedbool是否重命名
    files.is_ambiguousbool
    files.is_submodulebool是否为子模块
    files.sections.file_namestring文件名称
    files.sections.namestring
    files.sections.lines.left_indexint文件变动之前所在行数
    files.sections.lines.right_indexint文件变动之后所在行数
    files.sections.lines.matchint
    files.sections.lines.typeint文件变更类型
    files.sections.lines.contentstring文件变更内容
    files.sections.lines.section_pathstring文件路径
    files.sections.lines.section_last_left_indexint
    files.sections.lines.section_last_right_indexint
    files.sections.lines.section_left_indexint文件变更之前所在行数
    files.sections.lines.section_right_indexint文件变更之后所在行数(即：页面编辑器开始显示的行数)
    files.sections.lines.section_left_hunk_sizeint文件变更之前的行数
    files.sections.lines.section_right_hunk_sizeint文件变更之后的行数(及当前页面编辑器显示的总行数)
    files.is_incompletebool是否不完整
    files.is_incomplete_line_too_longbool文件是否不完整是因为太长了
    files.is_protectedbool文件是否被保护
    + +
    +

    列表返回的JSON示例:

    +
    +
    {
+    "file_nums": 29,
+    "total_addition": 5,
+    "total_deletion": 2,
+    "files": [
+        {
+            "name": "README.md",
+            "oldname": "README.md",
+            "addition": 1,
+            "deletion": 2,
+            "type": 2,
+            "is_created": false,
+            "is_deleted": false,
+            "is_bin": false,
+            "is_lfs_file": false,
+            "is_renamed": false,
+            "is_ambiguous": false,
+            "is_submodule": false,
+            "sections": [
+                {
+                    "file_name": "README.md",
+                    "name": "",
+                    "lines": [
+                        {
+                            "left_index": 0,
+                            "right_index": 0,
+                            "match": 0,
+                            "type": 4,
+                            "content": "@@ -1,2 +1 @@",
+                            "section_path": "README.md",
+                            "section_last_left_index": 0,
+                            "section_last_right_index": 0,
+                            "section_left_index": 1,
+                            "section_right_index": 1,
+                            "section_left_hunk_size": 2,
+                            "section_right_hunk_size": 0
+                        },
+                        {
+                            "left_index": 1,
+                            "right_index": 0,
+                            "match": 3,
+                            "type": 3,
+                            "content": "-# ceshi_commit"
+                        },
+                        {
+                            "left_index": 2,
+                            "right_index": 0,
+                            "match": -1,
+                            "type": 3,
+                            "content": "-"
+                        },
+                        {
+                            "left_index": 0,
+                            "right_index": 1,
+                            "match": 1,
+                            "type": 2,
+                            "content": "+adsa"
+                        }
+                    ]
+                },
+                {}
+            ],
+            "is_incomplete": false,
+            "is_incomplete_line_too_long": false,
+            "is_protected": false
+        }
+    ]
+}
+

    单个文件返回字段说明:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数类型字段说明
    namestring文件名称
    oldnamestring文件修改前名称
    additionint文件新增行数
    deletionint文件删除行数
    typeint文件类型 1: 新增 2: 更改 3: 删除 4: 重命名 5: 复制
    is_createdbool是否为新建文件
    is_deletedbool是否为删除文件
    is_binbool是否为二进制文件
    is_lfs_filebool是否为LFS文件
    is_renamedbool是否重命名
    is_ambiguousbool
    is_submodulebool是否为子模块
    sections.file_namestring文件名称
    sections.namestring
    sections.lines.left_indexint文件变动之前所在行数
    sections.lines.right_indexint文件变动之后所在行数
    sections.lines.matchint
    sections.lines.typeint文件变更类型
    sections.lines.contentstring文件变更内容
    sections.lines.section_pathstring文件路径
    sections.lines.section_last_left_indexint
    sections.lines.section_last_right_indexint
    sections.lines.section_left_indexint文件变更之前所在行数
    sections.lines.section_right_indexint文件变更之后所在行数(即：页面编辑器开始显示的行数)
    sections.lines.section_left_hunk_sizeint文件变更之前的行数
    sections.lines.section_right_hunk_sizeint文件变更之后的行数(及当前页面编辑器显示的总行数)
    is_incompletebool是否不完整
    is_incomplete_line_too_longbool文件是否不完整是因为太长了
    is_protectedbool文件是否被保护
    + +
    +

    单个文件返回的JSON示例:

    +
    +
    {
+    "name": "README.md",
+    "oldname": "README.md",
+    "addition": 1,
+    "deletion": 2,
+    "type": 2,
+    "is_created": false,
+    "is_deleted": false,
+    "is_bin": false,
+    "is_lfs_file": false,
+    "is_renamed": false,
+    "is_ambiguous": false,
+    "is_submodule": false,
+    "sections": [
+        {
+            "file_name": "README.md",
+            "name": "",
+            "lines": [
+                {
+                    "left_index": 0,
+                    "right_index": 0,
+                    "match": 0,
+                    "type": 4,
+                    "content": "@@ -1,2 +1 @@",
+                    "section_path": "README.md",
+                    "section_last_left_index": 0,
+                    "section_last_right_index": 0,
+                    "section_left_index": 1,
+                    "section_right_index": 1,
+                    "section_left_hunk_size": 2,
+                    "section_right_hunk_size": 0
+                },
+                {
+                    "left_index": 1,
+                    "right_index": 0,
+                    "match": 3,
+                    "type": 3,
+                    "content": "-# ceshi_commit"
+                },
+                {
+                    "left_index": 2,
+                    "right_index": 0,
+                    "match": -1,
+                    "type": 3,
+                    "content": "-"
+                },
+                {
+                    "left_index": 0,
+                    "right_index": 1,
+                    "match": 1,
+                    "type": 2,
+                    "content": "+adsa"
+                }
+            ]
+        },
+        {
+            "file_name": "README.md",
+            "name": "",
+            "lines": [
+                {
+                    "left_index": 0,
+                    "right_index": 0,
+                    "match": 0,
+                    "type": 4,
+                    "content": " ",
+                    "section_path": "README.md",
+                    "section_last_left_index": 0,
+                    "section_last_right_index": 1,
+                    "section_left_index": 3,
+                    "section_right_index": 2,
+                    "section_left_hunk_size": 0,
+                    "section_right_hunk_size": 0
+                }
+            ]
+        }
+    ],
+    "is_incomplete": false,
+    "is_incomplete_line_too_long": false,
+    "is_protected": false
+}

    Issues

    Organizations

    Teams

    Errors

  • @@ -12015,16 +12018,16 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json -

    Pulls

    Get a pull request

    +

    Pulls

    获取一个合并请求

    获取合并请求详情接口

    示例:

    -
    curl -X GET http://localhost:3000/api/Jasder/gitlink/pulls/88.json
-
    await octokit.request('GET /api/Jasder/gitlink/pulls/88.json')
+
    curl -X GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/1.json
+
    await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/1.json')
 
    HTTP 请求
    
-
    GET /api/:owner/:repo/pulls/:id.json
    
+
    GET /api/v1/:owner/:repo/pulls/:index.json
    
 
    请求参数:
    
 
@@ -12050,11 +12053,175 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 
-
+
-
+
+
+
    
 
    项目标识identifier
 
    
 
    idindex
 是
 
 integerpull id值pull 序号
    
+
    返回字段说明:
    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    参数类型字段说明
    ---
    idint合并请求ID
    headint合并请求源分支
    baseint合并请求目标分支
    indexint合并请求序号
    statusstring合并请求状态，open: 开启的, merged: 合并的, closed: 关闭的
    issue.idint疑修ID
    issue.authorobject疑修作者
    issue.prioritystring疑修优先级
    issue.versionstring疑修里程碑
    issue.journals_countint普通评论数量
    issue.issue_tagsarray标记
    journals_countint审查评论数量
    merge_basestring目标的commit ID
    base_commit_shastring合并之后的第一个commit ID
    head_commit_shastring源commit ID
    commit_numintcommit数量
    changed_filesint更改文件数量
    is_lockedbool
    mergeablebool是否能合并
    mergedbool是否合并
    merged_atstring合并时间
    merge_commit_shastring合并之后的第一个commit ID
    merge_byobject被谁合并了
    last_review.idint最后一个审查的id
    last_review.commit_idstring最后一个审查对应的commit ID
    last_review.contentstring最后一个审查的内容
    last_review.statusstring最后一个审查的状态，common: 一般审查, approved: 通过, rejected: 拒绝通过
    last_review.created_atstring审查创建的时间
    last_review.reviewerobject审查创建人
    conflict_filesarray有冲突的文件
 
    
 
    
 
@@ -12062,52 +12229,62 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json
 
    返回的JSON示例:
    
 
 
    {
-    "status": 0,
-    "message": "响应成功",
-    "project_name": "Gitlink",
-    "identifier": "forgeplus",
-    "project_identifier": "forgeplus",
-    "pr_time": "52分钟前",
-    "commits_count": 229,
-    "files_count": 328,
-    "comments_count": 0,
-    "comments_total_count": 0,
-    "pull_request": {
-        "id": 1189,
-        "base": "master",
-        "head": "develop",
-        "status": 0,
-        "fork_project_id": null,
-        "is_original": false,
-        "pull_request_staus": "open",
-        "fork_project_user": null,
-        "create_user": "jasder",
-        "mergeable": true,
-        "state": "open"
-    },
+    "id": 168,
+    "head": "new_branch",
+    "base": "master",
+    "is_original": false,
+    "index": 5,
+    "status": "merged",
     "issue": {
-        "id": 51888,
-        "subject": "FIx release v3.2.0",
-        "description": null,
-        "is_private": false,
-        "branch_name": null,
-        "project_author_name": "Gitlink",
-        "closed_on": "",
-        "created_at": "2021-10-12 15:51",
-        "assign_user_name": "victor",
-        "assign_user_login": "moshenglv",
-        "author_name": "段甲生",
-        "author_login": "jasder",
-        "author_picture": "images/avatars/User/36480?t=1615520120",
-        "issue_status": "新增",
-        "priority": "正常",
+        "id": 265,
+        "author": {
+            "id": 2,
+            "type": "User",
+            "name": "heh",
+            "login": "yystopf",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        },
+        "priority": null,
         "version": null,
+        "journals_count": 1,
         "issue_tags": null
     },
+    "journals_count": 0,
+    "merge_base": "4a277037093c1248e46d2946ee30b61cccdb9df9",
+    "base_commit_sha": "dbb510cd852a6bfd4d71a1f84921aa3170654590",
+    "head_commit_sha": "0f0e27918eb5deb8d514012d84d13db10eebe19a",
+    "commit_num": 1,
+    "changed_files": 1,
+    "is_locked": false,
+    "mergeable": true,
+    "merged": true,
+    "merged_at": 1658743004,
+    "merge_commit_sha": "dbb510cd852a6bfd4d71a1f84921aa3170654590",
+    "merge_by": {
+        "id": null,
+        "login": "yystopf",
+        "name": "yystopf",
+        "type": null,
+        "image_url": "system/lets/letter_avatars/2/Y/241_125_89/120.png"
+    },
+    "last_review": {
+        "id": 5,
+        "commit_id": null,
+        "content": "新建一个审查",
+        "status": "common",
+        "created_at": "2022-07-25 17:08",
+        "reviewer": {
+            "id": 2,
+            "type": "User",
+            "name": "heh",
+            "login": "yystopf",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        }
+    },
     "conflict_files": []
 }
-
    获取pull request文件列表
    
-
    获取pull request文件列表
    
+

    获取合并请求文件列表

    +

    获取合并请求文件列表

    示例:

    @@ -12145,7 +12322,7 @@ http://localhost:3000/api/Jason/gitlink/pulls/1/files.json pull request's id -

    返回字段说明:

    +

    返回字段说明:

    @@ -12372,8 +12549,8 @@ http://localhost:3000/api/Jason/gitlink/pulls/1/files.json } ] } -

    获取pull request的commits列表

    -

    获取pull request的commits列表

    +

    获取合并请求的commits列表

    +

    获取合并请求的commits列表

    示例:

    @@ -12410,7 +12587,7 @@ http://localhost:3000/api/Jason/gitlink/pulls/1/files.json
    参数 pull request's id
    -

    返回字段说明:

    +

    返回字段说明:

    @@ -12564,7 +12741,7 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop
    参数pull request's id
    -

    返回字段说明:

    +

    返回字段说明:

    @@ -12880,16 +13057,16 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop } ] } -

    List pull requests

    +

    获取合并请求列表

    获取合并请求列表

    示例:

    -
    curl -X GET http://localhost:3000/api/Jasder/gitlink/pulls.json
-
    await octokit.request('GET /api/Jasder/gitlink/pulls.json')
+
    curl -X GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls.json
+
    await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls.json')
 
    HTTP 请求
    
-
    GET /api/:owner/:repo/pulls.json
    
+
    GET /api/v1/:owner/:repo/pulls.json
    
 
    请求参数:
    参数
    @@ -12915,47 +13092,164 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop
    项目标识identifier
    +

    返回字段说明:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数类型字段说明
    ---
    total_countint合并请求总数
    idint合并请求ID
    headint合并请求源分支
    baseint合并请求目标分支
    indexint合并请求序号
    is_originalbool是否为fork仓库发来的合并请求
    statusstring合并请求状态，open: 开启的, merged: 合并的, closed: 关闭的
    fork_project.idintfork仓库的id
    fork_project.identifierstringfork仓库的标识
    fork_project.loginstringfork仓库拥有者的标识
    issue.idint疑修ID
    issue.authorobject疑修作者
    issue.prioritystring疑修优先级
    issue.versionstring疑修里程碑
    issue.journals_countint普通评论数量
    issue.issue_tagsarray标记
    journals_countint审查评论数量

    返回的JSON示例:

    {
-  "status": 0,
-  "message": "响应成功",
-  "open_count": 4,
-  "close_count": 51,
-  "merged_issues_size": 123,
-  "search_count": 4,
-  "limit": null,
-  "user_admin_or_member": true,
-  "user_admin_or_developer": true,
-  "project_name": "Gitlink",
-  "project_author_name": "Gitlink",
-  "issues": [
-    {
-      "pull_request_id": 1189,
-      "pull_request_status": 0,
-      "pull_request_head": "develop",
-      "pull_request_base": "master",
-      "pull_request_staus": "open",
-      "is_original": false,
-      "fork_project_id": null,
-      "fork_project_identifier": null,
-      "fork_project_user": null,
-      "id": 51888,
-      "name": "FIx release v3.2.0",
-      "pr_time": "59分钟前",
-      "assign_user_name": "victor",
-      "assign_user_login": "moshenglv",
-      "author_name": "段甲生",
-      "author_login": "jasder",
-      "avatar_url": "images/avatars/User/36480?t=1615520120",
-      "priority": "正常",
-      "version": null,
-      "journals_count": 0,
-      "issue_tags": null
-    }
-  ]
+    "total_count": 2,
+    "pulls": [
+        {
+            "id": 167,
+            "head": "master",
+            "base": "master",
+            "is_original": true,
+            "index": 4,
+            "status": "open",
+            "fork_project": {
+                "id": 491,
+                "identifier": "ceshi_commit",
+                "login": "testforge1"
+            },
+            "issue": {
+                "id": 264,
+                "author": {
+                    "id": 4,
+                    "type": "User",
+                    "name": "tes tforge1",
+                    "login": "testforge1",
+                    "image_url": "system/lets/letter_avatars/2/T/238_117_19/120.png"
+                },
+                "priority": null,
+                "version": null,
+                "journals_count": 0,
+                "issue_tags": null
+            },
+            "journals_count": 0
+        },
+        {
+            "id": 165,
+            "head": "master_1",
+            "base": "master",
+            "is_original": false,
+            "index": 3,
+            "status": "open",
+            "issue": {
+                "id": 262,
+                "author": {
+                    "id": 2,
+                    "type": "User",
+                    "name": "heh",
+                    "login": "yystopf",
+                    "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+                },
+                "priority": null,
+                "version": null,
+                "journals_count": 0,
+                "issue_tags": null
+            },
+            "journals_count": 0
+        }
+    ]
 }

    获取合并请求版本列表

    获取合并请求版本列表

    @@ -12999,7 +13293,7 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop 合并请求序号 -

    返回字段说明:

    +

    返回字段说明:

    @@ -13621,7 +13915,244 @@ http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json "is_incomplete_line_too_long": false, "is_protected": false } -

    Issues

    Organizations

    Teams

    Errors

    +

    为合并请求创建一个审查

    +

    合并请求创建一个审查

    + +
    +

    示例:

    +
    +
    curl -X POST \
+http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/reviews.json
+
    await octokit.request('POST /api/v1/yystopf/ceshi/pulls/1/reviews.json')
+

    HTTP 请求

    +

    POST /api/v1/:owner/:repo/pulls/:index/reviews.json

    +

    请求参数:

    +
    参数
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数必选默认类型字段说明
    owner是string用户登录名
    repo是string项目标识identifier
    index是integer合并请求序号
    content否string审查内容
    commit_id否string当前合并请求的commit_id
    status是string审查类型, common: 普通, approved: 通过, rejected: 拒绝
    + +
    +

    请求的JSON示例:

    +
    +
    {
+    "content": "新建一个审查",
+    "commit_id": "e506844b2467ce25a35dd46dad8236a1595a02da",
+    "status": "common"
+}
+

    返回字段说明:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数类型字段说明
    reviewerobject审查者
    pull_request.idinteger合并请求ID
    pull_request.headstring合并请求源分支
    pull_request.basestring合并请求目标分支
    pull_request.is_originalstring合并请求是否从fork仓库所来
    pull_request.fork_project.idintfork仓库的id
    pull_request.fork_project.identifierstringfork仓库的标识
    pull_request.fork_project.loginstringfork仓库拥有者的标识
    pull_request.indexstring合并请求的序号
    pull_request.statusstring合并请求的状态，open: 打开的, merged: 合并的, closed: 关闭的
    pull_request.issue.idinteger合并请求下疑修的ID
    pull_request.issue.authorobject合并请求以及疑修的创建着
    pull_request.issue.prioritystring疑修的优先级
    pull_request.issue.versionstring疑修的里程碑
    pull_request.issue.journals_countinteger普通评论数量
    pull_request.issue.issue_tagsarray所属标记
    pull_request.journals_countinteger审查评论数量
    idinteger审查ID
    commit_idstring审查的commit ID
    contentstring审查的内容
    statusstring审查类型，common: 普通, approved: 通过，rejected: 拒绝通过
    created_atstring审查创建时间
    + +
    +

    返回的JSON示例:

    +
    +
    {
+    "reviewer": {
+        "id": 2,
+        "type": "User",
+        "name": "heh",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+    },
+    "pull_request": {
+        "id": 163,
+        "head": "master_1",
+        "base": "master",
+        "is_original": false,
+        "index": 1,
+        "status": "closed",
+        "issue": {
+            "id": 260,
+            "author": {
+                "id": 2,
+                "type": "User",
+                "name": "heh",
+                "login": "yystopf",
+                "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+            },
+            "priority": null,
+            "version": null,
+            "journals_count": 0,
+            "issue_tags": null
+        },
+        "journals_count": 6
+    },
+    "id": 10,
+    "commit_id": "e506844b2467ce25a35dd46dad8236a1595a02da",
+    "content": "新建一个审查",
+    "status": "common",
+    "created_at": "2022-07-26 11:45"
+}
+
    + +

    Issues

    Organizations

    Teams

    Errors

    From e72273f3b2e366105a49b4ede3a68a6bc37485c0 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 26 Jul 2022 14:29:12 +0800 Subject: [PATCH 20/53] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E8=AF=A6=E6=83=85=E4=B8=ADreview=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=9C=80=E6=96=B0=E7=9A=84=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/projects/pulls_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/v1/projects/pulls_controller.rb b/app/controllers/api/v1/projects/pulls_controller.rb index a930df760..c93cd8bd8 100644 --- a/app/controllers/api/v1/projects/pulls_controller.rb +++ b/app/controllers/api/v1/projects/pulls_controller.rb @@ -10,7 +10,7 @@ class Api::V1::Projects::PullsController < Api::V1::BaseController def show @result_object = Api::V1::Projects::Pulls::GetService.call(@project, @pull_request, current_user&.gitea_token) - @last_review = @pull_request.reviews.take + @last_review = @pull_request.reviews.order(created_at: :desc).take end private From 6183f1f76d8af1446fedb5deca0e655fe6ecd3d0 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 26 Jul 2022 14:38:41 +0800 Subject: [PATCH 21/53] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E7=BC=BA=E5=B0=91t?= =?UTF-8?q?itle=E5=92=8Cbody?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/docs/slate/source/includes/_pulls.md | 6 ++++ .../api/v1/projects/pulls/list_service.rb | 2 +- .../pulls/_simple_detail.json.jbuilder | 2 +- public/docs/api.html | 30 +++++++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/app/docs/slate/source/includes/_pulls.md b/app/docs/slate/source/includes/_pulls.md index 650ad8a0d..dda761cad 100644 --- a/app/docs/slate/source/includes/_pulls.md +++ b/app/docs/slate/source/includes/_pulls.md @@ -30,6 +30,8 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/1.json') --------- | ----------- | ----------- |-|-|-| |id |int|合并请求ID| +|title |string|合并请求标题| +|body| |string|合并请求内容| |head |int|合并请求源分支| |base |int|合并请求目标分支| |index |int|合并请求序号| @@ -505,6 +507,8 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls.json') |-|-|-| |total_count |int|合并请求总数| |id |int|合并请求ID| +|title |string|合并请求标题| +|body |string|合并请求内容| |head |int|合并请求源分支| |base |int|合并请求目标分支| |index |int|合并请求序号| @@ -939,6 +943,8 @@ await octokit.request('POST /api/v1/yystopf/ceshi/pulls/1/reviews.json') --------- | ----------- | ----------- |reviewer |object |审查者 | |pull_request.id |integer|合并请求ID| +|pull_request.title |string|合并请求标题| +|pull_request.body |string|合并请求内容| |pull_request.head |string|合并请求源分支| |pull_request.base |string|合并请求目标分支| |pull_request.is_original |string|合并请求是否从fork仓库所来| diff --git a/app/services/api/v1/projects/pulls/list_service.rb b/app/services/api/v1/projects/pulls/list_service.rb index 6b18da2ce..4a1d6a2f6 100644 --- a/app/services/api/v1/projects/pulls/list_service.rb +++ b/app/services/api/v1/projects/pulls/list_service.rb @@ -11,7 +11,7 @@ class Api::V1::Projects::Pulls::ListService < ApplicationService def initialize(project, params={}) @project = project @keyword = params[:keyword] - @status = params[:status].to_i + @status = params[:status].present? ? params[:status].to_i : nil @priority_id = params[:priority_id] @issue_tag_id = params[:issue_tag_id] @version_id = params[:version_id] diff --git a/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder index 93cba2e47..d07180851 100644 --- a/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder +++ b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder @@ -1,4 +1,4 @@ -json.(pull, :id, :head, :base, :is_original) +json.(pull, :id, :title, :body, :head, :base, :is_original) json.index pull.gitea_number json.status pull.status == 1 ? "merged" : (pull.status == 2 ? "closed" : "open") diff --git a/public/docs/api.html b/public/docs/api.html index 967ed2335..ce1fea111 100644 --- a/public/docs/api.html +++ b/public/docs/api.html @@ -12079,6 +12079,16 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json 合并请求ID +title +string +合并请求标题 + + +body + +string + + head int 合并请求源分支 @@ -13116,6 +13126,16 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop 合并请求ID +title +string +合并请求标题 + + +body +string +合并请求内容 + + head int 合并请求源分支 @@ -14007,6 +14027,16 @@ http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/reviews.json 合并请求ID +pull_request.title +string +合并请求标题 + + +pull_request.body +string +合并请求内容 + + pull_request.head string 合并请求源分支 From 4686b5241ee4cbf09cfdcf3d4990668fa3d62a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 26 Jul 2022 15:44:04 +0800 Subject: [PATCH 22/53] =?UTF-8?q?fixed=20=E5=90=8C=E6=AD=A5=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E5=A2=9E=E5=8A=A0gitlink-url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ob_repository_syncs_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/ob_repository_syncs_controller.rb b/app/controllers/ob_repository_syncs_controller.rb index 013e6fe55..0f1c64b1b 100644 --- a/app/controllers/ob_repository_syncs_controller.rb +++ b/app/controllers/ob_repository_syncs_controller.rb @@ -13,7 +13,7 @@ class ObRepositorySyncsController < ApplicationController tip_exception "参数错误" if params[:github_address].blank? && params[:gitee_address].blank? project_name ="#{@project.owner.name}:#{@project.identifier}" service = ObRepositorySync::ApiService.new(project_name) - params.merge({ "gitlink_address": @project.repository.url }) + params = params.merge({ "gitlink_address": @project.repository.url }) res = service.create_projects(params) tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200" sync_id = res["data"]["id"] @@ -23,6 +23,7 @@ class ObRepositorySyncsController < ApplicationController ob_repository_sync.name = project_name ob_repository_sync.github_address = "#{params[:github_address]}" ob_repository_sync.gitee_address = "#{params[:gitee_address]}" + ob_repository_sync.gitlink_address = @project.repository.url ob_repository_sync.github_token = "#{params[:github_token]}" ob_repository_sync.gitee_token = "#{params[:gitee_token]}" ob_repository_sync.sync_id = sync_id From 5be93d5de894e704c1ba0573711aaa4baa6f7aa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 26 Jul 2022 16:32:53 +0800 Subject: [PATCH 23/53] =?UTF-8?q?=E5=85=B3=E9=97=ADrack-mini-profiler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 82aa95879..1c937aa79 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -20,9 +20,9 @@ class ApplicationController < ActionController::Base # TODO # check sql query time before_action do - if request.subdomain === 'testforgeplus' || request.subdomain === "profiler" - Rack::MiniProfiler.authorize_request - end + # if request.subdomain === 'testforgeplus' || request.subdomain === "profiler" + # Rack::MiniProfiler.authorize_request + # end end DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z) From a35db9fe80711bfa4ddfad9af6c1530ab8314b8e Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 26 Jul 2022 16:45:53 +0800 Subject: [PATCH 24/53] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Areviewers?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_requests_controller.rb | 5 + app/docs/slate/source/includes/_pulls.md | 98 +++++++++++++++++++ .../api/v1/projects/pulls/list_service.rb | 4 +- app/services/issues/list_query_service.rb | 1 + .../pulls/_simple_detail.json.jbuilder | 1 + app/views/pull_requests/_detail.json.jbuilder | 2 +- app/views/pull_requests/edit.json.jbuilder | 1 + app/views/pull_requests/index.json.jbuilder | 3 +- app/views/pull_requests/show.json.jbuilder | 1 + 9 files changed, 113 insertions(+), 3 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 8bbfdc230..c16431461 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -62,6 +62,8 @@ class PullRequestsController < ApplicationController @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params) if @gitea_pull_request[:status] == :success @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"]) + reviewers = User.where(id: params[:reviewer_ids]) + @pull_request.reviewers = reviewers SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @pull_request&.id) if Site.has_notice_menu? SendTemplateMessageJob.perform_later('ProjectPullRequest', current_user.id, @pull_request&.id) if Site.has_notice_menu? Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}" @@ -107,6 +109,9 @@ class PullRequestsController < ApplicationController end end + reviewers = User.where(id: params[:reviewer_ids]) + @pull_request.reviewers = reviewers + if @issue.update_attributes(@issue_params) if @pull_request.update_attributes(@local_params.compact) gitea_pull = Gitea::PullRequest::UpdateService.call(@owner.login, @repository.identifier, diff --git a/app/docs/slate/source/includes/_pulls.md b/app/docs/slate/source/includes/_pulls.md index dda761cad..ccc6e0911 100644 --- a/app/docs/slate/source/includes/_pulls.md +++ b/app/docs/slate/source/includes/_pulls.md @@ -60,6 +60,7 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/1.json') |last_review.status |string|最后一个审查的状态，common: 一般审查, approved: 通过, rejected: 拒绝通过| |last_review.created_at|string|审查创建的时间| |last_review.reviewer |object|审查创建人| +|reviewers |array|指定审查用户标识数组| |conflict_files |array|有冲突的文件| > 返回的JSON示例: @@ -118,6 +119,9 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/1.json') "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" } }, + "reviewers": [ + "yystopf" + ], "conflict_files": [] } ``` @@ -586,6 +590,100 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls.json') } ``` +## 创建一个合并请求 +为仓库创建一个合并请求 + +> 示例: + +```shell +curl -X POST \ +http://localhost:3000/api/yystopf/ceshi/pulls.json +``` + +```javascript +await octokit.request('POST /api/yystopf/ceshi/pulls.json') +``` + +### HTTP 请求 +`POST /api/:owner/:repo/pulls.json` + +### 请求参数: +参数 | 必选 | 默认 | 类型 | 字段说明 +--------- | ------- | ------- | -------- | ---------- +|owner |是| | string |用户登录名 | +|repo |是| | string |项目标识identifier | +|title |是| | string |合并请求标题| +|body |否| | string |合并请求内容| +|base |是| | string |目标分支| +|head |是| | string |源分支| +|is_original |是| | bool |是否为fork仓库发来的合并请求| +|fork_project_id |否| | integer|fork仓库ID| +|reviewer_ids |否| | array |审查人员id数组| +|assigned_to_id |否| | integer|指派人员ID| +|fixed_version_id |否| | integer|里程碑ID| +|issue_tag_ids |否| | array |标记ID数组| +|priority_id |否| | integer|优先级ID| +|receivers_login |否| | array |@人员的login| + +> 请求的JSON示例: + +```json +{ + "title": "324", + "assigned_to_id": "2", + "fixed_version_id": "", + "issue_tag_ids": [], + "priority_id": "2", + "body": "312", + "head": "new_branch_1", + "base": "master", + "is_original": false, + "fork_project_id": "", + "files_count": 1, + "commits_count": 1, + "reviewer_ids": [], + "receivers_login": [] +} +``` + +> 返回的JSON示例: + +```json +{ + "status": 0, + "message": "响应成功", + "pull_request_id": 169, + "pull_request_number": 6, + "pull_request_status": 0, + "pull_request_head": "new_branch_1", + "pull_request_base": "master", + "pull_request_staus": "open", + "is_original": false, + "fork_project_id": null, + "fork_project_identifier": null, + "fork_project_user": null, + "reviewers": [ + "yystopf" + ], + "id": 266, + "name": "324", + "pr_time": "1分钟前", + "assign_user_name": "heh", + "assign_user_login": "yystopf", + "author_name": "heh", + "author_login": "yystopf", + "avatar_url": "system/lets/letter_avatars/2/H/188_239_142/120.png", + "priority": "正常", + "version": null, + "journals_count": 0, + "issue_tags": null +} +``` + + + ## 获取合并请求版本列表 获取合并请求版本列表 diff --git a/app/services/api/v1/projects/pulls/list_service.rb b/app/services/api/v1/projects/pulls/list_service.rb index 4a1d6a2f6..def8a86ba 100644 --- a/app/services/api/v1/projects/pulls/list_service.rb +++ b/app/services/api/v1/projects/pulls/list_service.rb @@ -1,7 +1,7 @@ class Api::V1::Projects::Pulls::ListService < ApplicationService include ActiveModel::Model - attr_reader :project, :keyword, :status, :priority_id, :issue_tag_id, :version_id, :reviewer_id, :sort_by, :sort_direction + attr_reader :project, :keyword, :status, :priority_id, :issue_tag_id, :version_id, :reviewer_id, :assign_user_id, :sort_by, :sort_direction attr_accessor :queried_pull_requests validates :status, inclusion: {in: [0, 1, 2], message: "请输入正确的Status"}, allow_nil: true @@ -16,6 +16,7 @@ class Api::V1::Projects::Pulls::ListService < ApplicationService @issue_tag_id = params[:issue_tag_id] @version_id = params[:version_id] @reviewer_id = params[:reviewer_id] + @assign_user_id = params[:assign_user_id] @sort_by = params[:sort_by] || 'created_at' @sort_direction = params[:sort_direction] || 'desc' end @@ -36,6 +37,7 @@ class Api::V1::Projects::Pulls::ListService < ApplicationService pull_requests = pull_requests.where(issue_tags: {id: issue_tag_id}) if issue_tag_id.present? pull_requests = pull_requests.where(issues: {fixed_version_id: version_id}) if version_id.present? pull_requests = pull_requests.where(users: {id: reviewer_id}) if reviewer_id.present? + pull_requests = pull_requests.where(issues: {assigned_to_id: assign_user_id}) if assign_user_id.present? q = pull_requests.ransack(title_or_body_cont: keyword) scope = q.result.includes(:fork_project, :journals, :reviews, :reviewers, issue: [:journals, :priority, :version, :issue_tags]) diff --git a/app/services/issues/list_query_service.rb b/app/services/issues/list_query_service.rb index 73f0b438e..bed8c4837 100644 --- a/app/services/issues/list_query_service.rb +++ b/app/services/issues/list_query_service.rb @@ -15,6 +15,7 @@ class Issues::ListQueryService < ApplicationService end_time = params[:due_date] issues = all_issues.issue_index_includes + issues = issues.includes(pull_request: :reviewers) if status_type.to_s == "2" #表示关闭中的 issues = issues.where(status_id: 5) elsif status_type.to_s == "1" diff --git a/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder index d07180851..a4c3c03bc 100644 --- a/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder +++ b/app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder @@ -22,4 +22,5 @@ json.issue do json.issue_tags issue.get_issue_tags end +json.reviewers pull.reviewers.pluck(:login) json.journals_count pull.journals.count \ No newline at end of file diff --git a/app/views/pull_requests/_detail.json.jbuilder b/app/views/pull_requests/_detail.json.jbuilder index 5c9347420..814c078ef 100644 --- a/app/views/pull_requests/_detail.json.jbuilder +++ b/app/views/pull_requests/_detail.json.jbuilder @@ -9,7 +9,7 @@ json.is_original pr.is_original json.fork_project_id pr&.fork_project_id json.fork_project_identifier pr&.fork_project&.identifier json.fork_project_user pr&.fork_project&.owner.try(:login) - +json.reviewers pr&.reviewers.pluck(:login) json.id issue.id json.name issue.subject diff --git a/app/views/pull_requests/edit.json.jbuilder b/app/views/pull_requests/edit.json.jbuilder index c6f41559c..683b1961c 100644 --- a/app/views/pull_requests/edit.json.jbuilder +++ b/app/views/pull_requests/edit.json.jbuilder @@ -12,3 +12,4 @@ json.issue_tag_ids @issue&.issue_tags_value&.split(",") json.commits_count @pull_request.commits_count json.files_count @pull_request.files_count json.comments_count @pull_request.comments_count +json.reviewers @pull_request.reviewers.pluck(:login) \ No newline at end of file diff --git a/app/views/pull_requests/index.json.jbuilder b/app/views/pull_requests/index.json.jbuilder index d37901ef8..ace52945c 100644 --- a/app/views/pull_requests/index.json.jbuilder +++ b/app/views/pull_requests/index.json.jbuilder @@ -24,7 +24,8 @@ json.issues do json.fork_project_identifier pr&.fork_project&.identifier json.fork_project_user pr&.fork_project&.owner.try(:login) json.fork_project_user_name pr&.fork_project&.owner.try(:show_real_name) - + json.reviewers pr.reviewers.pluck(:login) + json.id issue.id json.name issue.subject json.pr_time time_from_now(pr.status == 1 ? pr.updated_at : issue.updated_on) diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder index 684a60e9c..27c393de5 100644 --- a/app/views/pull_requests/show.json.jbuilder +++ b/app/views/pull_requests/show.json.jbuilder @@ -30,6 +30,7 @@ json.pull_request do json.create_user @pull_request&.user&.login json.mergeable @gitea_pull["mergeable"] json.state @gitea_pull["state"] + json.reviewers @pull_request.reviewers.pluck(:login) end json.issue do From df5efa0dc64836ca01f1975e26d3de6f05052fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 26 Jul 2022 17:08:05 +0800 Subject: [PATCH 25/53] =?UTF-8?q?fixed=20=E9=82=AE=E7=AE=B1=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E6=AD=A3=E5=88=99=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ob_repository_syncs_controller.rb | 3 ++- app/libs/custom_regexp.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/ob_repository_syncs_controller.rb b/app/controllers/ob_repository_syncs_controller.rb index 013e6fe55..0f1c64b1b 100644 --- a/app/controllers/ob_repository_syncs_controller.rb +++ b/app/controllers/ob_repository_syncs_controller.rb @@ -13,7 +13,7 @@ class ObRepositorySyncsController < ApplicationController tip_exception "参数错误" if params[:github_address].blank? && params[:gitee_address].blank? project_name ="#{@project.owner.name}:#{@project.identifier}" service = ObRepositorySync::ApiService.new(project_name) - params.merge({ "gitlink_address": @project.repository.url }) + params = params.merge({ "gitlink_address": @project.repository.url }) res = service.create_projects(params) tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200" sync_id = res["data"]["id"] @@ -23,6 +23,7 @@ class ObRepositorySyncsController < ApplicationController ob_repository_sync.name = project_name ob_repository_sync.github_address = "#{params[:github_address]}" ob_repository_sync.gitee_address = "#{params[:gitee_address]}" + ob_repository_sync.gitlink_address = @project.repository.url ob_repository_sync.github_token = "#{params[:github_token]}" ob_repository_sync.gitee_token = "#{params[:gitee_token]}" ob_repository_sync.sync_id = sync_id diff --git a/app/libs/custom_regexp.rb b/app/libs/custom_regexp.rb index e778c5499..889da4df8 100644 --- a/app/libs/custom_regexp.rb +++ b/app/libs/custom_regexp.rb @@ -1,6 +1,6 @@ module CustomRegexp PHONE = /1\d{10}/ - EMAIL = /\A[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+\z/ + EMAIL = /\A[a-zA-Z0-9]+([._\-\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+\z/ LOGIN = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]{4,15}\z/ #只含有数字、字母、下划线不能以下划线开头和结尾 LASTNAME = /\A[a-zA-Z0-9\u4e00-\u9fa5]+\z/ NICKNAME = /\A[\u4e00-\u9fa5_a-zA-Z0-9]+\z/ From bcea5bc66908fb6b5ca95a2eeb8e9d52daba57e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 26 Jul 2022 17:11:46 +0800 Subject: [PATCH 26/53] =?UTF-8?q?fixed=20=E9=82=AE=E7=AE=B1=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E6=AD=A3=E5=88=99=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/libs/custom_regexp.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/libs/custom_regexp.rb b/app/libs/custom_regexp.rb index e778c5499..889da4df8 100644 --- a/app/libs/custom_regexp.rb +++ b/app/libs/custom_regexp.rb @@ -1,6 +1,6 @@ module CustomRegexp PHONE = /1\d{10}/ - EMAIL = /\A[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+\z/ + EMAIL = /\A[a-zA-Z0-9]+([._\-\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+\z/ LOGIN = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]{4,15}\z/ #只含有数字、字母、下划线不能以下划线开头和结尾 LASTNAME = /\A[a-zA-Z0-9\u4e00-\u9fa5]+\z/ NICKNAME = /\A[\u4e00-\u9fa5_a-zA-Z0-9]+\z/ From d8d841d8001bdd5493259298853355b215c635d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 26 Jul 2022 18:10:35 +0800 Subject: [PATCH 27/53] =?UTF-8?q?fixed=20reposyncer=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ob_repository_syncs_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/ob_repository_syncs_controller.rb b/app/controllers/ob_repository_syncs_controller.rb index 0f1c64b1b..a60d43cb5 100644 --- a/app/controllers/ob_repository_syncs_controller.rb +++ b/app/controllers/ob_repository_syncs_controller.rb @@ -23,7 +23,6 @@ class ObRepositorySyncsController < ApplicationController ob_repository_sync.name = project_name ob_repository_sync.github_address = "#{params[:github_address]}" ob_repository_sync.gitee_address = "#{params[:gitee_address]}" - ob_repository_sync.gitlink_address = @project.repository.url ob_repository_sync.github_token = "#{params[:github_token]}" ob_repository_sync.gitee_token = "#{params[:gitee_token]}" ob_repository_sync.sync_id = sync_id From f3233b145bed7b8c3f30fb2936ac8b0bd4de9089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 26 Jul 2022 18:11:09 +0800 Subject: [PATCH 28/53] =?UTF-8?q?fixed=20reposyncer=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ob_repository_syncs_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/ob_repository_syncs_controller.rb b/app/controllers/ob_repository_syncs_controller.rb index a60d43cb5..54986a101 100644 --- a/app/controllers/ob_repository_syncs_controller.rb +++ b/app/controllers/ob_repository_syncs_controller.rb @@ -13,8 +13,8 @@ class ObRepositorySyncsController < ApplicationController tip_exception "参数错误" if params[:github_address].blank? && params[:gitee_address].blank? project_name ="#{@project.owner.name}:#{@project.identifier}" service = ObRepositorySync::ApiService.new(project_name) - params = params.merge({ "gitlink_address": @project.repository.url }) - res = service.create_projects(params) + project_params = params.merge({ "gitlink_address": @project.repository.url }) + res = service.create_projects(project_params) tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200" sync_id = res["data"]["id"] ob_repository_sync = ObRepositorySync.find_or_initialize_by(project_id: @project.id) From d6c6ac9a0a616a90b48fcf0bd20453c42a4cf4b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 26 Jul 2022 18:13:29 +0800 Subject: [PATCH 29/53] =?UTF-8?q?fixed=20reposyncer=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0gitlink?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/ob_repository_sync/api_service.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/services/ob_repository_sync/api_service.rb b/app/services/ob_repository_sync/api_service.rb index 7bed888e6..5e93c70e8 100644 --- a/app/services/ob_repository_sync/api_service.rb +++ b/app/services/ob_repository_sync/api_service.rb @@ -15,7 +15,9 @@ class ObRepositorySync::ApiService < ApplicationService "github_address": "#{params[:github_address]}", "gitee_address": "#{params[:gitee_address]}", "github_token": "#{params[:github_token]}", - "gitee_token": "#{params[:gitee_token]}" + "gitee_token": "#{params[:gitee_token]}", + "gitlink_address": "#{params[:gitlink_address]}", + "gitlink_token": "#{params[:gitlink_token]}" } url = URI("#{domain}/cerobot/projects") http = Net::HTTP.new(url.host, url.port) From d6b5dc326af7b35a3f2d9e729dc97d0e4f40b911 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Jul 2022 14:52:49 +0800 Subject: [PATCH 30/53] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E7=9B=B8=E5=85=B3api=E6=A0=B9=E6=8D=AE=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v1/projects/pulls/comments_controller.rb | 2 - .../v1/projects/pulls/journals_controller.rb | 39 ++++ .../v1/projects/pulls/reviews_controller.rb | 2 +- app/controllers/reviews_controller.rb | 2 +- app/models/journal.rb | 13 ++ .../projects/pulls/journals/create_service.rb | 48 +++++ .../projects/pulls/journals/list_service.rb | 45 ++++ .../projects/pulls/journals/update_service.rb | 38 ++++ .../projects/pulls/reviews/create_service.rb | 7 +- .../api/v1/users/projects/list_service.rb | 2 +- .../journals/_simple_detail.json.jbuilder | 21 ++ .../pulls/journals/create.json.jbuilder | 1 + .../pulls/journals/index.json.jbuilder | 4 + .../pulls/journals/update.json.jbuilder | 1 + .../reviews/_simple_detail.json.jbuilder | 8 + config/routes/api.rb | 1 + ...0220726090342_add_line_code_to_journals.rb | 13 ++ public/docs/api.html | 202 +++++++++++++++++- 18 files changed, 432 insertions(+), 17 deletions(-) delete mode 100644 app/controllers/api/v1/projects/pulls/comments_controller.rb create mode 100644 app/controllers/api/v1/projects/pulls/journals_controller.rb create mode 100644 app/services/api/v1/projects/pulls/journals/create_service.rb create mode 100644 app/services/api/v1/projects/pulls/journals/list_service.rb create mode 100644 app/services/api/v1/projects/pulls/journals/update_service.rb create mode 100644 app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder create mode 100644 app/views/api/v1/projects/pulls/journals/create.json.jbuilder create mode 100644 app/views/api/v1/projects/pulls/journals/index.json.jbuilder create mode 100644 app/views/api/v1/projects/pulls/journals/update.json.jbuilder create mode 100644 app/views/api/v1/projects/pulls/reviews/_simple_detail.json.jbuilder create mode 100644 db/migrate/20220726090342_add_line_code_to_journals.rb diff --git a/app/controllers/api/v1/projects/pulls/comments_controller.rb b/app/controllers/api/v1/projects/pulls/comments_controller.rb deleted file mode 100644 index 8622c3190..000000000 --- a/app/controllers/api/v1/projects/pulls/comments_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Api::V1::Projects::Pulls::CommentsController < Api::V1::Projects::Pulls::BaseController -end \ No newline at end of file diff --git a/app/controllers/api/v1/projects/pulls/journals_controller.rb b/app/controllers/api/v1/projects/pulls/journals_controller.rb new file mode 100644 index 000000000..76fa30c9d --- /dev/null +++ b/app/controllers/api/v1/projects/pulls/journals_controller.rb @@ -0,0 +1,39 @@ +class Api::V1::Projects::Pulls::JournalsController < Api::V1::Projects::Pulls::BaseController + + def index + @journals = Api::V1::Projects::Pulls::Journals::ListService.call(@project, @pull_request, params, current_user) + @journals = kaminari_paginate(@journals) + end + + def create + @journal = Api::V1::Projects::Pulls::Journals::CreateService.call(@project, @pull_request, create_params, current_user) + end + + before_action :find_journal, only: [:update, :destroy] + + def update + @journal = Api::V1::Projects::Pulls::Journals::UpdateService.call(@project, @pull_request, @journal, update_params, current_user) + end + + def destroy + if @journal.destroy + render_ok + else + render_error("删除评论失败！") + end + end + + private + def create_params + params.permit(:parent_id, :line_code, :note, :commit_id, :path, :type, :review_id, :diff => {}) + end + + def update_params + params.permit(:note, :commit_id, :state) + end + + def find_journal + @journal = Journal.find_by_id(params[:id]) + end + +end \ No newline at end of file diff --git a/app/controllers/api/v1/projects/pulls/reviews_controller.rb b/app/controllers/api/v1/projects/pulls/reviews_controller.rb index 523137a86..039a6c4df 100644 --- a/app/controllers/api/v1/projects/pulls/reviews_controller.rb +++ b/app/controllers/api/v1/projects/pulls/reviews_controller.rb @@ -8,7 +8,7 @@ class Api::V1::Projects::Pulls::ReviewsController < Api::V1::Projects::Pulls::Ba before_action :require_reviewer, only: [:create] def create - @journal, @review = Api::V1::Projects::Pulls::Reviews::CreateService.call(@project, @pull_request, review_params, current_user) + @review = Api::V1::Projects::Pulls::Reviews::CreateService.call(@project, @pull_request, review_params, current_user) end private diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index e12016904..b5fedfae0 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -5,7 +5,7 @@ class ReviewsController < ApplicationController def create return render_forbidden('您不是审查人员，无法进行审查！') if current_user&.id != @pull_request.issue.assigned_to_id - @journal, @review = Api::V1::Projects::Pulls::Reviews::CreateService.call(@project, @pull_request, review_params, current_user) + @review = Api::V1::Projects::Pulls::Reviews::CreateService.call(@project, @pull_request, review_params, current_user) end private diff --git a/app/models/journal.rb b/app/models/journal.rb index 19fdce1c9..48721bfd2 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -13,6 +13,15 @@ # comments_count :integer default("0") # reply_id :integer # review_id :integer +# commit_id :string(255) +# diff :text(4294967295) +# line_code :string(255) +# path :string(255) +# state :integer default("0") +# resolve_at :datetime +# resolveer_id :integer +# need_respond :boolean default("0") +# updated_on :datetime # # Indexes # @@ -24,9 +33,12 @@ # class Journal < ApplicationRecord + serialize :diff, JSON belongs_to :user belongs_to :issue, foreign_key: :journalized_id, :touch => true, optional: true belongs_to :journalized, polymorphic: true + belongs_to :review, optional: true + belongs_to :resolveer, class_name: 'User', foreign_key: :resolveer_id, optional: true has_many :journal_details, :dependent => :delete_all has_many :attachments, as: :container, dependent: :destroy @@ -34,6 +46,7 @@ class Journal < ApplicationRecord scope :parent_journals, ->{where(parent_id: nil)} scope :children_journals, lambda{|journal_id| where(parent_id: journal_id)} + enum state: {opened: 0, resolved: 1, disabled: 2} def is_journal_detail? self.notes.blank? && self.journal_details.present? diff --git a/app/services/api/v1/projects/pulls/journals/create_service.rb b/app/services/api/v1/projects/pulls/journals/create_service.rb new file mode 100644 index 000000000..45b5ec030 --- /dev/null +++ b/app/services/api/v1/projects/pulls/journals/create_service.rb @@ -0,0 +1,48 @@ +class Api::V1::Projects::Pulls::Journals::CreateService < ApplicationService + include ActiveModel::Model + + attr_reader :project, :pull_request, :issue, :parent_id, :line_code, :note, :commit_id, :path, :type, :diff, :review_id, :user + attr_accessor :journal + + validates :type, inclusion: {in: %w(comment problem), message: '请输入正确的Type'} + + def initialize(project, pull_request, params, user) + @project = project + @pull_request = pull_request + @issue = pull_request&.issue + @parent_id = params[:parent_id] + @line_code = params[:line_code] + @note = params[:note] + @commit_id = params[:commit_id] + @path = params[:path] + @type = params[:type] + @diff = params[:diff] + @review_id = params[:review_id] + @user = user + end + + def call + raise Error, errors.full_messages.join(", ") unless valid? + check_review_is_exists + if type == 'problem' + create_problem_journal + else + create_comment_journal + end + + journal + end + + private + def create_comment_journal + @journal = pull_request.journals.create!(user_id: user&.id, notes: note, parent_id: parent_id, review_id: review_id, commit_id: commit_id, diff: diff, line_code: line_code, path: path) + end + + def check_review_is_exists + raise Error, '合并请求审查不存在！' unless @pull_request.reviews.exists?(review_id) + end + + def create_problem_journal + @journal = pull_request.journals.create!(user_id: user&.id, notes: note, parent_id: parent_id, review_id: review_id, commit_id: commit_id, diff: diff, line_code: line_code, path: path, need_respond: true) + end +end \ No newline at end of file diff --git a/app/services/api/v1/projects/pulls/journals/list_service.rb b/app/services/api/v1/projects/pulls/journals/list_service.rb new file mode 100644 index 000000000..dd69ead08 --- /dev/null +++ b/app/services/api/v1/projects/pulls/journals/list_service.rb @@ -0,0 +1,45 @@ +class Api::V1::Projects::Pulls::Journals::ListService < ApplicationService + include ActiveModel::Model + + attr_reader :project, :pull_request, :keyword, :review_id, :need_respond, :state, :sort_by, :sort_direction, :user + attr_accessor :queried_journals + + validates :sort_by, inclusion: {in: Journal.column_names, message: '请输入正确的SortBy'} + validates :sort_direction, inclusion: {in: %w(asc desc), message: '请输入正确的SortDirection'} + validates :need_respond, inclusion: {in: [true, false], message: '请输入正确的NeedRespond'}, allow_nil: true + validates :state, inclusion: {in: %w(opened resolved disabled)}, allow_nil: true + + def initialize(project, pull_request, params, user) + @project = project + @pull_request = pull_request + @keyword = params[:keyword] + @review_id = params[:review_id] + @need_respond = ActiveModel::Type::Boolean.new.cast(params[:need_respond]) + @state = params[:state] + @sort_by = params[:sort_by] || 'created_on' + @sort_direction = params[:sort_direction] || 'asc' + @user = user + end + + def call + raise Error, errors.full_messages.join(",") unless valid? + journal_query_data + + queried_journals + end + + private + def journal_query_data + journals = @pull_request.journals.parent_journals + + journals = journals.where(review_id: review_id) if review_id.present? + journals = journals.where(need_respond: need_respond) if need_respond.present? + journals = journals.where(state: state) if state.present? + + q = journals.ransack(notes_cont: keyword) + scope = q.result.includes(:review) + scope = scope.order("journals.#{sort_by} #{sort_direction}") + + @queried_journals = scope + end +end \ No newline at end of file diff --git a/app/services/api/v1/projects/pulls/journals/update_service.rb b/app/services/api/v1/projects/pulls/journals/update_service.rb new file mode 100644 index 000000000..fec4c7ff8 --- /dev/null +++ b/app/services/api/v1/projects/pulls/journals/update_service.rb @@ -0,0 +1,38 @@ +class Api::V1::Projects::Pulls::Journals::UpdateService < ApplicationService + include ActiveModel::Model + + attr_reader :project, :pull_request, :journal, :note, :commit_id, :state, :user + attr_accessor :updated_journal + + validates :state, inclusion: {in: %w(opened resolved disabled)} + + def initialize(project, pull_request, journal, params, user) + @project = project + @pull_request = pull_request + @journal = journal + @note = params[:note] + @commit_id = params[:commit_id] + @state = params[:state] + @user = user + end + + def call + raise Error, errors.full_messages.join(", ") unless valid? + + update_journal + + updated_journal + end + + private + def update_journal + journal.attributes = {notes: note, commit_id: commit_id, state: state} + if state == 'resolved' + journal.resolve_at = Time.now + journal.resolveer_id = user.id + end + return Error, '保存评论失败！' unless journal.save + + @updated_journal = journal.reload + end +end \ No newline at end of file diff --git a/app/services/api/v1/projects/pulls/reviews/create_service.rb b/app/services/api/v1/projects/pulls/reviews/create_service.rb index bef944870..1c45d9cf2 100644 --- a/app/services/api/v1/projects/pulls/reviews/create_service.rb +++ b/app/services/api/v1/projects/pulls/reviews/create_service.rb @@ -20,10 +20,10 @@ class Api::V1::Projects::Pulls::Reviews::CreateService < ApplicationService raise Error, errors.full_messages.join(", ") unless valid? ActiveRecord::Base.transaction do create_review - create_journal + # create_journal end - return @journal, @review + @review # rescue # raise Error, '服务器错误，请联系系统管理员！' end @@ -33,8 +33,5 @@ class Api::V1::Projects::Pulls::Reviews::CreateService < ApplicationService @review = pull_request.reviews.create!(status: status, content: content, commit_id: commit_id, reviewer_id: @current_user.id) end - def create_journal - @journal = pull_request.journals.create!(notes: content, user_id: @current_user.id, review_id: @review.id) - end end \ No newline at end of file diff --git a/app/services/api/v1/users/projects/list_service.rb b/app/services/api/v1/users/projects/list_service.rb index 9a095c60b..91e25a933 100644 --- a/app/services/api/v1/users/projects/list_service.rb +++ b/app/services/api/v1/users/projects/list_service.rb @@ -13,7 +13,7 @@ class Api::V1::Users::Projects::ListService < ApplicationService def initialize(observe_user, params, current_user=nil) @observe_user = observe_user @category = params[:category] || 'all' - @is_public = params[:is_public] + @is_public = ActiveModel::Type::Boolean.new.cast(params[:is_public]) @project_type = params[:project_type] @sort_by = params[:sort_by] || 'updated_on' @sort_direction = params[:sort_direction] || 'desc' diff --git a/app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder b/app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder new file mode 100644 index 000000000..547db46ed --- /dev/null +++ b/app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder @@ -0,0 +1,21 @@ +json.(journal, :id, :notes, :commit_id, :line_code, :path, :diff, :need_respond, :state) +json.user do + json.partial! 'api/v1/users/simple_user', user: journal.user +end +json.review do + if journal.review.present? + json.partial! 'api/v1/projects/pulls/reviews/simple_detail', review: journal.review + else + json.nil! + end +end +json.resolveer do + if journal.resolveer.present? + json.partial! 'api/v1/users/simple_user', user: journal.resolveer + else + json.nil! + end +end +json.resolve_at format_time(journal.resolve_at) +json.created_at format_time(journal.created_on) +json.updated_at format_time(journal.updated_on) \ No newline at end of file diff --git a/app/views/api/v1/projects/pulls/journals/create.json.jbuilder b/app/views/api/v1/projects/pulls/journals/create.json.jbuilder new file mode 100644 index 000000000..32bedbf8a --- /dev/null +++ b/app/views/api/v1/projects/pulls/journals/create.json.jbuilder @@ -0,0 +1 @@ +json.partial! 'api/v1/projects/pulls/journals/simple_detail', journal: @journal \ No newline at end of file diff --git a/app/views/api/v1/projects/pulls/journals/index.json.jbuilder b/app/views/api/v1/projects/pulls/journals/index.json.jbuilder new file mode 100644 index 000000000..e71eb5f71 --- /dev/null +++ b/app/views/api/v1/projects/pulls/journals/index.json.jbuilder @@ -0,0 +1,4 @@ +json.total_count @journals.total_count +json.journals @journals.each do |journal| + json.partial! 'api/v1/projects/pulls/journals/simple_detail', journal: journal +end \ No newline at end of file diff --git a/app/views/api/v1/projects/pulls/journals/update.json.jbuilder b/app/views/api/v1/projects/pulls/journals/update.json.jbuilder new file mode 100644 index 000000000..32bedbf8a --- /dev/null +++ b/app/views/api/v1/projects/pulls/journals/update.json.jbuilder @@ -0,0 +1 @@ +json.partial! 'api/v1/projects/pulls/journals/simple_detail', journal: @journal \ No newline at end of file diff --git a/app/views/api/v1/projects/pulls/reviews/_simple_detail.json.jbuilder b/app/views/api/v1/projects/pulls/reviews/_simple_detail.json.jbuilder new file mode 100644 index 000000000..1ded19d6a --- /dev/null +++ b/app/views/api/v1/projects/pulls/reviews/_simple_detail.json.jbuilder @@ -0,0 +1,8 @@ +json.reviewer do + json.partial! "api/v1/users/simple_user", user: review.reviewer +end +json.pull_request do + json.partial! "api/v1/projects/pulls/simple_detail", pull: review.pull_request +end +json.(review, :id, :commit_id, :content, :status) +json.created_at format_time(review.created_at) \ No newline at end of file diff --git a/config/routes/api.rb b/config/routes/api.rb index 0dfe6112f..d5f82ff7b 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -25,6 +25,7 @@ defaults format: :json do get :diff end end + resources :journals, except: [:show, :edit] resources :reviews, only: [:index, :create] end diff --git a/db/migrate/20220726090342_add_line_code_to_journals.rb b/db/migrate/20220726090342_add_line_code_to_journals.rb new file mode 100644 index 000000000..9eb2e45e5 --- /dev/null +++ b/db/migrate/20220726090342_add_line_code_to_journals.rb @@ -0,0 +1,13 @@ +class AddLineCodeToJournals < ActiveRecord::Migration[5.2] + def change + add_column :journals, :commit_id, :string + add_column :journals, :diff, :text, :limit => 4294967295 + add_column :journals, :line_code, :string + add_column :journals, :path, :string + add_column :journals, :state, :integer, default: 0 + add_column :journals, :resolve_at, :datetime + add_column :journals, :resolveer_id, :integer, index: true + add_column :journals, :need_respond, :bool, default: false + add_column :journals, :updated_on, :datetime, index: true + end +end diff --git a/public/docs/api.html b/public/docs/api.html index ce1fea111..0a6847430 100644 --- a/public/docs/api.html +++ b/public/docs/api.html @@ -609,6 +609,9 @@
  • 获取合并请求列表
    • +
  • + 创建一个合并请求 +
  • 获取合并请求版本列表
    • @@ -12229,6 +12232,11 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json 审查创建人 +reviewers +array +指定审查用户标识数组 + + conflict_files array 有冲突的文件 @@ -12291,6 +12299,9 @@ http://localhost:3000/api/v1/yystopf/ceshi/webhooks/3/tests.json "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" } }, + "reviewers": [ + "yystopf" + ], "conflict_files": [] }

    获取合并请求文件列表

    @@ -13271,7 +13282,184 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop } ] } -

    获取合并请求版本列表

    +

    创建一个合并请求

    +

    为仓库创建一个合并请求

    + +
    +

    示例:

    +
    +
    curl -X POST \
+http://localhost:3000/api/yystopf/ceshi/pulls.json
+
    await octokit.request('POST /api/yystopf/ceshi/pulls.json')
+

    HTTP 请求

    +

    POST /api/:owner/:repo/pulls.json

    +

    请求参数:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数必选默认类型字段说明
    owner是string用户登录名
    repo是string项目标识identifier
    title是string合并请求标题
    body否string合并请求内容
    base是string目标分支
    head是string源分支
    is_original是bool是否为fork仓库发来的合并请求
    fork_project_id否integerfork仓库ID
    reviewer_ids否array审查人员id数组
    assigned_to_id否integer指派人员ID
    fixed_version_id否integer里程碑ID
    issue_tag_ids否array标记ID数组
    priority_id否integer优先级ID
    receivers_login否array@人员的login
    + +
    +

    请求的JSON示例:

    +
    +
    {
+    "title": "324",
+    "assigned_to_id": "2",
+    "fixed_version_id": "",
+    "issue_tag_ids": [],
+    "priority_id": "2",
+    "body": "312",
+    "head": "new_branch_1",
+    "base": "master",
+    "is_original": false,
+    "fork_project_id": "",
+    "files_count": 1,
+    "commits_count": 1,
+    "reviewer_ids": [],
+    "receivers_login": []
+}
+
    +
    +

    返回的JSON示例:

    +
    +
    {
+    "status": 0,
+    "message": "响应成功",
+    "pull_request_id": 169,
+    "pull_request_number": 6,
+    "pull_request_status": 0,
+    "pull_request_head": "new_branch_1",
+    "pull_request_base": "master",
+    "pull_request_staus": "open",
+    "is_original": false,
+    "fork_project_id": null,
+    "fork_project_identifier": null,
+    "fork_project_user": null,
+    "reviewers": [
+        "yystopf"
+    ],
+    "id": 266,
+    "name": "324",
+    "pr_time": "1分钟前",
+    "assign_user_name": "heh",
+    "assign_user_login": "yystopf",
+    "author_name": "heh",
+    "author_login": "yystopf",
+    "avatar_url": "system/lets/letter_avatars/2/H/188_239_142/120.png",
+    "priority": "正常",
+    "version": null,
+    "journals_count": 0,
+    "issue_tags": null
+}
+
    + +

    获取合并请求版本列表

    获取合并请求版本列表

    @@ -13279,9 +13467,9 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop 
    curl -X GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions.json
 
    await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/versions.json')
-

    HTTP 请求

    +

    HTTP 请求

    GET /api/v1/:owner/:repo/pulls/:index/versions.json

    -

    请求参数:

    +

    请求参数:

    @@ -13408,9 +13596,9 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop -d"filepath=ceshi_dir_1/new_file_1"\ http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json 
    await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json')
-

    HTTP 请求

    +

    HTTP 请求

    GET /api/v1/:owner/:repo/pulls/:index/versions/:version_id/diff.json

    -

    请求参数:

    +

    请求参数:

    参数
    @@ -13944,9 +14132,9 @@ http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json 
    curl -X POST \
 http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/reviews.json
 
    await octokit.request('POST /api/v1/yystopf/ceshi/pulls/1/reviews.json')
-

    HTTP 请求

    +

    HTTP 请求

    POST /api/v1/:owner/:repo/pulls/:index/reviews.json

    -

    请求参数:

    +

    请求参数:

    参数
    From a2549f7ff1181edd9aa523a17816826c4b6fcdac Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 27 Jul 2022 16:07:15 +0800 Subject: [PATCH 31/53] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E5=8F=8A=E5=AE=A1=E6=9F=A5=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v1/projects/pulls/journals_controller.rb | 3 +- app/docs/slate/source/includes/_pulls.md | 598 +++++++++- app/models/journal.rb | 1 + .../projects/pulls/journals/list_service.rb | 12 +- .../journals/_simple_detail.json.jbuilder | 2 +- .../pulls/reviews/index.json.jbuilder | 4 + public/docs/api.html | 1049 ++++++++++++++++- 7 files changed, 1657 insertions(+), 12 deletions(-) create mode 100644 app/views/api/v1/projects/pulls/reviews/index.json.jbuilder diff --git a/app/controllers/api/v1/projects/pulls/journals_controller.rb b/app/controllers/api/v1/projects/pulls/journals_controller.rb index 76fa30c9d..d32474973 100644 --- a/app/controllers/api/v1/projects/pulls/journals_controller.rb +++ b/app/controllers/api/v1/projects/pulls/journals_controller.rb @@ -33,7 +33,8 @@ class Api::V1::Projects::Pulls::JournalsController < Api::V1::Projects::Pulls::B end def find_journal - @journal = Journal.find_by_id(params[:id]) + @journal = @pull_request.journals.find_by_id(params[:id]) + return render_not_found unless @journal.present? end end \ No newline at end of file diff --git a/app/docs/slate/source/includes/_pulls.md b/app/docs/slate/source/includes/_pulls.md index ccc6e0911..adc6e3cc4 100644 --- a/app/docs/slate/source/includes/_pulls.md +++ b/app/docs/slate/source/includes/_pulls.md @@ -501,10 +501,17 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls.json') ### 请求参数: 参数 | 必选 | 默认 | 类型 | 字段说明 --------- | ------- | ------- | -------- | ---------- -|owner |是| |string |用户登录名 | -|repo |是| |string |项目标识identifier | - - +|owner |是| |string |用户登录名 | +|repo |是| |string |项目标识identifier | +|keyword |否| |string |搜索关键词| +|status |否| | int | 合并请求类型 0: 开启的, 1: 合并的 2: 关闭的，不传则为全部的 | +|priority_id |否| | int | 优先级ID | +|issue_tag_id |否| |int|标记ID| +|version_id |否| |int|里程碑ID| +|reviewer_id |否| |int| 审查人员ID| +|assign_user_id |否| |int| 指派人员ID| +|sort_by |否| created_at |string| 排序字段，created_at: 创建时间, updated_at: 更新时间| +|sort_direction |否| desc |string| 排序类型 desc: 倒序 asc: 正序| ### 返回字段说明: 参数 | 类型 | 字段说明 --------- | ----------- | ----------- @@ -999,6 +1006,108 @@ await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff } ``` +## 获取合并请求审查列表 +获取合并请求版本审查列表 + +> 示例: + +```shell +curl -X GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/reviews.json +``` + +```javascript +await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/reviews.json') +``` + +### HTTP 请求 +`GET /api/v1/:owner/:repo/pulls/:index/reviews.json` + +### 请求参数: +参数 | 必选 | 默认 | 类型 | 字段说明 +--------- | ------- | ------- | -------- | ---------- +|owner |是| |string |用户登录名 | +|repo |是| |string |项目标识identifier | +|index |是| | int |合并请求序号| + +### 返回字段说明: +参数 | 类型 | 字段说明 +--------- | ----------- | ----------- +|total_count |int |审查总数| +|reviews.reviewer |object |审查者 | +|reviews.pull_request.id |integer|合并请求ID| +|reviews.pull_request.title |string|合并请求标题| +|reviews.pull_request.body |string|合并请求内容| +|reviews.pull_request.head |string|合并请求源分支| +|reviews.pull_request.base |string|合并请求目标分支| +|reviews.pull_request.is_original |string|合并请求是否从fork仓库所来| +|reviews.pull_request.fork_project.id |int|fork仓库的id| +|reviews.pull_request.fork_project.identifier|string|fork仓库的标识| +|reviews.pull_request.fork_project.login |string|fork仓库拥有者的标识| +|reviews.pull_request.index |string|合并请求的序号| +|reviews.pull_request.status |string|合并请求的状态，open: 打开的, merged: 合并的, closed: 关闭的| +|reviews.pull_request.issue.id |integer|合并请求下疑修的ID| +|reviews.pull_request.issue.author |object|合并请求以及疑修的创建着| +|reviews.pull_request.issue.priority |string|疑修的优先级| +|reviews.pull_request.issue.version |string|疑修的里程碑| +|reviews.pull_request.issue.journals_count|integer|普通评论数量| +|reviews.pull_request.issue.issue_tags |array|所属标记| +|reviews.pull_request.journals_count |integer|审查评论数量| +|reviews.id |integer|审查ID| +|reviews.commit_id |string|审查的commit ID| +|reviews.content |string|审查的内容| +|reviews.status |string|审查类型，common: 普通, approved: 通过，rejected: 拒绝通过| +|reviews.created_at |string|审查创建时间| + +> 返回的JSON示例: + +```json +{ + "total_count": 1, + "reviews": [ + { + "reviewer": { + "id": 2, + "type": "User", + "name": "heh", + "login": "yystopf", + "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" + }, + "pull_request": { + "id": 163, + "title": "新合并请求1", + "body": null, + "head": "master_1", + "base": "master", + "is_original": false, + "index": 1, + "status": "closed", + "issue": { + "id": 260, + "author": { + "id": 2, + "type": "User", + "name": "heh", + "login": "yystopf", + "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" + }, + "priority": null, + "version": null, + "journals_count": 0, + "issue_tags": null + }, + "reviewers": [], + "journals_count": 8 + }, + "id": 5, + "commit_id": null, + "content": "新建一个审查", + "status": "common", + "created_at": "2022-07-25 17:08" + } + ] +} +``` + ## 为合并请求创建一个审查 合并请求创建一个审查 @@ -1108,3 +1217,484 @@ await octokit.request('POST /api/v1/yystopf/ceshi/pulls/1/reviews.json') + + +## 获取合并请求评论列表 +获取合并请求版本评论列表 + +> 示例: + +```shell +curl -X GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/journals.json +``` + +```javascript +await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/journals.json') +``` + +### HTTP 请求 +`GET /api/v1/:owner/:repo/pulls/:index/journals.json` + +### 请求参数: +参数 | 必选 | 默认 | 类型 | 字段说明 +--------- | ------- | ------- | -------- | ---------- +|owner |是| |string |用户登录名 | +|repo |是| |string |项目标识identifier | +|index |是| | int |合并请求序号| +|keyword |否| |string |搜索关键词| +|review_id |否| |integer|审查ID| +|need_respond |否| |bool |是否需要回应| +|state |否| |string |状态, opened: 开启的, resolved: 已解决的, disabled: 无效的| +|parent_id |否| |integer|父评论ID| +|sort_by |否|created_on|string |排序字段 created_on: 创建时间, updated_on: 更新时间| +|sort_direction |否|asc |string |排序类型 desc: 倒序, asc: 正序| + +### 返回字段说明: +参数 | 类型 | 字段说明 +--------- | ----------- | ----------- +|total_count |int |评论总数| +|journals.id |int |评论ID| +|journals.notes |string |评论内容| +|journals.commit_id |string |CommitID| +|journals.line_code |string |评论行数| +|journals.path |string |评论文件路径| +|journals.diff |object |评论文件diff内容| +|journals.need_respond |bool |评论是否要回应| +|journals.state |string |评论状态，opened: 开启的, resolved: 已解决的, disabled: 无效的 | +|journals.parent_id |int |父评论ID| +|journals.user |object |评论创建者| +|journals.review |object |评论所属评审| +|journals.resolveer |object |评论解决者| +|journals.resolve_at |int |评论解决时间| +|journals.created_at |int |评论创建时间| +|journals.updated_at |int |评论更新时间| + +> 返回的JSON示例: + +```json +{ + "total_count": 1, + "journals": [ + { + "id": 200, + "note": "测试评论修改", + "commit_id": null, + "line_code": "70eede447ccc01c1902260fd377af5d90be28e0d_0_29", + "path": "Gemfile.lock", + "diff": {}, + "need_respond": true, + "state": "resolved", + "parent_id": nil, + "user": { + "id": 2, + "type": "User", + "name": "heh", + "login": "yystopf", + "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" + }, + "review": { + "reviewer": { + "id": 2, + "type": "User", + "name": "heh", + "login": "yystopf", + "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" + }, + "pull_request": { + "id": 163, + "title": "新合并请求1", + "body": null, + "head": "master_1", + "base": "master", + "is_original": false, + "index": 1, + "status": "closed", + "issue": { + "id": 260, + "author": { + "id": 2, + "type": "User", + "name": "heh", + "login": "yystopf", + "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" + }, + "priority": null, + "version": null, + "journals_count": 0, + "issue_tags": null + }, + "reviewers": [], + "journals_count": 9 + }, + "id": 10, + "commit_id": "1", + "content": "新建一个审查", + "status": "common", + "created_at": "2022-07-26 11:45" + }, + "resolveer": { + "id": 2, + "type": "User", + "name": "heh", + "login": "yystopf", + "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" + }, + "resolve_at": "2022-07-27 14:50", + "created_at": "2022-07-27 14:31", + "updated_at": "2022-07-27 14:50" + } + ] +} +``` + +## 创建一个合并请求评论 +为仓库创建一个合并请求的评论 + +> 示例: + +```shell +curl -X POST \ +http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/journals.json +``` + +```javascript +await octokit.request('POST /api/v1/yystopf/ceshi/pulls/1/journals.json') +``` + +### HTTP 请求 +`POST /api/v1/:owner/:repo/pulls/:index/journals.json` + +### 请求参数: +参数 | 必选 | 默认 | 类型 | 字段说明 +--------- | ------- | ------- | -------- | ---------- +|owner |是| | string |用户登录名 | +|repo |是| | string |项目标识identifier | +|index |是| | integer|合并请求序号| +|type |是| | string |评论类型 comment: 普通, problem: 需要回应的评论| +|note |否| | string |评论内容| +|review_id |是| | string |审查ID| +|line_code |否| | string |行号| +|commit_id |否| | bool |commitID| +|path |否| | integer|文件路径| +|parent_id |否| | integer|父评论ID| +|diff |否| | array |文件diff内容| + +> 请求的JSON示例: + +```json +{ + "type": "problem", + "note": "测试评论", + "review_id": "10", + "line_code": "70eede447ccc01c1902260fd377af5d90be28e0d_0_29", + "commit_id": "70eede447ccc01c1902260fd377af5d90be28e0d", + "path": "Gemfile.lock", + "diff": { + "name": "README.md", + "oldname": "README.md", + "addition": 1, + "deletion": 2, + "type": 2, + "is_created": false, + "is_deleted": false, + "is_bin": false, + "is_lfs_file": false, + "is_renamed": false, + "is_ambiguous": false, + "is_submodule": false, + "sections": [ + { + "file_name": "README.md", + "name": "", + "lines": [ + { + "left_index": 0, + "right_index": 0, + "match": 0, + "type": 4, + "content": "@@ -1,2 +1 @@", + "section_path": "README.md", + "section_last_left_index": 0, + "section_last_right_index": 0, + "section_left_index": 1, + "section_right_index": 1, + "section_left_hunk_size": 2, + "section_right_hunk_size": 0 + }, + { + "left_index": 1, + "right_index": 0, + "match": 3, + "type": 3, + "content": "-# ceshi_commit" + }, + { + "left_index": 2, + "right_index": 0, + "match": -1, + "type": 3, + "content": "-" + }, + { + "left_index": 0, + "right_index": 1, + "match": 1, + "type": 2, + "content": "+adsa" + } + ] + }, + { + "file_name": "README.md", + "name": "", + "lines": [ + { + "left_index": 0, + "right_index": 0, + "match": 0, + "type": 4, + "content": " ", + "section_path": "README.md", + "section_last_left_index": 0, + "section_last_right_index": 1, + "section_left_index": 3, + "section_right_index": 2, + "section_left_hunk_size": 0, + "section_right_hunk_size": 0 + } + ] + } + ], + "is_incomplete": false, + "is_incomplete_line_too_long": false, + "is_protected": false + } +} +``` + +> 返回的JSON示例: + +```json +{ + "id": 200, + "note": "测试评论修改", + "commit_id": null, + "line_code": "70eede447ccc01c1902260fd377af5d90be28e0d_0_29", + "path": "Gemfile.lock", + "diff": {}, + "need_respond": true, + "state": "resolved", + "user": { + "id": 2, + "type": "User", + "name": "heh", + "login": "yystopf", + "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" + }, + "review": { + "reviewer": { + "id": 2, + "type": "User", + "name": "heh", + "login": "yystopf", + "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" + }, + "pull_request": { + "id": 163, + "title": "新合并请求1", + "body": null, + "head": "master_1", + "base": "master", + "is_original": false, + "index": 1, + "status": "closed", + "issue": { + "id": 260, + "author": { + "id": 2, + "type": "User", + "name": "heh", + "login": "yystopf", + "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" + }, + "priority": null, + "version": null, + "journals_count": 0, + "issue_tags": null + }, + "reviewers": [], + "journals_count": 9 + }, + "id": 10, + "commit_id": "1", + "content": "新建一个审查", + "status": "common", + "created_at": "2022-07-26 11:45" + }, + "resolveer": { + "id": 2, + "type": "User", + "name": "heh", + "login": "yystopf", + "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" + }, + "resolve_at": "2022-07-27 14:50", + "created_at": "2022-07-27 14:31", + "updated_at": "2022-07-27 14:50" +} +``` + + +## 修改一个合并请求评论 +修改一个仓库合并请求的评论 + +> 示例: + +```shell +curl -X PATCH \ +http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/journals/200.json +``` + +```javascript +await octokit.request('PATCH /api/v1/yystopf/ceshi/pulls/1/journals/200.json') +``` + +### HTTP 请求 +`PATCH /api/v1/:owner/:repo/pulls/:index/journals/:id.json` + +### 请求参数: +参数 | 必选 | 默认 | 类型 | 字段说明 +--------- | ------- | ------- | -------- | ---------- +|owner |是| | string |用户登录名 | +|repo |是| | string |项目标识identifier | +|index |是| | integer|合并请求序号| +|id |是| | integer|评论ID| +|note |是| | string |评论内容| +|commit_id |是| | string |commitID| +|state |是| | string |评论状态, opened: 开启的, resolved: 已解决的, disabled: 无效的| + +> 请求的JSON示例: + +```json +{ + "note": "测试评论", + "commit_id": "70eede447ccc01c1902260fd377af5d90be28e0d", + "state": "resolved" +} +``` + +> 返回的JSON示例: + +```json +{ + "id": 200, + "note": "测试评论修改", + "commit_id": null, + "line_code": "70eede447ccc01c1902260fd377af5d90be28e0d_0_29", + "path": "Gemfile.lock", + "diff": {}, + "need_respond": true, + "state": "resolved", + "user": { + "id": 2, + "type": "User", + "name": "heh", + "login": "yystopf", + "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" + }, + "review": { + "reviewer": { + "id": 2, + "type": "User", + "name": "heh", + "login": "yystopf", + "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" + }, + "pull_request": { + "id": 163, + "title": "新合并请求1", + "body": null, + "head": "master_1", + "base": "master", + "is_original": false, + "index": 1, + "status": "closed", + "issue": { + "id": 260, + "author": { + "id": 2, + "type": "User", + "name": "heh", + "login": "yystopf", + "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" + }, + "priority": null, + "version": null, + "journals_count": 0, + "issue_tags": null + }, + "reviewers": [], + "journals_count": 9 + }, + "id": 10, + "commit_id": "1", + "content": "新建一个审查", + "status": "common", + "created_at": "2022-07-26 11:45" + }, + "resolveer": { + "id": 2, + "type": "User", + "name": "heh", + "login": "yystopf", + "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png" + }, + "resolve_at": "2022-07-27 14:50", + "created_at": "2022-07-27 14:31", + "updated_at": "2022-07-27 14:50" +} +``` + + +## 删除合并请求的一个评论 +删除合并请求的一个评论 + +> 示例: + +```shell +curl -X DELETE \ +http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/journals/200.json +``` + +```javascript +await octokit.request('DELETE /api/v1/yystopf/ceshi/pulls/1/journals/200.json') +``` + +### HTTP 请求 +`DELETE /api/v1/:owner/:repo/pulls/:index/journals/:id.json` + +### 请求参数: +参数 | 必选 | 默认 | 类型 | 字段说明 +--------- | ------- | ------- | -------- | ---------- +|owner |是| | string |用户登录名 | +|repo |是| | string |项目标识identifier | +|index |是| | integer|合并请求序号| +|id |是| | integer|评论ID | + +### 返回字段说明: + +> 返回的JSON示例: + +```json +{ + "status": 0, + "message": "success" +} +``` + diff --git a/app/models/journal.rb b/app/models/journal.rb index 48721bfd2..e0dbf36d3 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -34,6 +34,7 @@ class Journal < ApplicationRecord serialize :diff, JSON + alias_attribute :note, :notes belongs_to :user belongs_to :issue, foreign_key: :journalized_id, :touch => true, optional: true belongs_to :journalized, polymorphic: true diff --git a/app/services/api/v1/projects/pulls/journals/list_service.rb b/app/services/api/v1/projects/pulls/journals/list_service.rb index dd69ead08..30b650f07 100644 --- a/app/services/api/v1/projects/pulls/journals/list_service.rb +++ b/app/services/api/v1/projects/pulls/journals/list_service.rb @@ -1,7 +1,7 @@ class Api::V1::Projects::Pulls::Journals::ListService < ApplicationService include ActiveModel::Model - attr_reader :project, :pull_request, :keyword, :review_id, :need_respond, :state, :sort_by, :sort_direction, :user + attr_reader :project, :pull_request, :keyword, :review_id, :need_respond, :state, :parent_id, :sort_by, :sort_direction, :user attr_accessor :queried_journals validates :sort_by, inclusion: {in: Journal.column_names, message: '请输入正确的SortBy'} @@ -16,6 +16,7 @@ class Api::V1::Projects::Pulls::Journals::ListService < ApplicationService @review_id = params[:review_id] @need_respond = ActiveModel::Type::Boolean.new.cast(params[:need_respond]) @state = params[:state] + @parent_id = params[:parent_id] @sort_by = params[:sort_by] || 'created_on' @sort_direction = params[:sort_direction] || 'asc' @user = user @@ -30,14 +31,19 @@ class Api::V1::Projects::Pulls::Journals::ListService < ApplicationService private def journal_query_data - journals = @pull_request.journals.parent_journals + journals = @pull_request.journals + if parent_id.present? + journals = journals.where(parent_id: parent_id) + else + journals = journals.parent_journals + end journals = journals.where(review_id: review_id) if review_id.present? journals = journals.where(need_respond: need_respond) if need_respond.present? journals = journals.where(state: state) if state.present? q = journals.ransack(notes_cont: keyword) - scope = q.result.includes(:review) + scope = q.result.includes(:user, :resolveer, review: [:reviewer, pull_request: :issue]) scope = scope.order("journals.#{sort_by} #{sort_direction}") @queried_journals = scope diff --git a/app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder b/app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder index 547db46ed..d418ffdcd 100644 --- a/app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder +++ b/app/views/api/v1/projects/pulls/journals/_simple_detail.json.jbuilder @@ -1,4 +1,4 @@ -json.(journal, :id, :notes, :commit_id, :line_code, :path, :diff, :need_respond, :state) +json.(journal, :id, :note, :commit_id, :line_code, :path, :diff, :need_respond, :state, :parent_id) json.user do json.partial! 'api/v1/users/simple_user', user: journal.user end diff --git a/app/views/api/v1/projects/pulls/reviews/index.json.jbuilder b/app/views/api/v1/projects/pulls/reviews/index.json.jbuilder new file mode 100644 index 000000000..04792d5c6 --- /dev/null +++ b/app/views/api/v1/projects/pulls/reviews/index.json.jbuilder @@ -0,0 +1,4 @@ +json.total_count @reviews.total_count +json.reviews @reviews.each do |review| + json.partial! 'api/v1/projects/pulls/reviews/simple_detail', review: review +end \ No newline at end of file diff --git a/public/docs/api.html b/public/docs/api.html index 0a6847430..50b1c12a4 100644 --- a/public/docs/api.html +++ b/public/docs/api.html @@ -618,9 +618,24 @@
  • 获取合并请求版本Diff
    • +
  • + 获取合并请求审查列表 +
  • 为合并请求创建一个审查
    • +
  • + 获取合并请求评论列表 +
    • +
  • + 创建一个合并请求评论 +
    • +
  • + 修改一个合并请求评论 +
    • +
  • + 删除合并请求的一个评论 +
  • @@ -13112,6 +13127,69 @@ http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop
    • + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数string 项目标识identifier
    keyword否string搜索关键词
    status否int合并请求类型 0: 开启的, 1: 合并的 2: 关闭的，不传则为全部的
    priority_id否int优先级ID
    issue_tag_id否int标记ID
    version_id否int里程碑ID
    reviewer_id否int审查人员ID
    assign_user_id否int指派人员ID
    sort_by否created_atstring排序字段，created_at: 创建时间, updated_at: 更新时间
    sort_direction否descstring排序类型 desc: 倒序 asc: 正序

    返回字段说明:

    @@ -14123,6 +14201,231 @@ http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json "is_incomplete_line_too_long": false, "is_protected": false } +

    获取合并请求审查列表

    +

    获取合并请求版本审查列表

    + +
    +

    示例:

    +
    +
    curl -X GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/reviews.json
+
    await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/reviews.json')
+

    HTTP 请求

    +

    GET /api/v1/:owner/:repo/pulls/:index/reviews.json

    +

    请求参数:

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数必选默认类型字段说明
    owner是string用户登录名
    repo是string项目标识identifier
    index是int合并请求序号
    +

    返回字段说明:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数类型字段说明
    total_countint审查总数
    reviews.reviewerobject审查者
    reviews.pull_request.idinteger合并请求ID
    reviews.pull_request.titlestring合并请求标题
    reviews.pull_request.bodystring合并请求内容
    reviews.pull_request.headstring合并请求源分支
    reviews.pull_request.basestring合并请求目标分支
    reviews.pull_request.is_originalstring合并请求是否从fork仓库所来
    reviews.pull_request.fork_project.idintfork仓库的id
    reviews.pull_request.fork_project.identifierstringfork仓库的标识
    reviews.pull_request.fork_project.loginstringfork仓库拥有者的标识
    reviews.pull_request.indexstring合并请求的序号
    reviews.pull_request.statusstring合并请求的状态，open: 打开的, merged: 合并的, closed: 关闭的
    reviews.pull_request.issue.idinteger合并请求下疑修的ID
    reviews.pull_request.issue.authorobject合并请求以及疑修的创建着
    reviews.pull_request.issue.prioritystring疑修的优先级
    reviews.pull_request.issue.versionstring疑修的里程碑
    reviews.pull_request.issue.journals_countinteger普通评论数量
    reviews.pull_request.issue.issue_tagsarray所属标记
    reviews.pull_request.journals_countinteger审查评论数量
    reviews.idinteger审查ID
    reviews.commit_idstring审查的commit ID
    reviews.contentstring审查的内容
    reviews.statusstring审查类型，common: 普通, approved: 通过，rejected: 拒绝通过
    reviews.created_atstring审查创建时间
    + +
    +

    返回的JSON示例:

    +
    +
    {
+    "total_count": 1,
+    "reviews": [
+        {
+            "reviewer": {
+                "id": 2,
+                "type": "User",
+                "name": "heh",
+                "login": "yystopf",
+                "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+            },
+            "pull_request": {
+                "id": 163,
+                "title": "新合并请求1",
+                "body": null,
+                "head": "master_1",
+                "base": "master",
+                "is_original": false,
+                "index": 1,
+                "status": "closed",
+                "issue": {
+                    "id": 260,
+                    "author": {
+                        "id": 2,
+                        "type": "User",
+                        "name": "heh",
+                        "login": "yystopf",
+                        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+                    },
+                    "priority": null,
+                    "version": null,
+                    "journals_count": 0,
+                    "issue_tags": null
+                },
+                "reviewers": [],
+                "journals_count": 8
+            },
+            "id": 5,
+            "commit_id": null,
+            "content": "新建一个审查",
+            "status": "common",
+            "created_at": "2022-07-25 17:08"
+        }
+    ]
+}

    为合并请求创建一个审查

    合并请求创建一个审查

    @@ -14132,9 +14435,9 @@ http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/versions/33/diff.json 
    curl -X POST \
 http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/reviews.json
 
    await octokit.request('POST /api/v1/yystopf/ceshi/pulls/1/reviews.json')
-

    HTTP 请求

    +

    HTTP 请求

    POST /api/v1/:owner/:repo/pulls/:index/reviews.json

    -

    请求参数:

    +

    请求参数:

    @@ -14196,7 +14499,7 @@ http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/reviews.json "commit_id": "e506844b2467ce25a35dd46dad8236a1595a02da", "status": "common" } -

    返回字段说明:

    +

    返回字段说明:

    参数
    @@ -14370,6 +14673,746 @@ http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/reviews.json +

    获取合并请求评论列表

    +

    获取合并请求版本评论列表

    + +
    +

    示例:

    +
    +
    curl -X GET http://localhost:3000/api/v1/yystopf/ceshi_commit/pulls/3/journals.json
+
    await octokit.request('GET /api/v1/yystopf/ceshi_commit/pulls/3/journals.json')
+

    HTTP 请求

    +

    GET /api/v1/:owner/:repo/pulls/:index/journals.json

    +

    请求参数:

    +
    参数
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数必选默认类型字段说明
    owner是string用户登录名
    repo是string项目标识identifier
    index是int合并请求序号
    keyword否string搜索关键词
    review_id否integer审查ID
    need_respond否bool是否需要回应
    state否string状态, opened: 开启的, resolved: 已解决的, disabled: 无效的
    parent_id否integer父评论ID
    sort_by否created_onstring排序字段 created_on: 创建时间, updated_on: 更新时间
    sort_direction否ascstring排序类型 desc: 倒序, asc: 正序
    +

    返回字段说明:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数类型字段说明
    total_countint评论总数
    journals.idint评论ID
    journals.notesstring评论内容
    journals.commit_idstringCommitID
    journals.line_codestring评论行数
    journals.pathstring评论文件路径
    journals.diffobject评论文件diff内容
    journals.need_respondbool评论是否要回应
    journals.statestring评论状态，opened: 开启的, resolved: 已解决的, disabled: 无效的
    journals.parent_idint父评论ID
    journals.userobject评论创建者
    journals.reviewobject评论所属评审
    journals.resolveerobject评论解决者
    journals.resolve_atint评论解决时间
    journals.created_atint评论创建时间
    journals.updated_atint评论更新时间
    + +
    +

    返回的JSON示例:

    +
    +
    {
+    "total_count": 1,
+    "journals": [
+        {
+            "id": 200,
+            "note": "测试评论修改",
+            "commit_id": null,
+            "line_code": "70eede447ccc01c1902260fd377af5d90be28e0d_0_29",
+            "path": "Gemfile.lock",
+            "diff": {},
+            "need_respond": true,
+            "state": "resolved",
+            "parent_id": nil,
+            "user": {
+                "id": 2,
+                "type": "User",
+                "name": "heh",
+                "login": "yystopf",
+                "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+            },
+            "review": {
+                "reviewer": {
+                    "id": 2,
+                    "type": "User",
+                    "name": "heh",
+                    "login": "yystopf",
+                    "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+                },
+                "pull_request": {
+                    "id": 163,
+                    "title": "新合并请求1",
+                    "body": null,
+                    "head": "master_1",
+                    "base": "master",
+                    "is_original": false,
+                    "index": 1,
+                    "status": "closed",
+                    "issue": {
+                        "id": 260,
+                        "author": {
+                            "id": 2,
+                            "type": "User",
+                            "name": "heh",
+                            "login": "yystopf",
+                            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+                        },
+                        "priority": null,
+                        "version": null,
+                        "journals_count": 0,
+                        "issue_tags": null
+                    },
+                    "reviewers": [],
+                    "journals_count": 9
+                },
+                "id": 10,
+                "commit_id": "1",
+                "content": "新建一个审查",
+                "status": "common",
+                "created_at": "2022-07-26 11:45"
+            },
+            "resolveer": {
+                "id": 2,
+                "type": "User",
+                "name": "heh",
+                "login": "yystopf",
+                "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+            },
+            "resolve_at": "2022-07-27 14:50",
+            "created_at": "2022-07-27 14:31",
+            "updated_at": "2022-07-27 14:50"
+        }
+    ]
+}
+

    创建一个合并请求评论

    +

    为仓库创建一个合并请求的评论

    + +
    +

    示例:

    +
    +
    curl -X POST \
+http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/journals.json
+
    await octokit.request('POST /api/v1/yystopf/ceshi/pulls/1/journals.json')
+

    HTTP 请求

    +

    POST /api/v1/:owner/:repo/pulls/:index/journals.json

    +

    请求参数:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数必选默认类型字段说明
    owner是string用户登录名
    repo是string项目标识identifier
    index是integer合并请求序号
    type是string评论类型 comment: 普通, problem: 需要回应的评论
    note否string评论内容
    review_id是string审查ID
    line_code否string行号
    commit_id否boolcommitID
    path否integer文件路径
    parent_id否integer父评论ID
    diff否array文件diff内容
    + +
    +

    请求的JSON示例:

    +
    +
    {
+    "type": "problem",
+    "note": "测试评论",
+    "review_id": "10",
+    "line_code": "70eede447ccc01c1902260fd377af5d90be28e0d_0_29",
+    "commit_id": "70eede447ccc01c1902260fd377af5d90be28e0d",
+    "path": "Gemfile.lock",
+    "diff": {
+        "name": "README.md",
+        "oldname": "README.md",
+        "addition": 1,
+        "deletion": 2,
+        "type": 2,
+        "is_created": false,
+        "is_deleted": false,
+        "is_bin": false,
+        "is_lfs_file": false,
+        "is_renamed": false,
+        "is_ambiguous": false,
+        "is_submodule": false,
+        "sections": [
+            {
+                "file_name": "README.md",
+                "name": "",
+                "lines": [
+                    {
+                        "left_index": 0,
+                        "right_index": 0,
+                        "match": 0,
+                        "type": 4,
+                        "content": "@@ -1,2 +1 @@",
+                        "section_path": "README.md",
+                        "section_last_left_index": 0,
+                        "section_last_right_index": 0,
+                        "section_left_index": 1,
+                        "section_right_index": 1,
+                        "section_left_hunk_size": 2,
+                        "section_right_hunk_size": 0
+                    },
+                    {
+                        "left_index": 1,
+                        "right_index": 0,
+                        "match": 3,
+                        "type": 3,
+                        "content": "-# ceshi_commit"
+                    },
+                    {
+                        "left_index": 2,
+                        "right_index": 0,
+                        "match": -1,
+                        "type": 3,
+                        "content": "-"
+                    },
+                    {
+                        "left_index": 0,
+                        "right_index": 1,
+                        "match": 1,
+                        "type": 2,
+                        "content": "+adsa"
+                    }
+                ]
+            },
+            {
+                "file_name": "README.md",
+                "name": "",
+                "lines": [
+                    {
+                        "left_index": 0,
+                        "right_index": 0,
+                        "match": 0,
+                        "type": 4,
+                        "content": " ",
+                        "section_path": "README.md",
+                        "section_last_left_index": 0,
+                        "section_last_right_index": 1,
+                        "section_left_index": 3,
+                        "section_right_index": 2,
+                        "section_left_hunk_size": 0,
+                        "section_right_hunk_size": 0
+                    }
+                ]
+            }
+        ],
+        "is_incomplete": false,
+        "is_incomplete_line_too_long": false,
+        "is_protected": false
+    }
+}
+
    +
    +

    返回的JSON示例:

    +
    +
    {
+    "id": 200,
+    "note": "测试评论修改",
+    "commit_id": null,
+    "line_code": "70eede447ccc01c1902260fd377af5d90be28e0d_0_29",
+    "path": "Gemfile.lock",
+    "diff": {},
+    "need_respond": true,
+    "state": "resolved",
+    "user": {
+        "id": 2,
+        "type": "User",
+        "name": "heh",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+    },
+    "review": {
+        "reviewer": {
+            "id": 2,
+            "type": "User",
+            "name": "heh",
+            "login": "yystopf",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        },
+        "pull_request": {
+            "id": 163,
+            "title": "新合并请求1",
+            "body": null,
+            "head": "master_1",
+            "base": "master",
+            "is_original": false,
+            "index": 1,
+            "status": "closed",
+            "issue": {
+                "id": 260,
+                "author": {
+                    "id": 2,
+                    "type": "User",
+                    "name": "heh",
+                    "login": "yystopf",
+                    "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+                },
+                "priority": null,
+                "version": null,
+                "journals_count": 0,
+                "issue_tags": null
+            },
+            "reviewers": [],
+            "journals_count": 9
+        },
+        "id": 10,
+        "commit_id": "1",
+        "content": "新建一个审查",
+        "status": "common",
+        "created_at": "2022-07-26 11:45"
+    },
+    "resolveer": {
+        "id": 2,
+        "type": "User",
+        "name": "heh",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+    },
+    "resolve_at": "2022-07-27 14:50",
+    "created_at": "2022-07-27 14:31",
+    "updated_at": "2022-07-27 14:50"
+}
+
    + +

    修改一个合并请求评论

    +

    修改一个仓库合并请求的评论

    + +
    +

    示例:

    +
    +
    curl -X PATCH \
+http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/journals/200.json
+
    await octokit.request('PATCH /api/v1/yystopf/ceshi/pulls/1/journals/200.json')
+

    HTTP 请求

    +

    PATCH /api/v1/:owner/:repo/pulls/:index/journals/:id.json

    +

    请求参数:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数必选默认类型字段说明
    owner是string用户登录名
    repo是string项目标识identifier
    index是integer合并请求序号
    id是integer评论ID
    note是string评论内容
    commit_id是stringcommitID
    state是string评论状态, opened: 开启的, resolved: 已解决的, disabled: 无效的
    + +
    +

    请求的JSON示例:

    +
    +
    {
+    "note": "测试评论",
+    "commit_id": "70eede447ccc01c1902260fd377af5d90be28e0d",
+    "state": "resolved"
+}
+
    +
    +

    返回的JSON示例:

    +
    +
    {
+    "id": 200,
+    "note": "测试评论修改",
+    "commit_id": null,
+    "line_code": "70eede447ccc01c1902260fd377af5d90be28e0d_0_29",
+    "path": "Gemfile.lock",
+    "diff": {},
+    "need_respond": true,
+    "state": "resolved",
+    "user": {
+        "id": 2,
+        "type": "User",
+        "name": "heh",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+    },
+    "review": {
+        "reviewer": {
+            "id": 2,
+            "type": "User",
+            "name": "heh",
+            "login": "yystopf",
+            "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+        },
+        "pull_request": {
+            "id": 163,
+            "title": "新合并请求1",
+            "body": null,
+            "head": "master_1",
+            "base": "master",
+            "is_original": false,
+            "index": 1,
+            "status": "closed",
+            "issue": {
+                "id": 260,
+                "author": {
+                    "id": 2,
+                    "type": "User",
+                    "name": "heh",
+                    "login": "yystopf",
+                    "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+                },
+                "priority": null,
+                "version": null,
+                "journals_count": 0,
+                "issue_tags": null
+            },
+            "reviewers": [],
+            "journals_count": 9
+        },
+        "id": 10,
+        "commit_id": "1",
+        "content": "新建一个审查",
+        "status": "common",
+        "created_at": "2022-07-26 11:45"
+    },
+    "resolveer": {
+        "id": 2,
+        "type": "User",
+        "name": "heh",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/H/188_239_142/120.png"
+    },
+    "resolve_at": "2022-07-27 14:50",
+    "created_at": "2022-07-27 14:31",
+    "updated_at": "2022-07-27 14:50"
+}
+
    + +

    删除合并请求的一个评论

    +

    删除合并请求的一个评论

    + +
    +

    示例:

    +
    +
    curl -X DELETE \
+http://localhost:3000/api/v1/yystopf/ceshi/pulls/1/journals/200.json
+
    await octokit.request('DELETE /api/v1/yystopf/ceshi/pulls/1/journals/200.json')
+

    HTTP 请求

    +

    DELETE /api/v1/:owner/:repo/pulls/:index/journals/:id.json

    +

    请求参数:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    参数必选默认类型字段说明
    owner是string用户登录名
    repo是string项目标识identifier
    index是integer合并请求序号
    id是integer评论ID
    +

    返回字段说明:

    +
    +

    返回的JSON示例:

    +
    +
    {
+    "status": 0,
+    "message": "success"
+}
+
    +

    Issues

    Organizations

    Teams

    Errors