From 9ffe10bd5baa36e3d2801ce2aaf92fd5fe457cc3 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Thu, 21 Oct 2021 10:48:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?FIX=20=E8=B0=83=E6=95=B4detail=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/repositories/detail_service.rb | 25 +++++----------------
 app/views/repositories/detail.json.jbuilder | 24 ++------------------
 2 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/app/services/repositories/detail_service.rb b/app/services/repositories/detail_service.rb
index 4b29d50a7..b2e7a69e6 100644
--- a/app/services/repositories/detail_service.rb
+++ b/app/services/repositories/detail_service.rb
@@ -10,11 +10,9 @@ class Repositories::DetailService < ApplicationService
   def call
     return {
       repo: repo_suitable,
-      release: release_suitable,
-      branch: branch_suitable,
-      tag: tag_suitable,
       contributor: contributor_suitable,
-      language: language_suitable
+      language: language_suitable,
+      branch_tag_total_count: branch_tag_total_count
     }
   rescue 
     return {
@@ -30,25 +28,14 @@ class Repositories::DetailService < ApplicationService
   end
 
   private
+  def branch_tag_total_count
+    Gitea::Repository::GetBranchAndTagTotalNumService.call(@owner.login, @repo.identifier, @owner.gitea_token)
+  end
+  
   def repo_suitable
     Gitea::Repository::GetService.call(@owner, @repo.identifier)
   end
 
-  def release_suitable
-    releases = Gitea::Versions::ListService.call(@owner.gitea_token, @owner.try(:login), @repo.try(:identifier), {page: 1, limit: 1})
-    releases.is_a?(Hash) && releases[:status] == -1 ? [] : releases
-  end
-
-  def branch_suitable
-    branches = Gitea::Repository::Branches::ListService.call(@owner, @repo.identifier)
-    branches.is_a?(Hash) && branches.key?(:status) ? [] : branches
-  end
-
-  def tag_suitable
-    tags = Gitea::Repository::Tags::ListService.call(@owner&.gitea_token, @owner.login, @repo.identifier)
-    tags.is_a?(Hash) && tags[:status] == -1 ? [] : tags
-  end
-
   def contributor_suitable
     contributors = Gitea::Repository::Contributors::GetService.call(@owner, @repo.identifier)
     contributors.is_a?(Hash) && contributors.key?(:status) ? [] : contributors
diff --git a/app/views/repositories/detail.json.jbuilder b/app/views/repositories/detail.json.jbuilder
index c08077088..c489cf47a 100644
--- a/app/views/repositories/detail.json.jbuilder
+++ b/app/views/repositories/detail.json.jbuilder
@@ -51,28 +51,8 @@ if @result[:repo]
   json.private @result[:repo]['private']
 end
 json.license_name @project.license_name
-json.release_versions do
-  json.list @result[:release].each do |release|
-    forge_version = VersionRelease.find_by(version_gid: release["id"])
-    json.id forge_version&.id
-    json.name release["name"]
-    json.tag_name release["tag_name"]
-    json.created_at format_time(release["created_at"].to_time)
-  end
-  json.total_count @repository&.version_releases.size
-end
-json.branches do
-  json.list @result[:branch].each do |branch|
-    json.name branch["name"]
-  end
-  json.total_count @result[:branch].size
-end
-json.tags do
-  json.list @result[:tag].each do |tag|
-    json.name tag["name"]
-  end
-  json.total_count @result[:tag].size
-end
+json.branches_count @result[:branch_tag_total_count]['branch_count'] || 0
+json.tags_count @result[:branch_tag_total_count]['tag_count'] || 0
 json.contributors do
   total_count = @result[:contributor].size
   json.list @result[:contributor].each do |contributor|

From 94d5565f5698e131c1220977e644f4caa80b91eb Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Thu, 21 Oct 2021 10:52:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?FIX=20=E8=B0=83=E6=95=B4detail=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=95=B0=E6=8D=AE[bug]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../get_branch_and_tag_total_num_service.rb   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 app/services/gitea/repository/get_branch_and_tag_total_num_service.rb

diff --git a/app/services/gitea/repository/get_branch_and_tag_total_num_service.rb b/app/services/gitea/repository/get_branch_and_tag_total_num_service.rb
new file mode 100644
index 000000000..0b8a52467
--- /dev/null
+++ b/app/services/gitea/repository/get_branch_and_tag_total_num_service.rb
@@ -0,0 +1,37 @@
+
+module Gitea
+  module Repository
+    class GetBranchAndTagTotalNumService < Gitea::ClientService
+      attr_reader :owner, :repo, :token
+
+      def initialize(owner, repo, token=nil)
+        @owner = owner
+        @repo  = repo
+        @token = token
+      end
+
+      def call
+        response = get(url, params)
+        render_result(response)
+      end
+
+      private
+      def params
+        Hash.new.merge(token: token)
+      end
+
+      def url
+        "/repos/#{owner}/#{repo}/branch_tag_count".freeze
+      end
+
+      def render_result(response)
+        case response.status
+        when 200
+          JSON.parse(response.body)
+        else
+          {}
+        end
+      end
+    end
+  end
+end