floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

新增：用户项目时间筛选项

This commit is contained in:
yystopf 2024-10-28 20:43:00 +08:00
parent a5a0351266
commit e448433ced
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/services/api/v1/users/projects/list_service.rb
View File

@ -55,13 +55,13 @@ class Api::V1::Users::Projects::ListService < ApplicationService
projects = Project.from("( #{normal_projects} UNION #{org_projects} ) AS projects").distinct projects = Project.from("( #{normal_projects} UNION #{org_projects} ) AS projects").distinct
when 'watched' 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.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? projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present?
when 'only_watched' when 'only_watched'
projects = projects.where.joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observe_user.id}) 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? projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present?
when 'forked' when 'forked'
if start_at.present? && end_at.present? 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) fork_ids = observe_user.fork_users.where("created_at > ? and created_at < ?", Time.at(start_at), Time.at(end_at)).select(:id, :fork_project_id).pluck(:fork_project_id)
else else
fork_ids = observe_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id) fork_ids = observe_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id)
end end