From d577f1691adaf3cc5f6feb9a1ba991e58eb87996 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 16 Jul 2024 10:08:43 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=BB=E9=A1=B5=E7=BD=AE=E9=A1=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v1/users/home_top_settings_controller.rb | 23 +++++++++++ .../users/organizations_controller.rb | 10 ++++- app/models/home_top_setting.rb | 23 +++++++++++ app/models/organization.rb | 1 + app/models/project.rb | 1 + app/models/user.rb | 1 + app/queries/projects/list_my_query.rb | 18 ++++++--- .../users/home_top_settings/create_service.rb | 40 +++++++++++++++++++ .../users/home_top_settings/delete_service.rb | 40 +++++++++++++++++++ config/routes/api.rb | 5 +++ ...20240715072430_create_home_top_settings.rb | 10 +++++ 11 files changed, 165 insertions(+), 7 deletions(-) create mode 100644 app/controllers/api/v1/users/home_top_settings_controller.rb create mode 100644 app/models/home_top_setting.rb create mode 100644 app/services/api/v1/users/home_top_settings/create_service.rb create mode 100644 app/services/api/v1/users/home_top_settings/delete_service.rb create mode 100644 db/migrate/20240715072430_create_home_top_settings.rb diff --git a/app/controllers/api/v1/users/home_top_settings_controller.rb b/app/controllers/api/v1/users/home_top_settings_controller.rb new file mode 100644 index 00000000..d329c7e6 --- /dev/null +++ b/app/controllers/api/v1/users/home_top_settings_controller.rb @@ -0,0 +1,23 @@ +class Api::V1::Users::HomeTopSettingsController < Api::V1::BaseController + + before_action :load_observe_user + before_action :check_auth_for_observe_user + + def create + @result = Api::V1::Users::HomeTopSettings::CreateService.call(@observe_user, home_top_setting_params) + return render_error("置顶失败.") if @result.nil? + return render_ok + end + + def cancel + @result = Api::V1::Users::HomeTopSettings::DeleteService.call(@observe_user, home_top_setting_params) + return render_error("取消置顶失败.") if @result.nil? + return render_ok + end + + private + def home_top_setting_params + params.permit(:top_type, :top_id) + end + +end \ No newline at end of file diff --git a/app/controllers/users/organizations_controller.rb b/app/controllers/users/organizations_controller.rb index 2d949da7..06c378ad 100644 --- a/app/controllers/users/organizations_controller.rb +++ b/app/controllers/users/organizations_controller.rb @@ -10,7 +10,15 @@ class Users::OrganizationsController < Users::BaseController end @organizations = @organizations.ransack(login_cont: params[:search]).result if params[:search].present? - @organizations = @organizations.includes(:organization_extension).order("organization_extensions.#{sort_by} #{sort_direction}") + + home_top_ids = @organizations.joins(:home_top_settings).where(home_top_settings: {user_id: observed_user.id}).order("home_top_settings.created_at asc").pluck(:id) + + if home_top_ids.present? + @organizations = @organizations.joins(:organization_extension).order("FIELD(users.id, #{home_top_ids.join(",")}) desc, organization_extensions.#{sort_by} #{sort_direction}") + else + @organizations = @organizations.joins(:organization_extension).order("organization_extensions.#{sort_by} #{sort_direction}") + end + @organizations = kaminari_paginate(@organizations) end diff --git a/app/models/home_top_setting.rb b/app/models/home_top_setting.rb new file mode 100644 index 00000000..78486620 --- /dev/null +++ b/app/models/home_top_setting.rb @@ -0,0 +1,23 @@ +# == Schema Information +# +# Table name: home_top_settings +# +# id :integer not null, primary key +# user_id :integer +# top_type :string(255) +# top_id :integer +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_home_top_settings_on_top_type_and_top_id (top_type,top_id) +# index_home_top_settings_on_user_id (user_id) +# + +class HomeTopSetting < ApplicationRecord + + belongs_to :user + + belongs_to :top, polymorphic: true +end diff --git a/app/models/organization.rb b/app/models/organization.rb index faa6396d..8ac1b80e 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -76,6 +76,7 @@ class Organization < Owner has_many :team_users, dependent: :destroy has_many :pinned_projects, class_name: 'PinnedProject', foreign_key: :user_id, dependent: :destroy has_many :is_pinned_projects, through: :pinned_projects, source: :project, validate: false + has_many :home_top_settings, as: :top, dependent: :destroy validates :login, presence: true validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, case_sensitive: false diff --git a/app/models/project.rb b/app/models/project.rb index de57d88e..04aa1bce 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -138,6 +138,7 @@ class Project < ApplicationRecord has_many :daily_project_statistics, dependent: :destroy has_one :project_dataset, dependent: :destroy has_many :sync_repositories, dependent: :destroy + has_many :home_top_settings, as: :top, dependent: :destroy after_create :incre_user_statistic, :incre_platform_statistic after_save :check_project_members before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned, :reset_cache_data diff --git a/app/models/user.rb b/app/models/user.rb index 933300c7..988f6d8c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -190,6 +190,7 @@ class User < Owner has_many :clas, through: :user_clas has_one :page, :dependent => :destroy + has_many :home_top_settings, dependent: :destroy # Groups and active users scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) } diff --git a/app/queries/projects/list_my_query.rb b/app/queries/projects/list_my_query.rb index 27415543..5d83b763 100644 --- a/app/queries/projects/list_my_query.rb +++ b/app/queries/projects/list_my_query.rb @@ -20,11 +20,11 @@ class Projects::ListMyQuery < ApplicationQuery if params[:category].blank? normal_projects = projects.members_projects(user.id).to_sql org_projects = projects.joins(team_projects: [team: :team_users]).where(team_users: {user_id: user.id}).to_sql - projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct + projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects")#.distinct elsif params[:category].to_s == "join" normal_projects = projects.where.not(user_id: user.id).members_projects(user.id).to_sql org_projects = projects.joins(team_projects: [team: :team_users]).where(team_users: {user_id: user.id}).to_sql - projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct + projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects")#.distinct elsif params[:category].to_s == "manage" projects = projects.where(user_id: user.id) elsif params[:category].to_s == "watched" #我关注的 @@ -37,7 +37,7 @@ class Projects::ListMyQuery < ApplicationQuery elsif params[:category].to_s == "admin" normal_projects = projects.joins(members: :roles).where(members: {user_id: user.id}, roles: {name: %w(Manager)}).to_sql org_projects = projects.joins(team_projects: [team: :team_users]).where(teams: {authorize: %w(owner admin)},team_users: {user_id: user.id}).to_sql - projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct + projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects")#.distinct # elsif params[:category].to_s == "public" # projects = projects.visible.joins(:members).where(members: { user_id: user.id }) # elsif params[:category].to_s == "private" @@ -71,11 +71,17 @@ class Projects::ListMyQuery < ApplicationQuery sort = Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : "updated_on" sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : "desc" - + + home_top_ids = scope.joins(:home_top_settings).where(home_top_settings: {user_id: user.id}).order("home_top_settings.created_at asc").pluck(:id) + if params[:choosed].present? && params[:choosed].is_a?(Array) - scope.order("FIELD(id, #{params[:choosed].reverse.join(",")}) desc") + scope.distinct.order("FIELD(id, #{params[:choosed].reverse.join(",")}) desc") else - scope.order("projects.#{sort} #{sort_direction}") + if home_top_ids.present? + scope.distinct.order("FIELD(id, #{home_top_ids.join(",")}) desc, projects.#{sort} #{sort_direction}") + else + scope.distinct.order("projects.#{sort} #{sort_direction}") + end end end end diff --git a/app/services/api/v1/users/home_top_settings/create_service.rb b/app/services/api/v1/users/home_top_settings/create_service.rb new file mode 100644 index 00000000..0c4cea59 --- /dev/null +++ b/app/services/api/v1/users/home_top_settings/create_service.rb @@ -0,0 +1,40 @@ +class Api::V1::Users::HomeTopSettings::CreateService < ApplicationService + + include ActiveModel::Model + + attr_reader :user, :top_type, :top_id + attr_accessor :home_top_setting, :home_top + + validates :user, :top_type, :top_id, presence: true + validates :top_type, inclusion: {in: %w(Organization Project), message: '请输入正确的TopType'} + + def initialize(user, params) + @user = user + @top_type = params[:top_type] + @top_id = params[:top_id] + end + + def call + raise Error, errors.full_messages.join(",") unless valid? + raise Error, "置顶对象不存在！" unless find_home_top + raise Error, "置顶对象已置顶！" if check_home_top_setting + + begin + @home_top_setting = HomeTopSetting.new(user:user, top: @home_top) + @home_top_setting.save! + + return @home_top_setting.valid? ? @home_top_setting : nil + rescue + raise Error, "服务器错误，请联系系统管理员！" + + end + end + + def find_home_top + @home_top = @top_type.constantize.find_by_id(@top_id).presence + end + + def check_home_top_setting + HomeTopSetting.exists?(user: @user, top: @home_top) + end +end \ No newline at end of file diff --git a/app/services/api/v1/users/home_top_settings/delete_service.rb b/app/services/api/v1/users/home_top_settings/delete_service.rb new file mode 100644 index 00000000..e3ce9fe1 --- /dev/null +++ b/app/services/api/v1/users/home_top_settings/delete_service.rb @@ -0,0 +1,40 @@ +class Api::V1::Users::HomeTopSettings::DeleteService < ApplicationService + + include ActiveModel::Model + + attr_reader :user, :top_type, :top_id + attr_accessor :home_top_setting, :home_top + + validates :user, :top_type, :top_id, presence: true + validates :top_type, inclusion: {in: %w(Organization Project), message: '请输入正确的TopType'} + + def initialize(user, params) + @user = user + @top_type = params[:top_type] + @top_id = params[:top_id] + end + + def call + raise Error, errors.full_messages.join(",") unless valid? + raise Error, "置顶对象不存在！" unless find_home_top + raise Error, "置顶对象未置顶！" unless check_home_top_setting + + begin + @home_top_setting = HomeTopSetting.find_by(user:user, top: @home_top) + @home_top_setting.destroy! + + return true + rescue + raise Error, "服务器错误，请联系系统管理员！" + + end + end + + def find_home_top + @home_top = @top_type.constantize.find_by_id(@top_id).presence + end + + def check_home_top_setting + HomeTopSetting.exists?(user: @user, top: @home_top) + end +end \ No newline at end of file diff --git a/config/routes/api.rb b/config/routes/api.rb index fd01cc70..d4ac74ae 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -24,6 +24,11 @@ defaults format: :json do scope module: :users do resources :projects, only: [:index] resources :feedbacks, only: [:create] + resources :home_top_settings, only: [:create] do + collection do + delete :cancel + end + end resources :openkylin_sign, only: [:create] do collection do get :competitions diff --git a/db/migrate/20240715072430_create_home_top_settings.rb b/db/migrate/20240715072430_create_home_top_settings.rb new file mode 100644 index 00000000..e3099a20 --- /dev/null +++ b/db/migrate/20240715072430_create_home_top_settings.rb @@ -0,0 +1,10 @@ +class CreateHomeTopSettings < ActiveRecord::Migration[5.2] + def change + create_table :home_top_settings do |t| + t.references :user + t.references :top, polymorphic: true, index: true + + t.timestamps + end + end +end From 21eb842766918f29dc2ef90547ec29dfa77dd246 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 16 Jul 2024 10:17:09 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=BF=94=E5=9B=9E=E6=98=AF=E5=90=A6=E7=BD=AE=E9=A1=B6?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users/organizations_controller.rb | 6 +++--- app/queries/projects/list_my_query.rb | 6 +++--- app/views/users/organizations/index.json.jbuilder | 1 + app/views/users/projects.json.jbuilder | 5 +++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/controllers/users/organizations_controller.rb b/app/controllers/users/organizations_controller.rb index 06c378ad..2d80adb9 100644 --- a/app/controllers/users/organizations_controller.rb +++ b/app/controllers/users/organizations_controller.rb @@ -11,10 +11,10 @@ class Users::OrganizationsController < Users::BaseController @organizations = @organizations.ransack(login_cont: params[:search]).result if params[:search].present? - home_top_ids = @organizations.joins(:home_top_settings).where(home_top_settings: {user_id: observed_user.id}).order("home_top_settings.created_at asc").pluck(:id) + @home_top_ids = @organizations.joins(:home_top_settings).where(home_top_settings: {user_id: observed_user.id}).order("home_top_settings.created_at asc").pluck(:id) - if home_top_ids.present? - @organizations = @organizations.joins(:organization_extension).order("FIELD(users.id, #{home_top_ids.join(",")}) desc, organization_extensions.#{sort_by} #{sort_direction}") + if @home_top_ids.present? + @organizations = @organizations.joins(:organization_extension).order("FIELD(users.id, #{@home_top_ids.join(",")}) desc, organization_extensions.#{sort_by} #{sort_direction}") else @organizations = @organizations.joins(:organization_extension).order("organization_extensions.#{sort_by} #{sort_direction}") end diff --git a/app/queries/projects/list_my_query.rb b/app/queries/projects/list_my_query.rb index 5d83b763..5800f83b 100644 --- a/app/queries/projects/list_my_query.rb +++ b/app/queries/projects/list_my_query.rb @@ -72,13 +72,13 @@ class Projects::ListMyQuery < ApplicationQuery sort = Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : "updated_on" sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : "desc" - home_top_ids = scope.joins(:home_top_settings).where(home_top_settings: {user_id: user.id}).order("home_top_settings.created_at asc").pluck(:id) + @home_top_ids = scope.joins(:home_top_settings).where(home_top_settings: {user_id: user.id}).order("home_top_settings.created_at asc").pluck(:id) if params[:choosed].present? && params[:choosed].is_a?(Array) scope.distinct.order("FIELD(id, #{params[:choosed].reverse.join(",")}) desc") else - if home_top_ids.present? - scope.distinct.order("FIELD(id, #{home_top_ids.join(",")}) desc, projects.#{sort} #{sort_direction}") + if @home_top_ids.present? + scope.distinct.order("FIELD(id, #{@home_top_ids.join(",")}) desc, projects.#{sort} #{sort_direction}") else scope.distinct.order("projects.#{sort} #{sort_direction}") end diff --git a/app/views/users/organizations/index.json.jbuilder b/app/views/users/organizations/index.json.jbuilder index 0a195036..3963a3b1 100644 --- a/app/views/users/organizations/index.json.jbuilder +++ b/app/views/users/organizations/index.json.jbuilder @@ -1,4 +1,5 @@ json.total_count @organizations.total_count json.organizations @organizations do |organization| json.partial! "/organizations/organizations/detail", organization: organization + json.is_home_top @home_top_ids.include?(organization.id) end diff --git a/app/views/users/projects.json.jbuilder b/app/views/users/projects.json.jbuilder index d00ec68b..087b9657 100644 --- a/app/views/users/projects.json.jbuilder +++ b/app/views/users/projects.json.jbuilder @@ -1,4 +1,5 @@ json.count @total_count -json.projects do - json.partial! '/projects/project_detail', collection: @projects, as: :project +json.projects @projects do |project| + json.partial! '/projects/project_detail', project: project + json.is_home_top @home_top_ids.include?(project.id) end From da6931d790f403b10cfc8399c417ab8a87145b6d Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 16 Jul 2024 10:23:21 +0800 Subject: [PATCH 03/10] fix --- app/controllers/users_controller.rb | 2 +- app/queries/projects/list_my_query.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b976ee8f..27895a75 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -408,7 +408,7 @@ class UsersController < ApplicationController def projects is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == @user.id) - scope = Projects::ListMyQuery.call(params, @user,is_current_admin_user) + scope, @home_top_ids = Projects::ListMyQuery.call(params, @user,is_current_admin_user) @total_count = scope.size @projects = kaminari_unlimit_paginate(scope) end diff --git a/app/queries/projects/list_my_query.rb b/app/queries/projects/list_my_query.rb index 5800f83b..3b6e903c 100644 --- a/app/queries/projects/list_my_query.rb +++ b/app/queries/projects/list_my_query.rb @@ -83,5 +83,7 @@ class Projects::ListMyQuery < ApplicationQuery scope.distinct.order("projects.#{sort} #{sort_direction}") end end + + return scope, @home_top_ids end end From baa2c62186bb24ab2b9300ae099df5d825208eb6 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 17 Jul 2024 14:05:20 +0800 Subject: [PATCH 04/10] fix --- app/queries/projects/list_my_query.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/queries/projects/list_my_query.rb b/app/queries/projects/list_my_query.rb index 3b6e903c..2ab2324e 100644 --- a/app/queries/projects/list_my_query.rb +++ b/app/queries/projects/list_my_query.rb @@ -75,12 +75,12 @@ class Projects::ListMyQuery < ApplicationQuery @home_top_ids = scope.joins(:home_top_settings).where(home_top_settings: {user_id: user.id}).order("home_top_settings.created_at asc").pluck(:id) if params[:choosed].present? && params[:choosed].is_a?(Array) - scope.distinct.order("FIELD(id, #{params[:choosed].reverse.join(",")}) desc") + scope = scope.distinct.order("FIELD(id, #{params[:choosed].reverse.join(",")}) desc") else - if @home_top_ids.present? - scope.distinct.order("FIELD(id, #{@home_top_ids.join(",")}) desc, projects.#{sort} #{sort_direction}") + if @home_top_ids.present? + scope = scope.distinct.order("FIELD(id, #{@home_top_ids.join(",")}) desc, projects.#{sort} #{sort_direction}") else - scope.distinct.order("projects.#{sort} #{sort_direction}") + scope = scope.distinct.order("projects.#{sort} #{sort_direction}") end end From 6dda125a1cb6b350708dd74437fdfaa0ebd33f83 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 17 Jul 2024 14:31:23 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=98=AF=E5=90=A6=E6=9C=89=E5=90=88=E5=B9=B6=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/project.rb | 9 +++++++++ app/views/api/v1/projects/branches/index.json.jbuilder | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index 04aa1bce..ba0cab97 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -462,6 +462,15 @@ class Project < ApplicationRecord EduSetting.get("open_portrait_projects").present? ? EduSetting.get("open_portrait_projects").split(",").include?(self.id.to_s) : false end + def has_pull_request(branch_name) + return true if self.pull_requests.opening.where(head: branch_name).present? || self.pull_requests.opening.where(base: branch_name).present? + if self.forked_from_project_id.present? + return true if self.fork_project.pull_requests.opening.where(head: branch_name).present? || self.fork_project.pull_requests.opening.where(base: branch_name).present? + end + + return false + end + def self.mindspore_contributors cache_result = $redis_cache.get("ProjectMindsporeContributors") if cache_result.nil? diff --git a/app/views/api/v1/projects/branches/index.json.jbuilder b/app/views/api/v1/projects/branches/index.json.jbuilder index 80b3e4d0..ec854669 100644 --- a/app/views/api/v1/projects/branches/index.json.jbuilder +++ b/app/views/api/v1/projects/branches/index.json.jbuilder @@ -1,5 +1,5 @@ json.total_count @result_object[:total_data].to_i json.branches @result_object[:data].each do |branch| json.partial! "api/v1/projects/branches/simple_gitea_detail", branch: branch, default_branch: @result_object[:default_branch] - + json.has_pull_request @project.has_pull_request(branch['name']) end \ No newline at end of file From 8177606f81118a712a972ce1cd7ffb7514444b09 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 17 Jul 2024 15:51:15 +0800 Subject: [PATCH 06/10] fix --- app/queries/projects/list_my_query.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/queries/projects/list_my_query.rb b/app/queries/projects/list_my_query.rb index 2ab2324e..b81d5542 100644 --- a/app/queries/projects/list_my_query.rb +++ b/app/queries/projects/list_my_query.rb @@ -75,10 +75,10 @@ class Projects::ListMyQuery < ApplicationQuery @home_top_ids = scope.joins(:home_top_settings).where(home_top_settings: {user_id: user.id}).order("home_top_settings.created_at asc").pluck(:id) if params[:choosed].present? && params[:choosed].is_a?(Array) - scope = scope.distinct.order("FIELD(id, #{params[:choosed].reverse.join(",")}) desc") + scope = scope.distinct.order("FIELD(projects.id, #{params[:choosed].reverse.join(",")}) desc") else if @home_top_ids.present? - scope = scope.distinct.order("FIELD(id, #{@home_top_ids.join(",")}) desc, projects.#{sort} #{sort_direction}") + scope = scope.distinct.order("FIELD(projects.id, #{@home_top_ids.join(",")}) desc, projects.#{sort} #{sort_direction}") else scope = scope.distinct.order("projects.#{sort} #{sort_direction}") end From d1098591494a660daebe988c9cd669fa9608081b Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 17 Jul 2024 16:04:21 +0800 Subject: [PATCH 07/10] fix --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5d558242..d670e9a0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -479,7 +479,7 @@ module ApplicationHelper return if url.blank? content_tag(:li) do - sidebar_item(url, "数据统计", icon: 'bar-chart', controller: 'root') + sidebar_item(url, "数据统计", icon: 'bar-chart', controller: 'root', has_permission: true) end end From c362315ea55c3b0592e26171eaa2ce5d67a8f185 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 18 Jul 2024 15:32:34 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E7=AE=A1=E7=90=86=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=88=AB=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admins/projects_controller.rb | 10 ++++++++++ app/views/admins/projects/index.html.erb | 13 ++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/controllers/admins/projects_controller.rb b/app/controllers/admins/projects_controller.rb index fd576b8c..5589c66c 100644 --- a/app/controllers/admins/projects_controller.rb +++ b/app/controllers/admins/projects_controller.rb @@ -7,6 +7,16 @@ class Admins::ProjectsController < Admins::BaseController sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc' search = params[:search].to_s.strip projects = Project.where("name like ? OR identifier LIKE ?", "%#{search}%", "%#{search}%").order("#{sort_by} #{sort_direction}") + case params[:category] + when 'public' + projects = projects.where(is_public: true) + when 'private' + projects = projects.where(is_public: false) + when 'fork' + projects = projects.where.not(forked_from_project_id: nil) + when 'original' + projects = projects.where(forked_from_project_id: nil, project_type: 'common') + end @projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score) end diff --git a/app/views/admins/projects/index.html.erb b/app/views/admins/projects/index.html.erb index 35d931b0..be36229f 100644 --- a/app/views/admins/projects/index.html.erb +++ b/app/views/admins/projects/index.html.erb @@ -3,10 +3,15 @@ <% end %>
- <%= form_tag(admins_projects_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %> + <%= form_tag(admins_projects_path, method: :get, class: 'form-inline search-form flex-1', id: 'project-list-form', remote: true) do %> <%= text_field_tag(:search, params[:search], class: 'form-control col-12 col-md-2 mr-3', placeholder: '项目名称/标识检索') %> <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %> +
+ + <% type_options = [['全部项目', ''], ['公开项目', 'public'], ['私有项目', 'private'], ['Fork项目', 'fork'], ['原创项目', 'original']] %> + <%= select_tag(:category, options_for_select(type_options, params[:category]), class: 'form-control', id: 'project-category') %> +
<% end %>
@@ -16,3 +21,9 @@
+ + \ No newline at end of file From f9e7dafefd1d3b5f4ffc83822d55dd29b2cf6dbc Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 19 Jul 2024 09:46:57 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=88=A0?= =?UTF-8?q?=E9=99=A4fork=E4=BB=93=E5=BA=93=E5=85=B3=E9=97=AD=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admins/projects_controller.rb | 19 +++++++++++++++++++ app/controllers/projects_controller.rb | 16 ++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/app/controllers/admins/projects_controller.rb b/app/controllers/admins/projects_controller.rb index 5589c66c..f5f210a0 100644 --- a/app/controllers/admins/projects_controller.rb +++ b/app/controllers/admins/projects_controller.rb @@ -43,8 +43,12 @@ class Admins::ProjectsController < Admins::BaseController def destroy project = Project.find_by!(id: params[:id]) ActiveRecord::Base.transaction do + close_fork_pull_requests_by(project) Gitea::Repository::DeleteService.new(project.owner, project.identifier, current_user.gitea_token).call project.destroy! + project.forked_projects.update_all(forked_from_project_id: nil) + # 如果该项目有所属的项目分类以及为私有项目，需要更新对应数量 + project.project_category.decrement!(:private_projects_count, 1) if project.project_category.present? && !project.is_public # render_delete_success UserAction.create(action_id: project.id, action_type: "DestroyProject", user_id: current_user.id, :ip => request.remote_ip, data_bank: project.attributes.to_json) redirect_to admins_projects_path @@ -63,4 +67,19 @@ class Admins::ProjectsController < Admins::BaseController def project_update_params params.require(:project).permit(:is_pinned, :recommend, :recommend_index) end + + def close_fork_pull_requests_by(project) + open_pull_requests = PullRequest.where(fork_project_id: project.id) + if open_pull_requests.present? + open_pull_requests.each do |pull_request| + closed = PullRequests::CloseService.call(pull_request&.project.owner, pull_request&.project.repository, pull_request, current_user) + if closed === true + pull_request.project_trends.create!(user: current_user, project: pull_request&.project,action_type: ProjectTrend::CLOSE) + # 合并请求下issue处理为关闭 + pull_request.issue&.update_attributes!({status_id:5}) + SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, pull_request.id) if Site.has_notice_menu? + end + end + end + end end \ No newline at end of file diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 12b668d9..6485ddef 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -258,6 +258,7 @@ class ProjectsController < ApplicationController def destroy if current_user.admin? || @project.manager?(current_user) ActiveRecord::Base.transaction do + close_fork_pull_requests_by(@project) Gitea::Repository::DeleteService.new(@project.owner, @project.identifier,current_user.gitea_token).call @project.destroy! @project.forked_projects.update_all(forked_from_project_id: nil) @@ -408,4 +409,19 @@ class ProjectsController < ApplicationController render_unauthorized('你还未登录.') end end + + def close_fork_pull_requests_by(project) + open_pull_requests = PullRequest.where(fork_project_id: project.id) + if open_pull_requests.present? + open_pull_requests.each do |pull_request| + closed = PullRequests::CloseService.call(pull_request&.project.owner, pull_request&.project.repository, pull_request, current_user) + if closed === true + pull_request.project_trends.create!(user: current_user, project: pull_request&.project,action_type: ProjectTrend::CLOSE) + # 合并请求下issue处理为关闭 + pull_request.issue&.update_attributes!({status_id:5}) + SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, pull_request.id) if Site.has_notice_menu? + end + end + end + end end From c9df8fa3fe0690e1a4f184780a414c7d8fd73e72 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 19 Jul 2024 11:17:15 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=AD=98?= =?UTF-8?q?=E5=82=A8pull=5Frequest=E6=BA=90=E4=BB=93=E5=BA=93=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 4 ++ app/models/pull_request.rb | 40 ++++++++++--------- app/services/projects/transfer_service.rb | 6 +++ app/services/pull_requests/create_service.rb | 7 +++- app/views/pull_requests/index.json.jbuilder | 8 ++-- app/views/pull_requests/show.json.jbuilder | 7 ++-- ...oject_owner_identifier_to_pull_requests.rb | 6 +++ 7 files changed, 50 insertions(+), 28 deletions(-) create mode 100644 db/migrate/20240719015447_add_fork_project_owner_identifier_to_pull_requests.rb diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6485ddef..d3e30845 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -217,6 +217,10 @@ class ProjectsController < ApplicationController new_project_params = project_params.except(:private).merge(is_public: !private) @project.update_attributes!(new_project_params) + fork_pull_requests = PullRequest.where(fork_project_id: @project.id) + if fork_pull_requests.present? + fork_pull_requests.update_all(fork_project_identifier: @project.identifier) + end @project.forked_projects.map{|p| p.update!(is_public: @project.is_public)} gitea_params = { private: private, diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb index 0142f27f..26b4ce2c 100644 --- a/app/models/pull_request.rb +++ b/app/models/pull_request.rb @@ -2,25 +2,27 @@ # # Table name: pull_requests # -# id :integer not null, primary key -# gitea_id :integer -# gitea_number :integer -# user_id :integer -# created_at :datetime not null -# updated_at :datetime not null -# status :integer default("0") -# project_id :integer -# title :string(255) -# milestone :integer -# body :text(4294967295) -# head :string(255) -# base :string(255) -# issue_id :integer -# fork_project_id :integer -# is_original :boolean default("0") -# comments_count :integer default("0") -# commits_count :integer default("0") -# files_count :integer default("0") +# id :integer not null, primary key +# gitea_id :integer +# gitea_number :integer +# user_id :integer +# created_at :datetime not null +# updated_at :datetime not null +# status :integer default("0") +# project_id :integer +# title :string(255) +# milestone :integer +# body :text(4294967295) +# head :string(255) +# base :string(255) +# issue_id :integer +# fork_project_id :integer +# is_original :boolean default("0") +# comments_count :integer default("0") +# commits_count :integer default("0") +# files_count :integer default("0") +# fork_project_owner :string(255) +# fork_project_identifier :string(255) # class PullRequest < ApplicationRecord diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb index 07eab898..b83ec51d 100644 --- a/app/services/projects/transfer_service.rb +++ b/app/services/projects/transfer_service.rb @@ -15,6 +15,7 @@ class Projects::TransferService < ApplicationService update_repo_url update_visit_teams update_fork_info + update_fork_pull_request_info end Rails.logger.info("##### Project transfer_service end ######") @@ -49,6 +50,11 @@ class Projects::TransferService < ApplicationService fork_user.update(user_id: @new_owner.id) if fork_user.present? end + def update_fork_pull_request_info + fork_pull_requests = PullRequest.where(fork_project_id: @project.id) + fork_pull_requests.update_all(fork_project_owner: @new_owner&.login) if fork_pull_requests.present? + end + def gitea_update_owner begin @gitea_repo = $gitea_hat_client.post_repos_transfer_by_owner_repo(owner&.login, project.identifier, {body: {new_owner: new_owner&.login}.to_json}) diff --git a/app/services/pull_requests/create_service.rb b/app/services/pull_requests/create_service.rb index 070b564d..0010f875 100644 --- a/app/services/pull_requests/create_service.rb +++ b/app/services/pull_requests/create_service.rb @@ -1,6 +1,6 @@ class PullRequests::CreateService < ApplicationService - attr_reader :current_user, :owner, :project, :params + attr_reader :current_user, :owner, :project, :params, :fork_project attr_accessor :pull_issue, :pull_request def initialize(current_user, owner, project, params) @@ -8,6 +8,7 @@ class PullRequests::CreateService < ApplicationService @project = project @params = params @current_user = current_user + @fork_project = Project.find_by_id(params[:fork_project_id]) end def call @@ -102,7 +103,9 @@ class PullRequests::CreateService < ApplicationService fork_project_id: @params[:fork_project_id], is_original: is_original, files_count: @params[:files_count] || 0, - commits_count: @params[:commits_count] || 0 + commits_count: @params[:commits_count] || 0, + fork_project_owner: @fork_project&.owner&.login, + fork_project_identifier: @fork_project&.identifier }) end diff --git a/app/views/pull_requests/index.json.jbuilder b/app/views/pull_requests/index.json.jbuilder index 8e41d8df..3a35772f 100644 --- a/app/views/pull_requests/index.json.jbuilder +++ b/app/views/pull_requests/index.json.jbuilder @@ -23,10 +23,10 @@ json.issues do json.pull_request_base pr.base json.pull_request_staus pr.status == 1 ? "merged" : (pr.status == 2 ? "closed" : "open") json.is_original pr.is_original - json.fork_project_id pr.fork_project_id.present? ? pr.fork_project_id : pr.project_id - json.fork_project_identifier pr.fork_project_id.present? ? pr&.fork_project&.identifier : pr.project&.identifier - json.fork_project_user pr.fork_project_id.present? ? pr&.fork_project&.owner.try(:login) : pr.project&.owner.try(:login) - json.fork_project_user_name pr.fork_project_id.present? ? pr&.fork_project&.owner.try(:show_real_name) : pr.project&.owner.try(:show_real_name) + json.fork_project_id pr.fork_project_id + json.fork_project_identifier pr.fork_project.present? ? pr&.fork_project&.identifier : pr.fork_project_identifier + json.fork_project_user pr.fork_project.present? ? pr&.fork_project&.owner.try(:login) : pr.fork_project_owner + json.fork_project_user_name pr.fork_project.present? ? pr&.fork_project&.owner.try(:show_real_name) : User.find_by(login: pr.fork_project_owner).try(:show_real_name) json.reviewers pr.reviewers.pluck(:login) json.id issue.id diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder index 4c731b9a..509577ed 100644 --- a/app/views/pull_requests/show.json.jbuilder +++ b/app/views/pull_requests/show.json.jbuilder @@ -25,9 +25,10 @@ end json.pull_request do json.extract! @pull_request, :id,:base, :head, :status, :is_original json.pull_request_staus @pull_request.status == 1 ? "merged" : (@pull_request.status == 2 ? "closed" : "open") - json.fork_project_id @pull_request.fork_project_id.present? ? @pull_request.fork_project_id : @pull_request.project_id - json.fork_project_user @pull_request.fork_project_id.present? ? @pull_request&.fork_project&.owner.try(:login) : @pull_request.project&.owner.try(:login) - json.fork_project_user_name @pull_request.fork_project_id.present? ? @pull_request&.fork_project&.owner.try(:show_real_name) : @pull_request.project&.owner.try(:show_real_name) + json.fork_project_id @pull_request.fork_project_id + json.fork_project_identifier @pull_request.fork_project.present? ? @pull_request&.fork_project&.identifier : @pull_request.fork_project_identifier + json.fork_project_user @pull_request.fork_project.present? ? @pull_request&.fork_project&.owner.try(:login) : @pull_request.fork_project_owner + json.fork_project_user_name @pull_request.fork_project.present? ? @pull_request&.fork_project&.owner.try(:show_real_name) : User.find_by(login: @pull_request.fork_project_owner).try(:show_real_name) json.create_user @pull_request&.user&.login json.mergeable @gitea_pull["mergeable"] json.state @gitea_pull["state"] diff --git a/db/migrate/20240719015447_add_fork_project_owner_identifier_to_pull_requests.rb b/db/migrate/20240719015447_add_fork_project_owner_identifier_to_pull_requests.rb new file mode 100644 index 00000000..d4d98a55 --- /dev/null +++ b/db/migrate/20240719015447_add_fork_project_owner_identifier_to_pull_requests.rb @@ -0,0 +1,6 @@ +class AddForkProjectOwnerIdentifierToPullRequests < ActiveRecord::Migration[5.2] + def change + add_column :pull_requests, :fork_project_owner, :string + add_column :pull_requests, :fork_project_identifier, :string + end +end