forked from Gitlink/forgeplus
FIX migration repository job's bug
This commit is contained in:
parent
28a839445f
commit
79c5462a1b
|
@ -25,10 +25,8 @@ class ProjectsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def migrate
|
def migrate
|
||||||
ActiveRecord::Base.transaction do
|
Projects::MigrateForm.new(mirror_params).validate!
|
||||||
Projects::MigrateForm.new(mirror_params).validate!
|
@project = Projects::MigrateService.new(current_user, mirror_params).call
|
||||||
@project = Projects::MigrateService.new(current_user, mirror_params).call
|
|
||||||
end
|
|
||||||
rescue Exception => e
|
rescue Exception => e
|
||||||
uid_logger_error(e.message)
|
uid_logger_error(e.message)
|
||||||
tip_exception(e.message)
|
tip_exception(e.message)
|
||||||
|
|
|
@ -8,7 +8,7 @@ class MigrateRemoteRepositoryJob < ApplicationJob
|
||||||
|
|
||||||
gitea_repository = Gitea::Repository::MigrateService.new(token, params).call
|
gitea_repository = Gitea::Repository::MigrateService.new(token, params).call
|
||||||
if gitea_repository
|
if gitea_repository
|
||||||
repo&.project&.update_columns(gpid: gitea_repository["id"], identifier: gitea_repository["name"])
|
repo&.project&.update_columns(gpid: gitea_repository["id"])
|
||||||
repo&.mirror&.update_columns(status: Mirror.statuses[:succeeded])
|
repo&.mirror&.update_columns(status: Mirror.statuses[:succeeded])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -8,12 +8,10 @@ class Projects::MigrateService < ApplicationService
|
||||||
|
|
||||||
def call
|
def call
|
||||||
@project = Project.new(project_params)
|
@project = Project.new(project_params)
|
||||||
ActiveRecord::Base.transaction do
|
if @project.save!
|
||||||
if @project.save!
|
Repositories::MigrateService.new(user, @project, repository_params).call
|
||||||
Repositories::MigrateService.new(user, @project, repository_params).call
|
else
|
||||||
else
|
#
|
||||||
#
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
@project
|
@project
|
||||||
rescue => e
|
rescue => e
|
||||||
|
@ -27,11 +25,12 @@ class Projects::MigrateService < ApplicationService
|
||||||
{
|
{
|
||||||
name: params[:name],
|
name: params[:name],
|
||||||
user_id: params[:user_id],
|
user_id: params[:user_id],
|
||||||
|
project_type: set_project_type,
|
||||||
description: params[:description],
|
description: params[:description],
|
||||||
|
identifier: params[:repository_name],
|
||||||
|
is_public: project_secretion[:public],
|
||||||
project_category_id: params[:project_category_id],
|
project_category_id: params[:project_category_id],
|
||||||
project_language_id: params[:project_language_id],
|
project_language_id: params[:project_language_id],
|
||||||
is_public: project_secretion[:public],
|
|
||||||
project_type: set_project_type
|
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -9,13 +9,11 @@ class Repositories::MigrateService < ApplicationService
|
||||||
|
|
||||||
def call
|
def call
|
||||||
@repository = Repository.new(repository_params)
|
@repository = Repository.new(repository_params)
|
||||||
ActiveRecord::Base.transaction do
|
if @repository.save!
|
||||||
if @repository.save!
|
@repository.set_mirror! if wrapper_mirror
|
||||||
@repository.set_mirror! if wrapper_mirror
|
MigrateRemoteRepositoryJob.perform_later(@repository.id, user.gitea_token, gitea_repository_params)
|
||||||
MigrateRemoteRepositoryJob.perform_later(@repository.id, user.gitea_token, gitea_repository_params)
|
|
||||||
end
|
|
||||||
@repository
|
|
||||||
end
|
end
|
||||||
|
@repository
|
||||||
rescue => e
|
rescue => e
|
||||||
puts "create mirror repository service error: #{e.message}"
|
puts "create mirror repository service error: #{e.message}"
|
||||||
raise Error, e.message
|
raise Error, e.message
|
||||||
|
@ -23,7 +21,7 @@ class Repositories::MigrateService < ApplicationService
|
||||||
|
|
||||||
private
|
private
|
||||||
def repository_params
|
def repository_params
|
||||||
params.merge(project_id: project.id)
|
params.merge(project_id: project.id, identifier: params[:identifier])
|
||||||
end
|
end
|
||||||
|
|
||||||
def gitea_repository_params
|
def gitea_repository_params
|
||||||
|
|
Loading…
Reference in New Issue