Commit e726ed5e authored by Camil Staps's avatar Camil Staps

Handle reviewer comments on !24690

parent d2b2486a
...@@ -2,8 +2,10 @@ ...@@ -2,8 +2,10 @@
class StarredProjectsFinder < ProjectsFinder class StarredProjectsFinder < ProjectsFinder
def initialize(user, params: {}, current_user: nil) def initialize(user, params: {}, current_user: nil)
project_ids = user.starred_projects.select(:id) super(
params: params,
super(params: params, current_user: current_user, project_ids_relation: project_ids) current_user: current_user,
project_ids_relation: user.starred_projects.select(:id)
)
end end
end end
...@@ -12,7 +12,7 @@ class UsersStarProjectsFinder ...@@ -12,7 +12,7 @@ class UsersStarProjectsFinder
end end
def execute def execute
stars = UsersStarProject.all.order_id_desc stars = UsersStarProject.all
stars = by_project(stars) stars = by_project(stars)
stars = by_search(stars) stars = by_search(stars)
stars = filter_visible_profiles(stars) stars = filter_visible_profiles(stars)
......
...@@ -282,15 +282,17 @@ class User < ApplicationRecord ...@@ -282,15 +282,17 @@ class User < ApplicationRecord
scope :for_todos, -> (todos) { where(id: todos.select(:user_id)) } scope :for_todos, -> (todos) { where(id: todos.select(:user_id)) }
scope :with_emails, -> { preload(:emails) } scope :with_emails, -> { preload(:emails) }
scope :with_dashboard, -> (dashboard) { where(dashboard: dashboard) } scope :with_dashboard, -> (dashboard) { where(dashboard: dashboard) }
scope :with_visible_profile, -> (user) { scope :with_public_profile, -> { where(private_profile: false) }
if user.nil?
where(private_profile: false) def self.with_visible_profile(user)
elsif user.admin? return with_public_profile if user.nil?
if user.admin?
all all
else else
where(private_profile: false).or where(id: user.id) with_public_profile.or(where(id: user.id))
end end
} end
# Limits the users to those that have TODOs, optionally in the given state. # Limits the users to those that have TODOs, optionally in the given state.
# #
......
...@@ -12,8 +12,8 @@ class UsersStarProject < ApplicationRecord ...@@ -12,8 +12,8 @@ class UsersStarProject < ApplicationRecord
alias_attribute :starred_since, :created_at alias_attribute :starred_since, :created_at
scope :order_user_name_asc, -> { joins(:user).reorder('users.name ASC') } scope :order_user_name_asc, -> { joins(:user).merge(User.order_name_asc) }
scope :order_user_name_desc, -> { joins(:user).reorder('users.name DESC') } scope :order_user_name_desc, -> { joins(:user).merge(User.order_name_desc) }
scope :by_project, -> (project) { where(project_id: project.id) } scope :by_project, -> (project) { where(project_id: project.id) }
scope :with_visible_profile, -> (user) { joins(:user).merge(User.with_visible_profile(user)) } scope :with_visible_profile, -> (user) { joins(:user).merge(User.with_visible_profile(user)) }
......
# frozen_string_literal: true
require 'spec_helper' require 'spec_helper'
describe Projects::StarrersController do describe Projects::StarrersController do
......
# frozen_string_literal: true
require 'spec_helper' require 'spec_helper'
describe StarredProjectsFinder do describe StarredProjectsFinder do
...@@ -21,19 +23,19 @@ describe StarredProjectsFinder do ...@@ -21,19 +23,19 @@ describe StarredProjectsFinder do
describe 'as same user' do describe 'as same user' do
let(:current_user) { user } let(:current_user) { user }
it { is_expected.to eq([project2, project1]) } it { is_expected.to contain_exactly(project1, project2) }
end end
describe 'as other user' do describe 'as other user' do
let(:current_user) { other_user } let(:current_user) { other_user }
it { is_expected.to eq([project2, project1]) } it { is_expected.to contain_exactly(project1, project2) }
end end
describe 'as no user' do describe 'as no user' do
let(:current_user) { nil } let(:current_user) { nil }
it { is_expected.to eq([project2, project1]) } it { is_expected.to contain_exactly(project1, project2) }
end end
end end
end end
# frozen_string_literal: true
require 'spec_helper' require 'spec_helper'
describe UsersStarProjectsFinder do describe UsersStarProjectsFinder do
...@@ -22,19 +24,19 @@ describe UsersStarProjectsFinder do ...@@ -22,19 +24,19 @@ describe UsersStarProjectsFinder do
describe 'as same user' do describe 'as same user' do
let(:current_user) { private_user } let(:current_user) { private_user }
it { is_expected.to eq(private_stars + public_stars) } it { is_expected.to match_array(private_stars + public_stars) }
end end
describe 'as other user' do describe 'as other user' do
let(:current_user) { other_user } let(:current_user) { other_user }
it { is_expected.to eq(public_stars) } it { is_expected.to match_array(public_stars) }
end end
describe 'as no user' do describe 'as no user' do
let(:current_user) { nil } let(:current_user) { nil }
it { is_expected.to eq(public_stars) } it { is_expected.to match_array(public_stars) }
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment