From 9de04dba7e8ca4f6ff3303c161284c073c32cd8e Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Thu, 6 Jun 2024 09:45:37 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E6=A0=87=E8=AE=B0=20project.status?=
 =?UTF-8?q?=3D0,=20=E5=9C=A8=E5=88=97=E8=A1=A8=E4=B8=AD=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb    | 5 ++++-
 app/jobs/migrate_remote_repository_job.rb | 1 +
 app/queries/projects/list_query.rb        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 6a21ad5f..88d847da 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -317,7 +317,10 @@ class ProjectsController < ApplicationController
         UpdateProjectTopicJob.set(wait: 1.seconds).perform_later(project_id) if project_id.present?
         Rails.logger.info "############ mirror status: #{@project&.repository&.mirror&.status} ############"
       end
-    # elsif !@project.common? && @project&.repository&.mirror&.failed?
+    elsif !@project.common? && @project&.repository&.mirror&.failed?
+      # 导入失败的项目标记 project.status=0, 在列表中不显示
+      @project&.update_columns(status: 0) if @project&.status == 1
+
       # Rails.logger.info "############ mirror status: #{@project&.repository&.mirror&.status}"
       # Gitea::Repository::DeleteService.new(@project.owner, @project.identifier,current_user.gitea_token).call
       # @project.destroy!
diff --git a/app/jobs/migrate_remote_repository_job.rb b/app/jobs/migrate_remote_repository_job.rb
index 9512b941..1d6e4112 100644
--- a/app/jobs/migrate_remote_repository_job.rb
+++ b/app/jobs/migrate_remote_repository_job.rb
@@ -22,6 +22,7 @@ class MigrateRemoteRepositoryJob < ApplicationJob
       gitea_result = $gitea_client.get_repos_by_owner_repo(repo&.project&.owner&.login, repo&.project&.identifier)
       if gitea_result["empty"]
         repo&.mirror&.failed!
+        repo&.project&.update_columns(status: 0)
       else
         repo&.project&.update_columns(gpid: gitea_result["id"])
         repo&.mirror&.succeeded!
diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb
index c67feed6..09a02010 100644
--- a/app/queries/projects/list_query.rb
+++ b/app/queries/projects/list_query.rb
@@ -38,7 +38,7 @@ class Projects::ListQuery < ApplicationQuery
   end
 
   def main_collection
-    collection = Project.visible
+    collection = Project.visible.where(status: 1)
     # 增加私有组织中项目过滤
     collection = collection.joins("left join organization_extensions on organization_extensions.organization_id = projects.user_id")
                            .where("organization_extensions.visibility is null or organization_extensions.visibility in (0,1)")