floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-22 20:55:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request 'gitea升级为gitea_hat相关修改' (#32) from yystopf/forgeplus:hh_gitea_upgrade into feature_gitea_upgrade

Browse Source
This commit is contained in:
yystopf
2023-03-16 16:26:46 +08:00
parent 24fe22398e 77b3c20e15
commit c65896c11d
65 changed files with 148 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/api/v1/projects/blame_service.rb
View File

@@ -32,7 +32,7 @@ class Api::V1::Projects::BlameService < ApplicationService
end
def load_gitea_data
@gitea_data = $gitea_client.get_repos_blame_by_owner_repo(owner, repo, {query: request_params})
@gitea_data = $gitea_hat_client.get_repos_blame_by_owner_repo(owner, repo, {query: request_params})
raise Error, '获取项目blame失败！' unless @gitea_data.is_a?(Hash)
end
end

4
app/services/api/v1/projects/branches/all_list_service.rb
View File

@@ -24,7 +24,7 @@ class Api::V1::Projects::Branches::AllListService < ApplicationService
end
def load_gitea_data
@gitea_data = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
raise Error, '获取所有分支失败！' unless @gitea_data.is_a?(Hash)
@gitea_data = $gitea_hat_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
raise Error, '获取所有分支失败！' unless @gitea_data.is_a?(Array)
end
end

8
app/services/api/v1/projects/branches/create_service.rb
View File

@@ -44,9 +44,9 @@ class Api::V1::Projects::Branches::CreateService < ApplicationService
end
def check_branch_exist
result = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
raise Error, '查询分支名称失败！' unless result.is_a?(Hash)
raise Error, '旧分支不存在！' if !result['branch_name'].include?(@old_branch_name)
raise Error, '新分支已存在！' if result['branch_name'].include?(@new_branch_name)
result = $gitea_hat_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
raise Error, '查询分支名称失败！' unless result.is_a?(Array)
raise Error, '旧分支不存在！' if !result.include?(@old_branch_name)
raise Error, '新分支已存在！' if result.include?(@new_branch_name)
end
end

6
app/services/api/v1/projects/branches/delete_service.rb
View File

@@ -40,8 +40,8 @@ class Api::V1::Projects::Branches::DeleteService < ApplicationService
end
def check_branch_exist
result = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
raise Error, '查询分支名称失败！' unless result.is_a?(Hash)
raise Error, '分支不存在！' if !result['branch_name'].include?(@branch_name)
result = $gitea_hat_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
raise Error, '查询分支名称失败！' unless result.is_a?(Array)
raise Error, '分支不存在！' if !result.include?(@branch_name)
end
end

18
app/services/api/v1/projects/branches/list_service.rb
View File

@@ -1,7 +1,7 @@
class Api::V1::Projects::Branches::ListService < ApplicationService
attr_accessor :project, :token, :owner, :repo, :name, :page, :limit
attr_accessor :gitea_data
attr_accessor :gitea_data, :gitea_repo_data
def initialize(project, params, token=nil)
@project = project
@@ -15,8 +15,11 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
def call
load_gitea_data
gitea_data
load_default_branch
@gitea_data[:default_branch] = @gitea_repo_data["default_branch"]
@gitea_data
end
private
@@ -32,9 +35,12 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
end
def load_gitea_data
puts request_params
@gitea_data = $gitea_client.get_repos_branches_by_owner_repo(owner, repo, {query: request_params}) rescue nil
puts @gitea_data
@gitea_data = $gitea_hat_client.get_repos_branches_by_owner_repo(owner, repo, {query: request_params}) rescue nil
raise Error, '获取分支列表失败！' unless @gitea_data.is_a?(Hash)
end
def load_default_branch
@gitea_repo_data = $gitea_client.get_repos_by_owner_repo(owner, repo) rescue nil
raise Error, '获取仓库信息失败！' unless @gitea_data.is_a?(Hash)
end
end

6
app/services/api/v1/projects/branches/update_default_branch_service.rb
View File

@@ -48,8 +48,8 @@ class Api::V1::Projects::Branches::UpdateDefaultBranchService < ApplicationServi
end
def check_branch_exist
result = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
raise Error, '查询分支名称失败！' unless result.is_a?(Hash)
raise Error, '新默认分支不存在！' if !result['branch_name'].include?(@new_default_branch)
result = $gitea_hat_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
raise Error, '查询分支名称失败！' unless result.is_a?(Array)
raise Error, '新默认分支不存在！' if !result.include?(@new_default_branch)
end
end

2
app/services/api/v1/projects/code_stats/list_service.rb
View File

@@ -28,7 +28,7 @@ class Api::V1::Projects::CodeStats::ListService < ApplicationService
end
def load_gitea_data
@gitea_data = $gitea_client.get_repos_code_stats_by_owner_repo(owner, repo, {query: request_params}) rescue nil
@gitea_data = $gitea_hat_client.get_repos_code_stats_by_owner_repo(owner, repo, {query: request_params}) rescue nil
raise Error, '获取贡献者贡献度失败！' unless @gitea_data.is_a?(Hash)
end
end

2
app/services/api/v1/projects/commits/diff_service.rb
View File

@@ -29,7 +29,7 @@ class Api::V1::Projects::Commits::DiffService < ApplicationService
end
def load_gitea_data
@gitea_data = $gitea_client.get_repos_commits_diff_by_owner_repo_sha(owner, repo, sha, {query: request_params}) rescue nil
@gitea_data = $gitea_hat_client.get_repos_commits_diff_by_owner_repo_sha(owner, repo, sha, {query: request_params}) rescue nil
raise Error, '获取提交对比失败！' unless @gitea_data.is_a?(Hash)
end

4
app/services/api/v1/projects/contents/batch_create_service.rb
View File

@@ -78,12 +78,12 @@ class Api::V1::Projects::Contents::BatchCreateService < ApplicationService
def excute_data_to_gitea
puts request_body.to_json
@gitea_data = $gitea_client.post_repos_contents_batch_by_owner_repo(owner, repo, {body: request_body.to_json, query: request_params}) rescue nil
@gitea_data = $gitea_hat_client.post_repos_contents_batch_by_owner_repo(owner, repo, {body: request_body.to_json, query: request_params}) rescue nil
raise Error, '提交文件失败！' unless @gitea_data.is_a?(Hash)
end
def check_branch_exist
result = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params} ) rescue nil
result = $gitea_hat_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params} ) rescue nil
raise Error, '查询分支名称失败！' unless result.is_a?(Hash)
raise Error, '分支不存在！' unless result['branch_name'].include?(branch)
raise Error, '分支已存在！' if result['branch_name'].include?(new_branch) && !new_branch.nil?

