Merge remote-tracking branch 'origin/pm_project_develop' into pm_project_develop

Gemfile

@@ -141,4 +141,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 1.4.6'
+gem 'gitea-client', '~> 1.5.7'

app/controllers/api/pm/issues_controller.rb

@@ -172,7 +172,7 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
     params.permit(
       :status_id, :priority_id, :milestone_id,
       :branch_name, :start_date, :due_date, :time_scale,
-      :subject, :description, :blockchain_token_num,
+      :subject, :description, :blockchain_token_num, :root_subject,
       :pm_project_id, :pm_sprint_id, :pm_issue_type, :root_id, :link_able_id, :project_id,
       issue_tag_ids: [],
       assigner_ids: [],

app/controllers/api/v1/gitlink_competition_applies_controller.rb

@@ -0,0 +1,37 @@
+class Api::V1::GitlinkCompetitionAppliesController < Api::V1::BaseController 
+
+  def create 
+    return render_error("请输入正确的竞赛ID") unless params[:competition_id].present? 
+    return render_error("请输入正确的队伍ID") unless params[:team_id].present? 
+    return render_error("请输入正确的队伍成员信息") unless params[:team_members].is_a?(Array)
+    params[:team_members].each do |member| 
+      apply = GitlinkCompetitionApply.find_or_create_by(competition_id: params[:competition_id], team_id: params[:team_id], educoder_login: member[:login])
+      apply.competition_identifier = params[:competition_identifier]
+      apply.team_name = params[:team_name]
+      apply.school_name = member[:school_name]
+      apply.nickname = member[:nickname]
+      apply.identity = member[:identity]
+      apply.role = member[:role]
+      apply.email = member[:email]
+      user_info = get_user_info_by_educoder_login(member[:login])
+      apply.phone = user_info["phone"]
+      apply.save
+    end
+    render_ok
+  end
+
+  def get_user_info_by_educoder_login(edu_login)
+    req_params = { "login" => "#{edu_login}", "private_token" => "hriEn3UwXfJs3PmyXnqQ" }
+    api_url=  "https://data.educoder.net"
+    client = Faraday.new(url: api_url)
+    response = client.public_send("get", "/api/sources/get_user_info_by_login", req_params)
+    result = JSON.parse(response.body)
+
+    return nil if result["status"].to_s != "0"
+
+    # login 邮箱 手机号 姓名 学校/单位
+    user_info = result["data"]
+
+    return user_info
+  end
+end

app/controllers/api/v1/projects/actions/runs_controller.rb

@@ -5,8 +5,42 @@ class Api::V1::Projects::Actions::RunsController < Api::V1::Projects::Actions::B
     puts @result_object
   end
 
+  def rerun 
+    return render_error("请输入正确的流水线记录ID！") if params[:run_id].blank?
+    gitea_result = $gitea_hat_client.post_repos_actions_runs_rerun_by_owner_repo_run(@project&.owner&.login, @project&.identifier, params[:run_id]) rescue nil 
+    if gitea_result
+      render_ok 
+    else 
+      render_error("重启所有流水线任务失败")
+    end
+  end
+
+  def job_rerun 
+    return render_error("请输入正确的流水线记录ID！") if params[:run_id].blank?
+    return render_error("请输入正确的流水线任务ID") if params[:job].blank? 
+    gitea_result = $gitea_hat_client.post_repos_actions_runs_jobs_rerun_by_owner_repo_run_job(@project&.owner&.login, @project&.identifier, params[:run_id], params[:job]) rescue nil 
+    if gitea_result
+      render_ok 
+    else 
+      render_error("重启流水线任务失败")
+    end
+  end
+
   def job_show 
     @result_object = Api::V1::Projects::Actions::Runs::JobShowService.call(@project, params[:run_id], params[:job], params[:log_cursors], current_user&.gitea_token)
   end
 
+  def job_logs 
+    return render_error("请输入正确的流水线记录ID！") if params[:run_id].blank?
+    return render_error("请输入正确的流水线任务ID") if params[:job].blank? 
+    domain  = GiteaService.gitea_config[:domain]
+    api_url = GiteaService.gitea_config[:hat_base_url]
+
+    url = "/repos/#{@owner.login}/#{@repository.identifier}/actions/runs/#{CGI.escape(params[:run_id])}/jobs/#{CGI.escape(params[:job])}/logs"
+    file_path = [domain, api_url, url].join
+    file_path = [file_path, "access_token=#{@owner&.gitea_token}"].join("?") 
+
+    redirect_to file_path
+  end
+
 end

app/controllers/api/v1/projects/branches_controller.rb

@@ -1,6 +1,29 @@
 class Api::V1::Projects::BranchesController < Api::V1::BaseController 
   before_action :require_public_and_member_above, only: [:index, :all] 
 
+  def gitee 
+    url = URI("https://gitee.com/api/v5/repos/#{params[:owner]}/#{params[:repo]}/branches?access_token=#{params[:token]}&page=#{page}&per_page=#{limit}")
+    https = Net::HTTP.new(url.host, url.port)
+    https.use_ssl = true
+    request = Net::HTTP::Get.new(url)
+    response = https.request(request)
+    render :json => response.read_body
+  end
+
+  def github 
+    url = URI("https://api.github.com/repos/#{params[:owner]}/#{params[:repo]}/branches?page=#{page}&per_page=#{limit}")
+    https = Net::HTTP.new(url.host, url.port)
+    https.use_ssl = true
+
+    request = Net::HTTP::Get.new(url)
+    request["Authorization"] = "Bearer #{params[:token]}"
+    request["Accept"] = "application/vnd.github+json"
+    request["X-GitHub-Api-Version"] = "2022-11-28"
+
+    response = https.request(request)
+    render :json => response.read_body
+  end
+
   def index 
     @result_object = Api::V1::Projects::Branches::ListService.call(@project, {name: params[:keyword], state: params[:state], page: page, limit: limit}, current_user&.gitea_token)
   end

app/controllers/api/v1/projects/sync_repositories_controller.rb

@@ -112,7 +112,7 @@ class Api::V1::Projects::SyncRepositoriesController < Api::V1::BaseController
     @group_sync_repository_branch = @sync_repository_branches.joins(:sync_repository).group("sync_repositories.type, sync_repository_branches.gitlink_branch_name, sync_repository_branches.external_branch_name").select("sync_repositories.type as type,max(sync_repository_branches.updated_at) as updated_at, sync_repository_branches.gitlink_branch_name, sync_repository_branches.external_branch_name").sort_by{|i|i.updated_at}
     @each_json = []
     @group_sync_repository_branch.each do |item|
-      branches = @sync_repository_branches.joins(:sync_repository).where(sync_repositories: {type: item.type}, gitlink_branch_name: item.gitlink_branch_name, external_branch_name: item.external_branch_name).order(updated_at: :desc)
+      branches = @sync_repository_branches.joins(:sync_repository).where(sync_repositories: {type: item.type}, gitlink_branch_name: item.gitlink_branch_name, external_branch_name: item.external_branch_name).order(sync_time: :desc)
       branch = branches.first
       @each_json << {
         gitlink_branch_name: item.gitlink_branch_name,

app/helpers/repositories_helper.rb

@@ -157,6 +157,7 @@ module RepositoriesHelper
           ext = File.extname(s_content)[1..-1]
           ext = ext.split("?")[0] if ext.include?("?")
           if (image_type?(ext) || download_type(ext)) && !ext.blank?
+            s_content = s_content.starts_with?("/") ? s_content[1..-1] : s_content[0..-1]
             s_content = File.expand_path(s_content, file_path)
             s_content = s_content.split("#{Rails.root}/")[1]
             # content = content.gsub(s[0], "/#{s_content}")

app/models/gitlink_competition_apply.rb

@@ -0,0 +1,21 @@
+ # == Schema Information
+#
+# Table name: gitlink_competition_applies
+#
+#  id                     :integer          not null, primary key
+#  competition_id         :integer
+#  competition_identifier :string(255)
+#  team_id                :integer
+#  team_name              :string(255)
+#  school_name            :string(255)
+#  login                  :string(255)
+#  nickname               :string(255)
+#  phone                  :string(255)
+#  identity               :string(255)
+#  role                   :string(255)
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#
+
+class GitlinkCompetitionApply < ApplicationRecord
+end

app/services/api/v1/issues/create_service.rb

@@ -4,7 +4,7 @@ class Api::V1::Issues::CreateService < ApplicationService
   include Api::V1::Issues::Concerns::Loadable 
 
   attr_reader :project, :current_user
-  attr_reader :status_id, :priority_id, :milestone_id, :branch_name, :start_date, :due_date, :subject, :description, :blockchain_token_num
+  attr_reader :status_id, :priority_id, :milestone_id, :branch_name, :start_date, :due_date, :subject, :description, :blockchain_token_num, :root_subject
   attr_reader :issue_tag_ids, :assigner_ids, :attachment_ids, :receivers_login
   attr_accessor :created_issue
 
@@ -35,6 +35,7 @@ class Api::V1::Issues::CreateService < ApplicationService
     @root_id = params[:root_id]
     @time_scale = params[:time_scale]
     @linkable_id = params[:link_able_id]
+    @root_subject = params[:root_subject]
   end
 
   def call
@@ -65,7 +66,15 @@ class Api::V1::Issues::CreateService < ApplicationService
       @created_issue.pm_project_id = @pm_project_id
       @created_issue.pm_sprint_id = @pm_sprint_id
       @created_issue.pm_issue_type = @pm_issue_type
-      @created_issue.root_id = @root_id
+      if @root_subject.present? && @pm_issue_type.to_i == 4
+        @root_issue = Issue.find_by(subject: @root_subject, pm_issue_type: 4, pm_project_id: @pm_project_id) 
+        unless @root_issue.present? 
+          @root_issue = Issue.create(subject: @root_subject, pm_issue_type: 4, pm_project_id: @pm_project_id, status_id: 1, priority_id: 1, tracker_id: Tracker.first.id, project_id: @project.id, author_id: current_user.id)
+        end
+        @created_issue.root_id = @root_issue.id
+      else
+        @created_issue.root_id = @root_id
+      end
       @created_issue.time_scale = @time_scale
       @created_issue.issue_tags_value = @issue_tags.order('id asc').pluck(:id).join(',') unless issue_tag_ids.blank?
       @created_issue.changer_id = @current_user.id

app/services/api/v1/projects/sync_repositories/create_service.rb

@@ -8,7 +8,7 @@ class Api::V1::Projects::SyncRepositories::CreateService < ApplicationService
   validates :type, inclusion: {in: %w(SyncRepositories::Gitee SyncRepositories::Github)}
   validates :external_repo_address, format: { with: CustomRegexp::URL_REGEX, multiline: true, message: "地址格式不正确" }
   validates :sync_granularity, :first_sync_direction, inclusion: {in: [1,2]}
-  validate :check_gitlink_branch_name
+  # validate :check_gitlink_branch_name
 
   def initialize(project, params)
     @project = project 
@@ -40,12 +40,12 @@ class Api::V1::Projects::SyncRepositories::CreateService < ApplicationService
     [@sync_repository1, @sync_repository2, @sync_repository_branch1, @sync_repository_branch2]
   end
 
-  def check_gitlink_branch_name
-    if sync_granularity == 2
-      result = $gitea_hat_client.get_repos_branch_name_set_by_owner_repo(project&.owner&.login, project&.identifier) rescue nil
-      raise Error, '分支不存在' if !result.include?(gitlink_branch_name)
-    end
-  end
+  # def check_gitlink_branch_name
+  #   if sync_granularity == 2
+  #     result = $gitea_hat_client.get_repos_branch_name_set_by_owner_repo(project&.owner&.login, project&.identifier) rescue nil
+  #     raise Error, '分支不存在' if !result.include?(gitlink_branch_name)
+  #   end
+  # end
 
   private 
   def create_sync_repository

config/routes/api.rb

@@ -126,6 +126,9 @@ defaults format: :json do
                 post :enable
                 resources :runs, only: [:index] do 
                   post '/jobs/:job', to: 'runs#job_show'
+                  post '/rerun', to: 'runs#rerun'
+                  post '/jobs/:job/rerun', to: 'runs#job_rerun'
+                  get '/jobs/:job/logs', to: 'runs#job_logs'
                 end 
               end
             end
@@ -152,6 +155,8 @@ defaults format: :json do
             end
             resources :branches, param: :name, only:[:index, :create, :destroy] do 
               collection do 
+                get :gitee 
+                get :github
                 get :all
                 post :restore
                 patch :update_default_branch
@@ -191,6 +196,7 @@ defaults format: :json do
       resources :projects, only: [:index]
       resources :project_topics, only: [:index, :create, :destroy]
       resources :project_datasets, only: [:index]
+      resources :gitlink_competition_applies, only: [:create]
       
     end
   end

db/migrate/20240522015212_create_gitlink_competition_applies.rb

@@ -0,0 +1,19 @@
+class CreateGitlinkCompetitionApplies < ActiveRecord::Migration[5.2]
+  def change
+    create_table :gitlink_competition_applies do |t|
+      t.integer :competition_id 
+      t.string :competition_identifier
+      t.integer :team_id
+      t.string :team_name
+      t.string :school_name
+      t.string :educoder_login 
+      t.string :nickname
+      t.string :phone 
+      t.string :email
+      t.string :identity
+      t.string :role
+
+      t.timestamps
+    end
+  end
+end

spec/models/gitlink_competition_apply_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe GitlinkCompetitionApply, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end