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