Browse Source

fixed 创建仓库开通建木DevOps通知传递用户

pull/313/head
xxq250 3 years ago
parent
commit
859d72f7d7
2 changed files with 2 additions and 7 deletions
  1. +1
    -6
      app/jobs/migrate_remote_repository_job.rb
  2. +1
    -1
      app/services/repositories/migrate_service.rb

+ 1
- 6
app/jobs/migrate_remote_repository_job.rb View File

@@ -1,7 +1,7 @@
class MigrateRemoteRepositoryJob < ApplicationJob
queue_as :default

def perform(repo_id, token, params)
def perform(repo_id, token, user_id, params)
repo = Repository.find_by(id: repo_id)
return if repo.blank?

@@ -14,11 +14,6 @@ class MigrateRemoteRepositoryJob < ApplicationJob
repo&.mirror&.succeeded!
## open jianmu devops
project_id = repo&.project&.id
if repo&.project.present? && repo&.project.owner.is_a?(Organization)
user_id = repo&.project.members.take&.user_id
else
user_id = repo&.project.user_id
end
puts "############ mirror project_id,user_id: #{project_id},#{user_id} ############"
OpenProjectDevOpsJob.perform_later(project_id, user_id) if project_id.present? && user_id.present?
puts "############ mirror status: #{repo.mirror.status} ############"


+ 1
- 1
app/services/repositories/migrate_service.rb View File

@@ -11,7 +11,7 @@ class Repositories::MigrateService < ApplicationService
@repository = Repository.new(repository_params)
if @repository.save!
@repository.set_mirror!
MigrateRemoteRepositoryJob.perform_later(@repository.id, user.gitea_token, gitea_repository_params)
MigrateRemoteRepositoryJob.perform_later(@repository.id, user.gitea_token, user.id, gitea_repository_params)
end
@repository
rescue => e


Loading…
Cancel
Save