From 6e31352f8d8592384d515c9d2177e71504fe1b0d Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Fri, 10 Jul 2020 16:25:03 +0800
Subject: [PATCH] change sync

---
 app/jobs/sync_projects_job.rb | 57 ++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/app/jobs/sync_projects_job.rb b/app/jobs/sync_projects_job.rb
index f19993d6f..a333e8cb4 100644
--- a/app/jobs/sync_projects_job.rb
+++ b/app/jobs/sync_projects_job.rb
@@ -26,8 +26,11 @@ class SyncProjectsJob < ApplicationJob
         if response.status == 200
           target_jsons = response.body
           SyncLog.sync_log.info("=========target_jsons: #{target_jsons}============")
-          if target_jsons.present? && sync_params[:type]
-            create_target(eval(target_jsons), sync_params[:type].to_s)
+          target_jsons = eval(target_jsons)
+          if sync_params[:type] == "Project"
+            update_new_project(target_jsons, sync_params[:new_project_id])
+          else
+            create_target(project, eval(target_jsons), sync_params[:type].to_s)
           end
         else
           SyncLog.sync_log.info("==========sync_project_to_forge_failed #{sync_params[:type]}============")
@@ -38,32 +41,38 @@ class SyncProjectsJob < ApplicationJob
     end
   end
 
+  def update_new_project(re, project_id)
+    project = Project.find_by(id: project_id)
+    project.update(re[:target_params].compact!) if re[:target_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[:versions_params], "Version") if re[:versions_params].present?
+    create_target(re[:watcher_params], "Watcher") if re[:watcher_params].present?
+    create_target(re[:praise_treads], "PraiseTread") if re[:praise_treads].present?
+  end
 
-  def create_target(target_jsons, target_type)
+
+  def create_target(project, target_jsons, target_type)
     Rails.logger.info("***111222. begin_to_create_target---------------")
     target_jsons.each do |re|
-      Rails.logger.info("***user_login:#{re[:user_login]}----target_type:#{target_type}")
-      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))
-      if target_type == "Project"
-        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[:versions_params], "Version") if re[:versions_params].present?
-        create_target(re[:watcher_params], "Watcher") if re[:watcher_params].present?
-        create_target(re[:praise_treads], "PraiseTread") if re[:praise_treads].present?
-      end
-      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
-        if re[:journals].present?
-          create_target(re[:journals], "Journal")
+      if re[:target_params].present?
+        Rails.logger.info("***user_login:#{re[:user_login]}----target_type:#{target_type}")
+        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))
+        
+        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
+          if re[:journals].present?
+            create_target(project, re[:journals], "Journal")
+          end
         end
-      end
-      if new_target.save!
-        if re[:journal_details].present?
-          re[:journal_details].each do |j|
-            JournalDetail.create!(j[:journal_detail].merge(journal_id: new_target.id))
+        if new_target.save!
+          if re[:journal_details].present?
+            re[:journal_details].each do |j|
+              JournalDetail.create!(j[:journal_detail].merge(journal_id: new_target.id))
+            end
           end
         end
       end