Revert "PERF: Cache categories in Site model take 2."

This reverts commit 06fa1efd3d8a935a5ae3e7876dbbaa3193316d7c.

Breakage in solved plugin
This commit is contained in:
Kane York
2021-06-21 12:06:08 -07:00
committed by Kane York
parent c72bf1d732
commit 83a6ad32ff
8 changed files with 29 additions and 136 deletions

View File

@ -58,65 +58,30 @@ describe Site do
expect(Site.new(guardian).categories.last.notification_level).to eq(1)
end
describe '#categories' do
fab!(:category) { Fabricate(:category) }
fab!(:user) { Fabricate(:user) }
fab!(:guardian) { Guardian.new(user) }
it "omits categories users can not write to from the category list" do
category = Fabricate(:category)
user = Fabricate(:user)
after do
Site.clear_cache
end
expect(Site.new(Guardian.new(user)).categories.count).to eq(2)
it "omits read restricted categories" do
expect(Site.new(guardian).categories.map(&:id)).to contain_exactly(
SiteSetting.uncategorized_category_id, category.id
)
category.set_permissions(everyone: :create_post)
category.save
category.update!(read_restricted: true)
guardian = Guardian.new(user)
expect(Site.new(guardian).categories.map(&:id)).to contain_exactly(
SiteSetting.uncategorized_category_id
)
end
expect(Site.new(guardian)
.categories
.keep_if { |c| c.name == category.name }
.first
.permission)
.not_to eq(CategoryGroup.permission_types[:full])
it "includes categories that a user's group can see" do
group = Fabricate(:group)
category.update!(read_restricted: true)
category.groups << group
# If a parent category is not visible, the child categories should not be returned
category.set_permissions(staff: :full)
category.save
expect(Site.new(guardian).categories.map(&:id)).to contain_exactly(
SiteSetting.uncategorized_category_id
)
group.add(user)
expect(Site.new(Guardian.new(user)).categories.map(&:id)).to contain_exactly(
SiteSetting.uncategorized_category_id, category.id
)
end
it "omits categories users can not write to from the category list" do
expect(Site.new(guardian).categories.count).to eq(2)
category.set_permissions(everyone: :create_post)
category.save!
guardian = Guardian.new(user)
expect(Site.new(guardian)
.categories
.keep_if { |c| c.name == category.name }
.first
.permission)
.not_to eq(CategoryGroup.permission_types[:full])
# If a parent category is not visible, the child categories should not be returned
category.set_permissions(staff: :full)
category.save!
sub_category = Fabricate(:category, parent_category_id: category.id)
expect(Site.new(guardian).categories).not_to include(sub_category)
end
sub_category = Fabricate(:category, parent_category_id: category.id)
expect(Site.new(guardian).categories).not_to include(sub_category)
end
it "omits groups user can not see" do