|
|
|
@@ -55,13 +55,13 @@ 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? |
|
|
|
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' |
|
|
|
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' |
|
|
|
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 |
|
|
|
fork_ids = observe_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id) |
|
|
|
end |
|
|
|
|