Merge branch 'dev_trustie' into dev_chain

This commit is contained in:
sylor_huang@126.com 2020-07-10 19:44:21 +08:00
commit 9e310f992e
1 changed files with 4 additions and 3 deletions

View File

@ -21,6 +21,7 @@ class SyncProjectsJob < ApplicationJob
if response.code.to_s == "200" if response.code.to_s == "200"
target_jsons = response.body target_jsons = response.body
if sync_params[:type] == "Project" if sync_params[:type] == "Project"
SyncLog.sync_log("==========targets_params: #{target_jsons[:targets_params]}============")
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(project, target_jsons[:targets_params], sync_params[:type].to_s)
@ -36,10 +37,10 @@ class SyncProjectsJob < ApplicationJob
private private
def update_new_project(re, project_id) def update_new_project(re, project_id)
SyncLog.sync_log("==========re: #{re}============")
SyncLog.sync_log("==========project_id: #{project_id}============")
project = Project.find_by(id: project_id) project = Project.find_by(id: project_id)
SyncLog.sync_log("==========project: #{project.id}============") SyncLog.sync_log("==========re_target_params: #{re[:target_params]}============")
SyncLog.sync_log("==========project_params: #{re[:target_params]}============")
SyncLog.sync_log("==========update_project_params: #{project.update(re[:target_params])}============")
project.update(re[:target_params]) if re[:target_params].present? project.update(re[:target_params]) if re[:target_params].present?
create_target(re[:issues_params], "Issue") if re[:issues_params].present? create_target(re[:issues_params], "Issue") if re[:issues_params].present?
create_target(re[:member_params], "Member") if re[:member_params].present? create_target(re[:member_params], "Member") if re[:member_params].present?