floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

add: return failed mirror repository field

This commit is contained in:
yystopf 2021-08-18 15:40:50 +08:00
parent f996525e8e
commit eafc8ea527
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/helpers/projects_helper.rb
View File

@ -34,11 +34,12 @@ module ProjectsHelper
end end
def json_response(project, user) def json_response(project, user)
repo = Repository.includes(:mirror).select(:id, :mirror_url, :source_clone_url).find_by(project: project) repo = Repository.includes(:mirror).select(:id, :is_mirror, :mirror_url, :source_clone_url).find_by(project: project)
tmp_json = {} tmp_json = {}
unless project.common? unless project.common?
tmp_json = tmp_json.merge({ tmp_json = tmp_json.merge({
is_mirror: repo.is_mirror ? true : false,
mirror_status: repo.mirror_status, mirror_status: repo.mirror_status,
mirror_num: repo.mirror_num, mirror_num: repo.mirror_num,
mirror_url: repo.remote_mirror_url, mirror_url: repo.remote_mirror_url,
@ -54,7 +55,11 @@ module ProjectsHelper
repo_id: repo.id, repo_id: repo.id,
open_devops: (user.blank? || user.is_a?(AnonymousUser)) ? false : project.open_devops?, open_devops: (user.blank? || user.is_a?(AnonymousUser)) ? false : project.open_devops?,
type: project.numerical_for_project_type, type: project.numerical_for_project_type,
author: render_owner(project) author: render_owner(project),
project_category_id: project.project_category_id,
project_language_id: project.project_language_id,
license_id: project.license_id,
ignore_id: project.ignore_id
}).compact }).compact
render json: tmp_json render json: tmp_json

7
app/jobs/migrate_remote_repository_job.rb
View File

@ -8,10 +8,13 @@ class MigrateRemoteRepositoryJob < ApplicationJob
puts "############ MigrateRemoteRepositoryJob starting ... ############" puts "############ MigrateRemoteRepositoryJob starting ... ############"
gitea_repository = Gitea::Repository::MigrateService.new(token, params).call gitea_repository = Gitea::Repository::MigrateService.new(token, params).call
if gitea_repository puts "#gitea_repository#{gitea_repository}"
repo&.project&.update_columns(gpid: gitea_repository["id"]) if gitea_repository[0]==201
repo&.project&.update_columns(gpid: gitea_repository[2]["id"])
repo&.mirror&.succeeded! repo&.mirror&.succeeded!
puts "############ mirror status: #{repo.mirror.status} ############" puts "############ mirror status: #{repo.mirror.status} ############"
else
repo&.mirror&.failed!
end end
end end
end end

2
app/services/gitea/repository/migrate_service.rb
View File

@ -33,7 +33,7 @@ class Gitea::Repository::MigrateService < Gitea::ClientService
def call def call
response = post(url, request_params) response = post(url, request_params)
render_201_response(response) render_response(response)
end end
private private