change bugs

This commit is contained in:
sylor_huang@126.com 2020-07-14 22:44:58 +08:00
parent 2e7d0abcbf
commit ae037203e8
1 changed files with 38 additions and 30 deletions

View File

@ -10,7 +10,6 @@ class SyncProjectsJob < ApplicationJob
begin begin
url = "#{gitea_main}/sync_forges" #trustie上的相关路由 url = "#{gitea_main}/sync_forges" #trustie上的相关路由
uri = URI.parse(url) uri = URI.parse(url)
http = Net::HTTP.new(uri.hostname, uri.port) http = Net::HTTP.new(uri.hostname, uri.port)
http.use_ssl = true http.use_ssl = true
@ -23,6 +22,7 @@ class SyncProjectsJob < ApplicationJob
SyncLog.sync_project_log("==========target_jsons: #{target_jsons}============") SyncLog.sync_project_log("==========target_jsons: #{target_jsons}============")
update_new_project(target_jsons[:targets_params][0], sync_params[:new_project_id]) update_new_project(target_jsons[:targets_params][0], sync_params[:new_project_id])
else else
SyncLog.sync_project_log("========== #{sync_params[:type]}============")
create_target(target_jsons[:targets_params], sync_params[:type].to_s) create_target(target_jsons[:targets_params], sync_params[:type].to_s)
end end
else else
@ -47,42 +47,50 @@ class SyncProjectsJob < ApplicationJob
end end
def create_target(target_jsons, target_type) def create_target(target_jsons, target_type)
SyncLog.sync_project_log("***【#{target_type}】. begin_to_create_target---------------") begin
return SyncLog.sync_log("*** no target_jsons") if target_jsons.blank? SyncLog.sync_project_log("***【#{target_type}】. begin_to_create_target---------------")
target_jsons.each_with_index do |re,index| return SyncLog.sync_log("*** no target_jsons") if target_jsons.blank?
SyncLog.sync_project_log("***user_login:#{re[:user_login]}----target_type:#{target_type}-----#{index+1}") target_jsons.each_with_index do |re,index|
if re[:target_params].present? SyncLog.sync_project_log("***user_login:#{re[:user_login]}----target_type:#{target_type}-----#{index+1}")
SyncLog.sync_log("***user_login:#{re[:user_login]}----target_type:#{target_type}") if re[:target_params].present?
u_id = User.select(:id, :login).where(login: re[:user_login]).pluck(:id).first SyncLog.sync_log("***user_login:#{re[:user_login]}----target_type:#{target_type}")
re[:target_params].delete(:id) u_id = User.select(:id, :login).where(login: re[:user_login]).pluck(:id).first
if target_type == "Issue" re[:target_params].delete(:id)
new_target = target_type.constantize.new(re[:target_params].merge(author_id: u_id)) if target_type == "Issue"
else new_target = target_type.constantize.new(re[:target_params].merge(author_id: u_id))
new_target = target_type.constantize.new(re[:target_params].merge(user_id: u_id)) else
end new_target = target_type.constantize.new(re[:target_params].merge(user_id: u_id))
if target_type == "Issue"
assing_u_id = User.select(:id, :login).where(login: re[:assign_login]).pluck(:id).first
new_target.assigned_to_id = assing_u_id
end
if new_target.save!
if re[:journals].present?
create_journals(re[:journals], "Journal", new_target.id)
end end
if re[:journal_details].present?
re[:journal_details].each do |j| if target_type == "Issue"
JournalDetail.create!(j.merge(journal_id: new_target.id)) if j.present? assing_u_id = User.select(:id, :login).where(login: re[:assign_login]).pluck(:id).first
end new_target.assigned_to_id = assing_u_id
end end
if re[:member_roles].present? if new_target.save!
re[:member_roles].each do |m| SyncLog.sync_project_log("***【#{target_type}】. create_success---------------")
MemberRole.create!(m.merge(member_id: new_target.id)) if m.present? if re[:journals].present?
create_journals(re[:journals], "Journal", new_target.id)
end end
if re[:journal_details].present?
re[:journal_details].each do |j|
JournalDetail.create!(j.merge(journal_id: new_target.id)) if j.present?
end
end
if re[:member_roles].present?
re[:member_roles].each do |m|
MemberRole.create!(m.merge(member_id: new_target.id)) if m.present?
end
end
else
SyncLog.sync_project_log("***【#{target_type}】. create_failed---------------")
end end
end end
end end
SyncLog.sync_project_log("***111222. end_to_create_target---------------")
rescue => e
SyncLog.sync_project_log("=========***【#{target_type}】creat_had_erros:#{e}===================")
end end
SyncLog.sync_project_log("***111222. end_to_create_target---------------")
end end
def create_journals(target_jsons, target_type,issue_id) def create_journals(target_jsons, target_type,issue_id)