From feec49d4bd71b6bee552796f33342ea0348ab150 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 5 Jan 2024 13:56:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=86=E6=94=AF=E4=B8=8E=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/projects/branches_controller.rb | 2 +-
 app/services/api/v1/projects/branches/list_service.rb  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/v1/projects/branches_controller.rb b/app/controllers/api/v1/projects/branches_controller.rb
index 06d426b3f..89ebb5825 100644
--- a/app/controllers/api/v1/projects/branches_controller.rb
+++ b/app/controllers/api/v1/projects/branches_controller.rb
@@ -2,7 +2,7 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController
   before_action :require_public_and_member_above, only: [:index, :all] 
 
   def index 
-    @result_object = Api::V1::Projects::Branches::ListService.call(@project, {name: params[:keyword], page: page, limit: limit}, current_user&.gitea_token)
+    @result_object = Api::V1::Projects::Branches::ListService.call(@project, {name: params[:keyword], state: params[:state], page: page, limit: limit}, current_user&.gitea_token)
   end
 
   def all 
diff --git a/app/services/api/v1/projects/branches/list_service.rb b/app/services/api/v1/projects/branches/list_service.rb
index b049bb2ac..6980b71ea 100644
--- a/app/services/api/v1/projects/branches/list_service.rb
+++ b/app/services/api/v1/projects/branches/list_service.rb
@@ -1,6 +1,6 @@
 class Api::V1::Projects::Branches::ListService < ApplicationService 
 
-  attr_accessor :project, :token, :owner, :repo, :name, :page, :limit
+  attr_accessor :project, :token, :owner, :repo, :name, :state, :page, :limit
   attr_accessor :gitea_data, :gitea_repo_data
 
   def initialize(project, params, token=nil)
@@ -9,6 +9,7 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
     @repo = project&.identifier 
     @token = token 
     @name = params[:name] 
+    @state = params[:state]
     @page = params[:page] 
     @limit = params[:limit]
   end
@@ -29,7 +30,8 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
       limit: limit
     }
     params.merge!({name: name}) if name.present? 
-
+    params.merge!({state: state}) if state.present?
+    
     params
   end