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

Merge branch 'dev_trustie' into dev_chain

This commit is contained in:
sylor_huang@126.com 2020-07-10 20:10:48 +08:00
parent bb97f33732 4aeb79de1a
commit ab2fe592ec
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/jobs/sync_projects_job.rb
View File

@ -23,7 +23,7 @@ class SyncProjectsJob < ApplicationJob
SyncLog.sync_log("==========target_jsons: #{target_jsons}============") SyncLog.sync_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
create_target(project, target_jsons[:targets_params], sync_params[:type].to_s) create_target(target_jsons[:targets_params], sync_params[:type].to_s)
end end
else else
SyncLog.sync_log("==========sync_project_to_forge_failed #{sync_params[:type]}============") SyncLog.sync_log("==========sync_project_to_forge_failed #{sync_params[:type]}============")
@ -47,11 +47,12 @@ class SyncProjectsJob < ApplicationJob
end end
def create_target(project, target_jsons, target_type) def create_target(target_jsons, target_type)
Rails.logger.info("***【#{target_type}】. begin_to_create_target---------------") SyncLog.sync_log("***【#{target_type}】. begin_to_create_target---------------")
return SyncLog.sync_log("*** no target_jsons") if target_jsons.blank?
target_jsons.each do |re| target_jsons.each do |re|
if re[:target_params].present? if re[:target_params].present?
Rails.logger.info("***user_login:#{re[:user_login]}----target_type:#{target_type}") SyncLog.sync_log("***user_login:#{re[:user_login]}----target_type:#{target_type}")
u_id = User.select(:id, :login).where(login: re[:user_login]).pluck(:id).first u_id = User.select(:id, :login).where(login: re[:user_login]).pluck(:id).first
new_target = target_type.constantize.new(re[:target_params].merge(user_id: u_id)) new_target = target_type.constantize.new(re[:target_params].merge(user_id: u_id))
@ -60,7 +61,7 @@ class SyncProjectsJob < ApplicationJob
assing_u_id = User.select(:id, :login).where(login: re[:assign_login]).pluck(:id).first assing_u_id = User.select(:id, :login).where(login: re[:assign_login]).pluck(:id).first
new_target.assigned_to_id = assing_u_id new_target.assigned_to_id = assing_u_id
if re[:journals].present? if re[:journals].present?
create_target(project, re[:journals], "Journal") create_target(re[:journals], "Journal")
end end
end end
if new_target.save! if new_target.save!
@ -72,6 +73,6 @@ class SyncProjectsJob < ApplicationJob
end end
end end
end end
Rails.logger.info("***111222. end_to_create_target---------------") SyncLog.sync_log("***111222. end_to_create_target---------------")
end end
end end