winhpf
/
forgeplus
forked from Gitlink/forgeplus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev_trustie' into dev_chain

This commit is contained in:
sylor_huang@126.com 2020-07-10 14:53:46 +08:00
parent 0323166499 abae5618f4
commit 93b2872ad9
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/sync_forge_controller.rb
View File

@ -21,10 +21,13 @@ class SyncForgeController < ApplicationController
}
project = Projects::CreateService.new(project_user, project_params).call
Rails.logger.info("=================new_project_id:#{project.id}========")
Rails.logger.info("=================new_repository_id:#{project&.repository&.id}========")
if project.present?
ProjectScore.create!( sync_params[:project_score].merge(project_id: project.id)) if sync_params[:project_score].present?
Rails.logger.info("=================sync_params_test:#{sync_params[:project_score]}========")
Rails.logger.info("=================repository_present?:#{sync_params[:repository]}========")
if sync_params[:project_score].present?
Rails.logger.info("=================sync_params_test:#{sync_params[:project_score]}========")
new_project_score = ProjectScore.create!( sync_params[:project_score].merge(project_id: project.id))
Rails.logger.info("=================new_project_is_create:#{new_project_score}========")
end
SyncRepositoryJob.perform_later(project.repository, sync_params[:repository]) if sync_params[:repository].present?
check_new_project(project, sync_params)
end

1
app/services/projects/create_service.rb
View File

@ -12,7 +12,6 @@ class Projects::CreateService < ApplicationService
@project = Project.new(project_params)
ActiveRecord::Base.transaction do
if @project.save!
Rails.logger.info("#############___________repository_params______###########{repository_params}")
Repositories::CreateService.new(user, @project, repository_params).call
else
Rails.logger.info("#############___________create_project_erros______###########{@project.errors.messages}")

11
app/services/repositories/create_service.rb
View File

@ -11,9 +11,7 @@ class Repositories::CreateService < ApplicationService
@repository = Repository.new(repository_params)
ActiveRecord::Base.transaction do
if @repository.save!
Rails.logger.info("#############__________gitea_repository_params______###########{gitea_repository_params}")
gitea_repository = Gitea::Repository::CreateService.new(user.gitea_token, gitea_repository_params).call
Rails.logger.info("#############_______create__gitea_repository______###########{gitea_repository}")
sync_project(@repository, gitea_repository)
sync_repository(@repository, gitea_repository)
if project.project_type == "common"
@ -31,8 +29,6 @@ class Repositories::CreateService < ApplicationService
else
Rails.logger.info("#############___________create_repository_erros______###########{@repository.errors.messages}")
end
Rails.logger.info("#############___________@create_repository_url______###########{@repository.try(:url)}")
Rails.logger.info("#############___________@create_project_gpid______###########{project.try(:gpid)}")
@repository
end
rescue => e
@ -44,18 +40,15 @@ class Repositories::CreateService < ApplicationService
def sync_project(repository, gitea_repository)
if gitea_repository
s = project.update_columns(
project.update_columns(
gpid: gitea_repository["id"],
identifier: repository.identifier,
forked_count: gitea_repository["forks_count"])
Rails.logger.info("#############_________sync_project__ss___###########{s}")
end
end
def sync_repository(repository, gitea_repository)
Rails.logger.info("#############__________sync_repository______###########{repository.try(:id)}")
r = repository.update_columns(url: remote_repository_url,) if gitea_repository
Rails.logger.info("#############__________sync_repository___rrrr___###########{r}")
repository.update_columns(url: remote_repository_url,) if gitea_repository
end
def remote_repository_url