2
app/services/api/v1/projects/get_service.rb
View File

@@ -45,6 +45,6 @@ class Api::V1::Projects::GetService < ApplicationService
end
def load_gitea_branch_tag_count
@gitea_branch_tag_count = $gitea_client.get_repos_branch_tag_count_by_owner_repo(owner, repo, {query: request_params}) rescue nil
@gitea_branch_tag_count = $gitea_hat_client.get_repos_branch_tag_count_by_owner_repo(owner, repo, {query: request_params}) rescue nil
end
end

2
app/services/api/v1/projects/pulls/get_service.rb
View File

@@ -26,7 +26,7 @@ class Api::V1::Projects::Pulls::GetService < ApplicationService
end
def load_gitea_data
@gitea_data = $gitea_client.get_repos_pulls_by_owner_repo_index(owner, repo, index, {query: request_params})
@gitea_data = $gitea_hat_client.get_repos_pulls_by_owner_repo_index(owner, repo, index, {query: request_params})
# raise Error, '获取合并请求失败！' unless @gitea_data.is_a?(Hash)
end
end

2
app/services/api/v1/projects/pulls/versions/get_diff_service.rb
View File

@@ -30,7 +30,7 @@ class Api::V1::Projects::Pulls::Versions::GetDiffService < ApplicationService
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})
@gitea_data = $gitea_hat_client.get_repos_pulls_versions_diff_by_owner_repo_index_id(owner, repo, index, version_id, {query: request_params})
raise Error, '获取合并请求版本diff失败！' unless @gitea_data.is_a?(Hash)
end
end

2
app/services/api/v1/projects/pulls/versions/list_service.rb
View File

@@ -30,7 +30,7 @@ class Api::V1::Projects::Pulls::Versions::ListService < ApplicationService
end
def load_gitea_data
@gitea_data = $gitea_client.get_repos_pulls_versions_by_owner_repo_index(owner, repo, index, {query: request_params})
@gitea_data = $gitea_hat_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

2
app/services/api/v1/projects/tags/delete_service.rb
View File

@@ -40,7 +40,7 @@ class Api::V1::Projects::Tags::DeleteService < ApplicationService
end
def check_tag_exist
result = $gitea_client.get_repos_tag_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
result = $gitea_hat_client.get_repos_tag_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
raise Error, '查询标签名称失败！' unless result.is_a?(Array)
raise Error, '标签不存在！' if !result.include?(@tag_name)
end

2
app/services/api/v1/projects/tags/list_service.rb
View File

@@ -30,7 +30,7 @@ class Api::V1::Projects::Tags::ListService < ApplicationService
end
def load_gitea_data
@gitea_data = $gitea_client.get_repos_tags_by_owner_repo(owner, repo, {query: request_params}) rescue nil
@gitea_data = $gitea_hat_client.get_repos_tags_by_owner_repo(owner, repo, {query: request_params}) rescue nil
raise Error, '获取标签列表失败！' unless @gitea_data.is_a?(Hash)
end
end

2
app/services/api/v1/projects/webhooks/create_service.rb
View File

@@ -58,6 +58,6 @@ class Api::V1::Projects::Webhooks::CreateService < ApplicationService
end
def excute_data_to_gitea
@gitea_data = $gitea_client.post_repos_hooks_by_owner_repo(owner, repo, {body: request_body.to_json, query: request_params}) rescue nil
@gitea_data = $gitea_hat_client.post_repos_hooks_by_owner_repo(owner, repo, {body: request_body.to_json, query: request_params}) rescue nil
end
end

2
app/services/api/v1/projects/webhooks/hooktasks_service.rb
View File

@@ -30,6 +30,6 @@ class Api::V1::Projects::Webhooks::ListService < ApplicationService
end
def load_gitea_data
@gitea_data = $gitea_client.get_repos_hooks_hooktasks_by_owner_repo(owner, repo, id, {query: request_params}) rescue nil
@gitea_data = $gitea_hat_client.get_repos_hooks_hooktasks_by_owner_repo(owner, repo, id, {query: request_params}) rescue nil
end
end

2
app/services/api/v1/projects/webhooks/update_service.rb
View File

@@ -58,6 +58,6 @@ class Api::V1::Projects::Webhooks::UpdateService < ApplicationService
end
def excute_data_to_gitea
@gitea_data = $gitea_client.patch_repos_hooks_by_owner_repo_id(owner, repo, id, {body: request_body.to_json, query: request_params}) rescue nil
@gitea_data = $gitea_hat_client.patch_repos_hooks_by_owner_repo_id(owner, repo, id, {body: request_body.to_json, query: request_params}) rescue nil
end
end