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

change bugs

This commit is contained in:
sylor_huang@126.com 2020-07-15 16:25:31 +08:00
parent e97d66bf30
commit 09835dda24
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/sync_forge_controller.rb
View File

@ -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
@ -194,7 +194,7 @@ class SyncForgeController < ApplicationController
begin
forge_issue_ids = project&.issues&.select(:id)&.pluck(:id)
sync_projects_params = {}
unless forge_issue_ids.size.to_i <= old_issues_params[:count].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
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)
@ -227,7 +227,7 @@ class SyncForgeController < ApplicationController
def change_project_watchers(project, watchers,gitea_main)
SyncLog.sync_log("***5. begin_to_sync_watchers---------------")
forge_watchers_ids = project&.watchers&.select(:id)&.pluck(:id)
unless forge_watchers_ids.size.to_i <= watchers[:count].to_i
if forge_watchers_ids.size.to_i <= watchers[:count].to_i
diff_target_ids = watchers[:ids] - forge_watchers_ids
if diff_target_ids.size > 0
sync_projects_params = {
@ -246,7 +246,7 @@ class SyncForgeController < ApplicationController
def change_project_versions(project, versions,gitea_main)
SyncLog.sync_log("***4. begin_to_sync_versions---------------")
forge_version_ids = project&.versions&.select(:id)&.pluck(:id)
unless forge_version_ids.size <= versions[:count].to_i
if forge_version_ids.size <= versions[:count].to_i
diff_version_ids = versions[:ids] - forge_version_ids
if diff_version_ids.size > 0
sync_projects_params = {
@ -265,7 +265,7 @@ class SyncForgeController < ApplicationController
def change_project_members(project, members,gitea_main)
SyncLog.sync_log("***3. begin_to_sync_members---------------")
forge_member_ids = project&.members&.select(:id)&.pluck(:id)
unless forge_member_ids.size <= members[:count]
if forge_member_ids.size <= members[:count]
diff_member_ids = members[:ids] - forge_member_ids
if diff_member_ids.size > 0
sync_projects_params = {

2
app/models/sync_log.rb
View File

@ -5,7 +5,7 @@ class SyncLog
end
def self.sync_project_log(message=nil)
@my_log ||= Logger.new("#{Rails.root}/log/sync_error_project.log")
@my_log ||= Logger.new("#{Rails.root}/log/sync_project_log.log")
@my_log.debug(message) unless message.nil?
end
end