From 859d72f7d78cc48a8f85b76ef975b945623c8c7e Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Thu, 15 Dec 2022 16:45:28 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E5=88=9B=E5=BB=BA=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E5=BC=80=E9=80=9A=E5=BB=BA=E6=9C=A8DevOps=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E4=BC=A0=E9=80=92=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/jobs/migrate_remote_repository_job.rb    | 7 +------
 app/services/repositories/migrate_service.rb | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/jobs/migrate_remote_repository_job.rb b/app/jobs/migrate_remote_repository_job.rb
index 724a8160..5e56901a 100644
--- a/app/jobs/migrate_remote_repository_job.rb
+++ b/app/jobs/migrate_remote_repository_job.rb
@@ -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} ############"
diff --git a/app/services/repositories/migrate_service.rb b/app/services/repositories/migrate_service.rb
index cccfaed0..7cf1cb3e 100644
--- a/app/services/repositories/migrate_service.rb
+++ b/app/services/repositories/migrate_service.rb
@@ -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