From c0ebb7431ecd59d284a7e3f8cfef541dd3a4fd1a Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 28 Oct 2024 20:28:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/users/projects/list_service.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/services/api/v1/users/projects/list_service.rb b/app/services/api/v1/users/projects/list_service.rb index 079d9d796..2e2716a21 100644 --- a/app/services/api/v1/users/projects/list_service.rb +++ b/app/services/api/v1/users/projects/list_service.rb @@ -1,7 +1,7 @@ class Api::V1::Users::Projects::ListService < ApplicationService include ActiveModel::Model - attr_reader :observe_user, :category, :is_public, :project_type, :sort_by, :sort_direction, :search, :current_user + attr_reader :observe_user, :category, :is_public, :project_type, :sort_by, :sort_direction, :search, :start_at, :end_at, :current_user attr_accessor :queried_projects validates :category, inclusion: {in: %w(all join created manage watched forked), message: "请输入正确的Category"} @@ -18,6 +18,8 @@ class Api::V1::Users::Projects::ListService < ApplicationService @sort_by = params[:sort_by] || 'updated_on' @sort_direction = params[:sort_direction] || 'desc' @search = params[:search] + @start_at = params[:start_at] + @end_at = params[:end_at] @current_user = current_user end @@ -53,10 +55,16 @@ class Api::V1::Users::Projects::ListService < ApplicationService projects = Project.from("( #{normal_projects} UNION #{org_projects} ) AS projects").distinct when 'watched' projects = projects.where.not(user_id: observe_user.id).joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observe_user.id}) + projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", start_at, end_at) if start_at.present? && end_at.present? when 'only_watched' projects = projects.where.joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observe_user.id}) + projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", start_at, end_at) if start_at.present? && end_at.present? when 'forked' - fork_ids = observe_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id) + if start_at.present? && end_at.present? + fork_ids = observe_user.fork_users.where("created_at > ? and created_at < ?", start_at, end_at).select(:id, :fork_project_id).pluck(:fork_project_id) + else + fork_ids = observe_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id) + end projects = projects.where(id: fork_ids) else normal_projects = projects.members_projects(observe_user.id).to_sql