floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-22 04:35:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_trustie' into dev_chain

Browse Source
This commit is contained in:
sylor_huang@126.com
2020-06-23 15:00:33 +08:00
parent 8ffbfdd7e8 33d87b0c93
commit b7c86fd83c
7 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/services/projects/migrate_service.rb
View File

@@ -8,12 +8,10 @@ class Projects::MigrateService < ApplicationService
def call
@project = Project.new(project_params)
ActiveRecord::Base.transaction do
if @project.save!
Repositories::MigrateService.new(user, @project, repository_params).call
else
#
end
if @project.save!
Repositories::MigrateService.new(user, @project, repository_params).call
else
#
end
@project
rescue => e
@@ -27,11 +25,12 @@ class Projects::MigrateService < ApplicationService
{
name: params[:name],
user_id: params[:user_id],
project_type: set_project_type,
description: params[:description],
identifier: params[:repository_name],
is_public: project_secretion[:public],
project_category_id: params[:project_category_id],
project_language_id: params[:project_language_id],
is_public: project_secretion[:public],
project_type: set_project_type
}
end

12
app/services/repositories/migrate_service.rb
View File

@@ -9,13 +9,11 @@ class Repositories::MigrateService < ApplicationService
def call
@repository = Repository.new(repository_params)
ActiveRecord::Base.transaction do
if @repository.save!
@repository.set_mirror! if wrapper_mirror
MigrateRemoteRepositoryJob.perform_later(@repository.id, user.gitea_token, gitea_repository_params)
end
@repository
if @repository.save!
@repository.set_mirror! if wrapper_mirror
MigrateRemoteRepositoryJob.perform_later(@repository.id, user.gitea_token, gitea_repository_params)
end
@repository
rescue => e
puts "create mirror repository service error: #{e.message}"
raise Error, e.message
@@ -23,7 +21,7 @@ class Repositories::MigrateService < ApplicationService
private
def repository_params
params.merge(project_id: project.id)
params.merge(project_id: project.id, identifier: params[:identifier])
end
def gitea_repository_params