From a11adfc41bb17092aa3b22f142f6cb2271f509e5 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 15 Jul 2020 18:03:50 +0800 Subject: [PATCH 1/5] change bugs --- app/controllers/sync_forge_controller.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index 939b72a13..6e5fda75d 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -7,7 +7,7 @@ class SyncForgeController < ApplicationController sync_params = params[:sync_params] project_user = User.where(login: sync_params[:owner_login])&.first #以前已同步的项目,那么肯定存在仓库 - + SyncLog.sync_log("=================begin_to_sync_forge: project_identifier: #{sync_params[:identifier]}========") user_projects = Project.where(user_id: project_user.id) if user_projects.where(id: sync_params[:id], identifier: sync_params[:identifier]).present? has_project = true @@ -24,8 +24,6 @@ class SyncForgeController < ApplicationController if has_project SyncLog.sync_log("=================begin_to_update_project========") - # project = user_projects.where(id: sync_params[:id]), identifier: sync_params[:identifier])&.first || - check_sync_project(project, sync_params) else #新建项目 SyncLog.sync_log("=================begin_to_create_new_project========") From 9b1f99cd1702eb1cec8f3a81e4140d450995c3db Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 15 Jul 2020 18:17:22 +0800 Subject: [PATCH 2/5] change bugs --- app/controllers/sync_forge_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index 6e5fda75d..6b68cd20c 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -188,7 +188,7 @@ class SyncForgeController < ApplicationController end def change_project_issues(project, old_issues_params,project_id, gitea_main) - SyncLog.sync_log("***2. begin_to_syncissues---------------") + SyncLog.sync_log("***2. begin_to_syncissues----old_issues_params:#{old_issues_params[:ids]}-----------") begin forge_issue_ids = project&.issues&.select(:id)&.pluck(:id) sync_projects_params = {} From 55287cfa71db3c0e606d2894c630f5aa6ed26112 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 15 Jul 2020 18:27:53 +0800 Subject: [PATCH 3/5] change bugs --- app/controllers/sync_forge_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index 6b68cd20c..fa97c2f79 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -188,12 +188,14 @@ class SyncForgeController < ApplicationController end def change_project_issues(project, old_issues_params,project_id, gitea_main) - SyncLog.sync_log("***2. begin_to_syncissues----old_issues_params:#{old_issues_params[:ids]}-----------") + SyncLog.sync_log("***2. begin_to_syncissues---------------") begin forge_issue_ids = project&.issues&.select(:id)&.pluck(:id) sync_projects_params = {} + SyncLog.sync_log("***2--01. forge_issue_ids-#{forge_issue_ids.size.to_i}--------------") if forge_issue_ids.size.to_i <= old_issues_params[:count].to_i diff_issue_ids = old_issues_params[:ids] - forge_issue_ids + SyncLog.sync_log("***2--02. diff_issue_ids-#{diff_issue_ids}--------------") if diff_issue_ids.size == 0 #issue数量一样，判断评论是否有增减 forge_journal_ids = Journal.select([:id, :journalized_id, :journalized_type]).where(journalized_id: forge_issue_ids).pluck(:id) diff_journal_ids = old_issues_params[:journals][:ids] - forge_journal_ids From 626e40cb246152ad31ffddbc6854baf3d87da295 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 15 Jul 2020 18:33:10 +0800 Subject: [PATCH 4/5] change bugs --- app/controllers/sync_forge_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index fa97c2f79..fdd2c74cb 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -195,7 +195,7 @@ class SyncForgeController < ApplicationController SyncLog.sync_log("***2--01. forge_issue_ids-#{forge_issue_ids.size.to_i}--------------") if forge_issue_ids.size.to_i <= old_issues_params[:count].to_i diff_issue_ids = old_issues_params[:ids] - forge_issue_ids - SyncLog.sync_log("***2--02. diff_issue_ids-#{diff_issue_ids}--------------") + if diff_issue_ids.size == 0 #issue数量一样，判断评论是否有增减 forge_journal_ids = Journal.select([:id, :journalized_id, :journalized_type]).where(journalized_id: forge_issue_ids).pluck(:id) diff_journal_ids = old_issues_params[:journals][:ids] - forge_journal_ids @@ -216,7 +216,7 @@ class SyncForgeController < ApplicationController } end end - + SyncLog.sync_log("***2--02. sync_projects_params-#{sync_projects_params}--------------") SyncProjectsJob.perform_later(sync_projects_params, gitea_main) if sync_projects_params.present? SyncLog.sync_log("***2. end_to_syncissues---------------") rescue Exception => e From 650029fed8a11779bf254f7e7e65152d625d8bb8 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 15 Jul 2020 20:30:57 +0800 Subject: [PATCH 5/5] test quesitons --- app/controllers/sync_forge_controller.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index fdd2c74cb..203a486c4 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -109,9 +109,9 @@ class SyncForgeController < ApplicationController def check_sync_project(project,sync_params) begin gitea_main = "https://www.trustie.net/" - if request.subdomain === 'testforgeplus' - gitea_main = "https://ucloudtest.trustie.net/" - end + # if request.subdomain === 'testforgeplus' + # gitea_main = "https://ucloudtest.trustie.net/" + # end 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 @@ -137,9 +137,9 @@ class SyncForgeController < ApplicationController } gitea_main = "https://www.trustie.net/" - if request.subdomain === 'testforgeplus' - gitea_main = "https://ucloudtest.trustie.net/" - end + # if request.subdomain === 'testforgeplus' + # gitea_main = "https://ucloudtest.trustie.net/" + # end SyncProjectsJob.perform_later(sync_projects_params, gitea_main) SyncLog.sync_log("***8. end_to_sync_new_project---------------") end