From eafc8ea527040dad3eea405f687d907f60b8d7eb Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 18 Aug 2021 15:40:50 +0800
Subject: [PATCH] add: return failed mirror repository field

---
 app/helpers/projects_helper.rb                   | 9 +++++++--
 app/jobs/migrate_remote_repository_job.rb        | 7 +++++--
 app/services/gitea/repository/migrate_service.rb | 2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 12a0097bd..8af542190 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -34,11 +34,12 @@ module ProjectsHelper
   end
 
   def json_response(project, user)
-    repo = Repository.includes(:mirror).select(:id, :mirror_url, :source_clone_url).find_by(project: project)
+    repo = Repository.includes(:mirror).select(:id, :is_mirror, :mirror_url, :source_clone_url).find_by(project: project)
 
     tmp_json = {}
     unless project.common?
       tmp_json = tmp_json.merge({
+        is_mirror: repo.is_mirror ? true : false,
         mirror_status: repo.mirror_status,
         mirror_num: repo.mirror_num,
         mirror_url: repo.remote_mirror_url,
@@ -54,7 +55,11 @@ module ProjectsHelper
       repo_id: repo.id,
       open_devops: (user.blank? || user.is_a?(AnonymousUser)) ? false : project.open_devops?,
       type: project.numerical_for_project_type,
-      author: render_owner(project)
+      author: render_owner(project),
+      project_category_id: project.project_category_id,
+      project_language_id: project.project_language_id,
+      license_id: project.license_id,
+      ignore_id: project.ignore_id
     }).compact
 
     render json: tmp_json
diff --git a/app/jobs/migrate_remote_repository_job.rb b/app/jobs/migrate_remote_repository_job.rb
index 03727908d..340e006ea 100644
--- a/app/jobs/migrate_remote_repository_job.rb
+++ b/app/jobs/migrate_remote_repository_job.rb
@@ -8,10 +8,13 @@ class MigrateRemoteRepositoryJob < ApplicationJob
     puts "############ MigrateRemoteRepositoryJob starting ... ############"
 
     gitea_repository = Gitea::Repository::MigrateService.new(token, params).call
-    if gitea_repository
-      repo&.project&.update_columns(gpid: gitea_repository["id"])
+    puts "#gitea_repository#{gitea_repository}"
+    if gitea_repository[0]==201
+      repo&.project&.update_columns(gpid: gitea_repository[2]["id"])
       repo&.mirror&.succeeded!
       puts "############ mirror status: #{repo.mirror.status} ############"
+    else 
+      repo&.mirror&.failed!
     end
   end
 end
diff --git a/app/services/gitea/repository/migrate_service.rb b/app/services/gitea/repository/migrate_service.rb
index 508812087..ab60b42f3 100644
--- a/app/services/gitea/repository/migrate_service.rb
+++ b/app/services/gitea/repository/migrate_service.rb
@@ -33,7 +33,7 @@ class Gitea::Repository::MigrateService < Gitea::ClientService
   def call
     response = post(url, request_params)
 
-    render_201_response(response)
+    render_response(response)
   end
 
   private