Merge branch 'develop' into standalone_develop

app/services/api/v1/projects/actions/runs/job_show_service.rb

@@ -0,0 +1,42 @@
+class Api::V1::Projects::Actions::Runs::JobShowService < ApplicationService 
+  include ActiveModel::Model
+
+  attr_reader :project, :token, :owner, :repo, :run, :job, :log_cursors
+  attr_accessor :gitea_data 
+
+  validates :run, :job, :log_cursors, presence: true 
+
+  def initialize(project, run, job, log_cursors, token = nil)
+    @project = project
+    @owner = project&.owner.login 
+    @repo = project&.identifier
+    @run = run 
+    @job = job 
+    @log_cursors = log_cursors
+    @token = token
+  end
+
+  def call 
+    raise Error, errors.full_messages.join(",") unless valid? 
+    load_gitea_data 
+
+    @gitea_data
+  end
+
+  private 
+  def request_params 
+    {
+      access_token: token
+    }
+  end
+
+  def request_body
+    {
+      logCursors: log_cursors
+    }
+  end
+
+  def load_gitea_data
+    @gitea_data = $gitea_hat_client.post_repos_actions_runs_jobs_by_owner_repo_run_job(owner, repo, run, job, {query: request_params, body: request_body.to_json})
+  end
+end

app/services/api/v1/projects/actions/runs/list_service.rb

@@ -0,0 +1,36 @@
+class Api::V1::Projects::Actions::Runs::ListService < ApplicationService
+  include ActiveModel::Model
+
+  attr_reader :project, :token, :owner, :repo, :workflow
+  attr_accessor :gitea_data 
+
+  validates :workflow, presence: true 
+
+  def initialize(project, workflow, token =nil)
+    @project = project
+    @owner = project&.owner.login 
+    @repo = project&.identifier
+    @workflow = workflow
+    @token = token
+  end
+
+  def call 
+    raise Error, errors.full_messages.join(",") unless valid? 
+    load_gitea_data 
+
+    @gitea_data
+  end
+
+  private 
+  def request_params
+    {
+      access_token: token,
+      workflow: workflow
+    }
+  end
+
+  def load_gitea_data
+    @gitea_data = $gitea_hat_client.get_repos_actions_by_owner_repo(owner, repo, {query: request_params}) rescue nil 
+    raise Error, '获取流水线执行记录失败！' unless @gitea_data.is_a?(Hash)
+  end
+end

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
@@ -18,7 +19,6 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
     load_default_branch
 
     @gitea_data[:default_branch] = @gitea_repo_data["default_branch"]
-
     @gitea_data
   end
 
@@ -30,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
 

app/services/api/v1/projects/branches/restore_service.rb

@@ -0,0 +1,47 @@
+class Api::V1::Projects::Branches::RestoreService < ApplicationService
+   
+  include ActiveModel::Model
+
+  attr_accessor :project, :token, :owner, :repo, :branch_id, :branch_name 
+  attr_accessor :gitea_data
+
+  validates :branch_id, :branch_name, presence: true 
+
+  def initialize(project, branch_id, branch_name, token= nil)
+    @project = project 
+    @owner = project&.owner&.login 
+    @repo = project&.identifier
+    @branch_id = branch_id
+    @branch_name = branch_name
+    @token = token 
+  end
+
+  def call 
+    raise Error, errors.full_messages.join(",") unless valid? 
+    excute_data_to_gitea
+
+    true
+  end
+
+  private 
+  def request_params 
+    {
+      access_token: token 
+    }
+  end
+
+  def request_body 
+    {
+      branch_id: branch_id,
+      name: branch_name,
+    }
+  end
+
+  def excute_data_to_gitea
+    begin
+      @gitea_data = $gitea_hat_client.post_repos_branches_restore_by_owner_repo(owner, repo, {query: request_params, body: request_body.to_json})
+   rescue => e
+     raise Error, '恢复分支失败!'
+    end
+  end
+end

app/services/api/v1/projects/commits/recent_service.rb

@@ -0,0 +1,37 @@
+class Api::V1::Projects::Commits::RecentService < ApplicationService
+  
+  attr_reader :project, :page, :limit, :owner, :repo, :token 
+  attr_accessor :gitea_data 
+
+  def initialize(project, params, token=nil)
+    @project = project 
+    @page = params[:page] || 1 
+    @limit = params[:limit] || 15
+    @owner = project&.owner&.login
+    @repo = project&.identifier
+    @token = token 
+  end
+
+  def call 
+    load_gitea_data
+
+    gitea_data 
+  end
+
+  private
+  def request_params
+    param = {
+      access_token: token,
+      page: page,
+      limit: limit
+    }
+
+    param 
+  end
+
+  def load_gitea_data
+    @gitea_data = $gitea_hat_client.get_repos_recent_commits_by_owner_repo(owner, repo, {query: request_params}) rescue nil 
+    raise Error, "获取最近提交列表失败" unless @gitea_data.is_a?(Hash)
+  end
+
+end

app/services/api/v1/projects/compare_service.rb

@@ -29,6 +29,6 @@ class Api::V1::Projects::CompareService < ApplicationService
   end
 
   def load_gitea_data 
-    @gitea_data = $gitea_client.get_repos_compare_by_owner_repo_from_to(owner, repo, from, to, {query: request_params}) rescue nil
+    @gitea_data = $gitea_hat_client.get_repos_compare_by_owner_repo_baseref_headref(owner, repo, to, from, {query: request_params}) rescue nil
   end
 end

app/services/gitea/user/generate_token_service.rb

@@ -29,7 +29,7 @@ class Gitea::User::GenerateTokenService < Gitea::ClientService
   end
 
   def request_params
-    { name: "#{@username}-#{token_name}" }
+    { name: "#{@username}-#{token_name}", scopes: ["all"] }
   end
 
   def token_name