From eedaba9bed3910285ba52d45bdd832012f83de13 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 14 Jul 2020 20:19:16 +0800 Subject: [PATCH 1/8] change --- app/controllers/sync_forge_controller.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index 7ead736c6..ba4cde853 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -46,8 +46,15 @@ class SyncForgeController < ApplicationController if User.exists?(login: u[:user_params][:login]) SyncLog.sync_log("=================sync_to_user_been_exists====#{u[:user_params][:login]}") else - new_user = User.new(u[:user_params]) + if u[:user_params][:mail].blank? + u_mail = "#{u[:user_params][:login]}@example.com" + else + u_mail = u[:user_params][:mail] + end + new_user = User.new(u[:user_params].merge(mail: u_mail)) + username = new_user.login + password = "12345678" ActiveRecord::Base.transaction do interactor = Gitea::RegisterInteractor.call({username: username, email: new_user.mail, password: password}) From f71e65f60008db2d7b9e6d0e47836ce39aa89603 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 15 Jul 2020 16:06:06 +0800 Subject: [PATCH 2/8] change bugs --- app/controllers/sync_forge_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index db3639891..6f178565b 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -9,12 +9,12 @@ class SyncForgeController < ApplicationController #以前已同步的项目,那么肯定存在仓库 user_projects = Project.where(user_id: project_user.id) - if user_projects.where(id: sync_params[:id]), identifier: sync_params[:identifier]).present? + if user_projects.where(id: sync_params[:id], identifier: sync_params[:identifier]).present? has_project = true - project = user_projects.where(id: sync_params[:id]), identifier: sync_params[:identifier])&.first + project = user_projects.where(id: sync_params[:id], identifier: sync_params[:identifier])&.first elsif user_projects.where(id: sync_params[:id]).present? has_project = true - project = user_projects.where(id: sync_params[:id]))&.first + project = user_projects.where(id: sync_params[:id])&.first elsif user_projects.where(identifier: sync_params[:identifier]).present? has_project = true project = user_projects.where(identifier: sync_params[:identifier])&.first From bc82451fcca080834381ff5160305f363a5577de Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 15 Jul 2020 18:02:43 +0800 Subject: [PATCH 3/8] Change --- app/controllers/sync_forge_controller.rb | 41 ++++++++++++------------ app/jobs/sync_projects_job.rb | 1 - 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index f3557058c..147961a2f 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -1,11 +1,11 @@ class SyncForgeController < ApplicationController # before_action :check_token - def create + def create ActiveRecord::Base.transaction do params.permit! sync_params = params[:sync_params] - project_user = User.where(login: sync_params[:owner_login])&.first + project_user = User.where(login: sync_params[:owner_login])&.first #以前已同步的项目,那么肯定存在仓库 user_projects = Project.where(user_id: project_user.id) @@ -24,12 +24,12 @@ 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 || + # 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========") - + project_params = { repository_name: sync_params[:identifier], user_id: project_user.id, @@ -44,16 +44,16 @@ class SyncForgeController < ApplicationController new_project_score = ProjectScore.create(score_params) SyncLog.sync_log("=================new_project_score:#{new_project_score.try(:id)}========") end - + SyncRepositoryJob.perform_later(sync_params[:owner_login], sync_params[:identifier], sync_params[:repository], get_sudomain) if sync_params[:repository].present? check_new_project(project, sync_params) else - SyncLog.sync_log("=============new_project_create_failed, trustie_project_id==:#{params[:sync_params][:id]}") + SyncLog.sync_project_log("=============new_project_create_failed, trustie_project_id==:#{params[:sync_params][:id]}") end end end rescue Exception => e - SyncLog.sync_log("=============sync_has_errors:==#{e.message}, project_id==:#{params[:sync_params][:id]}") + SyncLog.sync_project_log("=============sync_has_errors:==#{e.message}, project_id==:#{params[:sync_params][:id]}") end def sync_users @@ -76,7 +76,6 @@ class SyncForgeController < ApplicationController new_user = User.new(u[:user_params].merge(mail: u_mail)) username = new_user.login - password = "12345678" if new_user.save! SyncLog.sync_log("=================sync_to_user_success==#{new_user.login}") @@ -96,7 +95,7 @@ class SyncForgeController < ApplicationController # SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}") # end # else - # SyncLog.sync_log("=============sync_to_user_failed,user_login====#{new_user.login}") + # SyncLog.sync_project_log("=============sync_to_user_failed,user_login====#{new_user.login}") # SyncLog.sync_log("=================sync_to_user_failed,user_login====#{new_user.login}") # end # end @@ -107,7 +106,7 @@ class SyncForgeController < ApplicationController SyncLog.sync_log("=================sync_user_failed====#{e}") end - private + private def check_sync_project(project,sync_params) begin @@ -117,8 +116,8 @@ class SyncForgeController < ApplicationController 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 - change_project_issues(project, sync_params[:issues],project.id, gitea_main) + change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present? #更新project_score + change_project_issues(project, sync_params[:issues],project.id, gitea_main) change_project_members(project, sync_params[:members],gitea_main) change_project_versions(project, sync_params[:project_versions],gitea_main) change_project_watchers(project, sync_params[:project_watchers],gitea_main) @@ -126,7 +125,7 @@ class SyncForgeController < ApplicationController rescue => e SyncLog.sync_log("=========check_sync_project_errors:#{e}===================") end - + end def check_new_project(project,sync_params) @@ -159,7 +158,7 @@ class SyncForgeController < ApplicationController parent_id: project.id } SyncProjectsJob.perform_later(sync_projects_params,gitea_main) - + SyncLog.sync_log("***6. end_to_sync_parises---------------") end end @@ -181,7 +180,7 @@ class SyncForgeController < ApplicationController end end pre_project_score.save! if change_num > 0 #如果 project_score有变化则更新 - else + else ProjectScore.create!(project_scores.merge(project_id: project.id)) end SyncLog.sync_log("***1. end_to_sync_project_score---------------") @@ -217,7 +216,7 @@ class SyncForgeController < ApplicationController } end end - + SyncProjectsJob.perform_later(sync_projects_params, gitea_main) if sync_projects_params.present? SyncLog.sync_log("***2. end_to_syncissues---------------") rescue Exception => e @@ -238,7 +237,7 @@ class SyncForgeController < ApplicationController parent_id: project.id } SyncProjectsJob.perform_later(sync_projects_params,gitea_main) - + end end SyncLog.sync_log("***5. begin_to_sync_watchers---------------") @@ -258,7 +257,7 @@ class SyncForgeController < ApplicationController } SyncProjectsJob.perform_later(sync_projects_params,gitea_main) end - + SyncLog.sync_log("***4. end_to_sync_versions---------------") end end @@ -277,12 +276,12 @@ class SyncForgeController < ApplicationController } SyncProjectsJob.perform_later(sync_projects_params,gitea_main) end - + SyncLog.sync_log("***3. end_to_sync_members---------------") end end - # def check_token + # def check_token # sync_params = params[:sync_params] # unless sync_params[:token] && sync_params[:token] == get_token # render json: {message: "token_errors"} @@ -304,4 +303,4 @@ class SyncForgeController < ApplicationController return gitea_main end -end +end \ No newline at end of file diff --git a/app/jobs/sync_projects_job.rb b/app/jobs/sync_projects_job.rb index e0655fe5a..104cc6e59 100644 --- a/app/jobs/sync_projects_job.rb +++ b/app/jobs/sync_projects_job.rb @@ -112,7 +112,6 @@ class SyncProjectsJob < ApplicationJob rescue => e SyncLog.sync_log("=========***【#{target_type}】creat_had_erros:#{e}===================") end - end def create_journals(target_jsons, target_type,issue_id) 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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