Change
This commit is contained in:
parent
df0fcdb5ce
commit
bc82451fcc
|
@ -1,11 +1,11 @@
|
||||||
class SyncForgeController < ApplicationController
|
class SyncForgeController < ApplicationController
|
||||||
# before_action :check_token
|
# before_action :check_token
|
||||||
|
|
||||||
def create
|
def create
|
||||||
ActiveRecord::Base.transaction do
|
ActiveRecord::Base.transaction do
|
||||||
params.permit!
|
params.permit!
|
||||||
sync_params = params[:sync_params]
|
sync_params = params[:sync_params]
|
||||||
project_user = User.where(login: sync_params[:owner_login])&.first
|
project_user = User.where(login: sync_params[:owner_login])&.first
|
||||||
#以前已同步的项目,那么肯定存在仓库
|
#以前已同步的项目,那么肯定存在仓库
|
||||||
|
|
||||||
user_projects = Project.where(user_id: project_user.id)
|
user_projects = Project.where(user_id: project_user.id)
|
||||||
|
@ -24,12 +24,12 @@ class SyncForgeController < ApplicationController
|
||||||
|
|
||||||
if has_project
|
if has_project
|
||||||
SyncLog.sync_log("=================begin_to_update_project========")
|
SyncLog.sync_log("=================begin_to_update_project========")
|
||||||
# project = user_projects.where(id: sync_params[:id]), identifier: sync_params[:identifier])&.first ||
|
# project = user_projects.where(id: sync_params[:id]), identifier: sync_params[:identifier])&.first ||
|
||||||
|
|
||||||
check_sync_project(project, sync_params)
|
check_sync_project(project, sync_params)
|
||||||
else #新建项目
|
else #新建项目
|
||||||
SyncLog.sync_log("=================begin_to_create_new_project========")
|
SyncLog.sync_log("=================begin_to_create_new_project========")
|
||||||
|
|
||||||
project_params = {
|
project_params = {
|
||||||
repository_name: sync_params[:identifier],
|
repository_name: sync_params[:identifier],
|
||||||
user_id: project_user.id,
|
user_id: project_user.id,
|
||||||
|
@ -44,16 +44,16 @@ class SyncForgeController < ApplicationController
|
||||||
new_project_score = ProjectScore.create(score_params)
|
new_project_score = ProjectScore.create(score_params)
|
||||||
SyncLog.sync_log("=================new_project_score:#{new_project_score.try(:id)}========")
|
SyncLog.sync_log("=================new_project_score:#{new_project_score.try(:id)}========")
|
||||||
end
|
end
|
||||||
|
|
||||||
SyncRepositoryJob.perform_later(sync_params[:owner_login], sync_params[:identifier], sync_params[:repository], get_sudomain) if sync_params[:repository].present?
|
SyncRepositoryJob.perform_later(sync_params[:owner_login], sync_params[:identifier], sync_params[:repository], get_sudomain) if sync_params[:repository].present?
|
||||||
check_new_project(project, sync_params)
|
check_new_project(project, sync_params)
|
||||||
else
|
else
|
||||||
SyncLog.sync_log("=============new_project_create_failed, trustie_project_id==:#{params[:sync_params][:id]}")
|
SyncLog.sync_project_log("=============new_project_create_failed, trustie_project_id==:#{params[:sync_params][:id]}")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
rescue Exception => e
|
rescue Exception => e
|
||||||
SyncLog.sync_log("=============sync_has_errors:==#{e.message}, project_id==:#{params[:sync_params][:id]}")
|
SyncLog.sync_project_log("=============sync_has_errors:==#{e.message}, project_id==:#{params[:sync_params][:id]}")
|
||||||
end
|
end
|
||||||
|
|
||||||
def sync_users
|
def sync_users
|
||||||
|
@ -76,7 +76,6 @@ class SyncForgeController < ApplicationController
|
||||||
new_user = User.new(u[:user_params].merge(mail: u_mail))
|
new_user = User.new(u[:user_params].merge(mail: u_mail))
|
||||||
|
|
||||||
username = new_user.login
|
username = new_user.login
|
||||||
|
|
||||||
password = "12345678"
|
password = "12345678"
|
||||||
if new_user.save!
|
if new_user.save!
|
||||||
SyncLog.sync_log("=================sync_to_user_success==#{new_user.login}")
|
SyncLog.sync_log("=================sync_to_user_success==#{new_user.login}")
|
||||||
|
@ -96,7 +95,7 @@ class SyncForgeController < ApplicationController
|
||||||
# SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}")
|
# SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}")
|
||||||
# end
|
# end
|
||||||
# else
|
# else
|
||||||
# SyncLog.sync_log("=============sync_to_user_failed,user_login====#{new_user.login}")
|
# SyncLog.sync_project_log("=============sync_to_user_failed,user_login====#{new_user.login}")
|
||||||
# SyncLog.sync_log("=================sync_to_user_failed,user_login====#{new_user.login}")
|
# SyncLog.sync_log("=================sync_to_user_failed,user_login====#{new_user.login}")
|
||||||
# end
|
# end
|
||||||
# end
|
# end
|
||||||
|
@ -107,7 +106,7 @@ class SyncForgeController < ApplicationController
|
||||||
SyncLog.sync_log("=================sync_user_failed====#{e}")
|
SyncLog.sync_log("=================sync_user_failed====#{e}")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def check_sync_project(project,sync_params)
|
def check_sync_project(project,sync_params)
|
||||||
begin
|
begin
|
||||||
|
@ -117,8 +116,8 @@ class SyncForgeController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
SyncLog.sync_log("----begin_to_check_sync_project----project_id:#{project.id}---------------")
|
SyncLog.sync_log("----begin_to_check_sync_project----project_id:#{project.id}---------------")
|
||||||
change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present? #更新project_score
|
change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present? #更新project_score
|
||||||
change_project_issues(project, sync_params[:issues],project.id, gitea_main)
|
change_project_issues(project, sync_params[:issues],project.id, gitea_main)
|
||||||
change_project_members(project, sync_params[:members],gitea_main)
|
change_project_members(project, sync_params[:members],gitea_main)
|
||||||
change_project_versions(project, sync_params[:project_versions],gitea_main)
|
change_project_versions(project, sync_params[:project_versions],gitea_main)
|
||||||
change_project_watchers(project, sync_params[:project_watchers],gitea_main)
|
change_project_watchers(project, sync_params[:project_watchers],gitea_main)
|
||||||
|
@ -126,7 +125,7 @@ class SyncForgeController < ApplicationController
|
||||||
rescue => e
|
rescue => e
|
||||||
SyncLog.sync_log("=========check_sync_project_errors:#{e}===================")
|
SyncLog.sync_log("=========check_sync_project_errors:#{e}===================")
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def check_new_project(project,sync_params)
|
def check_new_project(project,sync_params)
|
||||||
|
@ -159,7 +158,7 @@ class SyncForgeController < ApplicationController
|
||||||
parent_id: project.id
|
parent_id: project.id
|
||||||
}
|
}
|
||||||
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
|
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
|
||||||
|
|
||||||
SyncLog.sync_log("***6. end_to_sync_parises---------------")
|
SyncLog.sync_log("***6. end_to_sync_parises---------------")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -181,7 +180,7 @@ class SyncForgeController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
pre_project_score.save! if change_num > 0 #如果 project_score有变化则更新
|
pre_project_score.save! if change_num > 0 #如果 project_score有变化则更新
|
||||||
else
|
else
|
||||||
ProjectScore.create!(project_scores.merge(project_id: project.id))
|
ProjectScore.create!(project_scores.merge(project_id: project.id))
|
||||||
end
|
end
|
||||||
SyncLog.sync_log("***1. end_to_sync_project_score---------------")
|
SyncLog.sync_log("***1. end_to_sync_project_score---------------")
|
||||||
|
@ -217,7 +216,7 @@ class SyncForgeController < ApplicationController
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
SyncProjectsJob.perform_later(sync_projects_params, gitea_main) if sync_projects_params.present?
|
SyncProjectsJob.perform_later(sync_projects_params, gitea_main) if sync_projects_params.present?
|
||||||
SyncLog.sync_log("***2. end_to_syncissues---------------")
|
SyncLog.sync_log("***2. end_to_syncissues---------------")
|
||||||
rescue Exception => e
|
rescue Exception => e
|
||||||
|
@ -238,7 +237,7 @@ class SyncForgeController < ApplicationController
|
||||||
parent_id: project.id
|
parent_id: project.id
|
||||||
}
|
}
|
||||||
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
|
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
SyncLog.sync_log("***5. begin_to_sync_watchers---------------")
|
SyncLog.sync_log("***5. begin_to_sync_watchers---------------")
|
||||||
|
@ -258,7 +257,7 @@ class SyncForgeController < ApplicationController
|
||||||
}
|
}
|
||||||
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
|
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
|
||||||
end
|
end
|
||||||
|
|
||||||
SyncLog.sync_log("***4. end_to_sync_versions---------------")
|
SyncLog.sync_log("***4. end_to_sync_versions---------------")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -277,12 +276,12 @@ class SyncForgeController < ApplicationController
|
||||||
}
|
}
|
||||||
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
|
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
|
||||||
end
|
end
|
||||||
|
|
||||||
SyncLog.sync_log("***3. end_to_sync_members---------------")
|
SyncLog.sync_log("***3. end_to_sync_members---------------")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# def check_token
|
# def check_token
|
||||||
# sync_params = params[:sync_params]
|
# sync_params = params[:sync_params]
|
||||||
# unless sync_params[:token] && sync_params[:token] == get_token
|
# unless sync_params[:token] && sync_params[:token] == get_token
|
||||||
# render json: {message: "token_errors"}
|
# render json: {message: "token_errors"}
|
||||||
|
@ -304,4 +303,4 @@ class SyncForgeController < ApplicationController
|
||||||
return gitea_main
|
return gitea_main
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
|
@ -112,7 +112,6 @@ class SyncProjectsJob < ApplicationJob
|
||||||
rescue => e
|
rescue => e
|
||||||
SyncLog.sync_log("=========***【#{target_type}】creat_had_erros:#{e}===================")
|
SyncLog.sync_log("=========***【#{target_type}】creat_had_erros:#{e}===================")
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_journals(target_jsons, target_type,issue_id)
|
def create_journals(target_jsons, target_type,issue_id)
|
||||||
|
|
Loading…
Reference in New Issue