github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 07:19:21 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

PERF: Cache categories in Site model take 2.

Browse Source 
Follow-up to aa4f0aee67d6f9802856ab4abb5a7560359854b6.

Fixed the security problem in the previous attempt.
This commit is contained in:
Alan Guo Xiang Tan
2021-06-18 09:04:18 +08:00
parent 22b96c9ce1
commit 06fa1efd3d
8 changed files with 136 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spec/serializers/site_serializer_spec.rb
View File

@ -10,13 +10,34 @@ describe SiteSerializer do
category.custom_fields["enable_marketplace"] = true
category.save_custom_fields
data = MultiJson.dump(described_class.new(Site.new(guardian), scope: guardian, root: false))
expect(data).not_to include("enable_marketplace")
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
c1 = serialized[:categories].find { |c| c[:id] == category.id }
expect(c1[:preloaded_custom_fields]).to eq(nil)
Site.preloaded_category_custom_fields << "enable_marketplace"
data = MultiJson.dump(described_class.new(Site.new(guardian), scope: guardian, root: false))
expect(data).to include("enable_marketplace")
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
c1 = serialized[:categories].find { |c| c[:id] == category.id }
expect(c1[:preloaded_custom_fields]["enable_marketplace"]).to eq("t")
end
it "includes category tags" do
tag = Fabricate(:tag)
tag_group = Fabricate(:tag_group)
tag_group_2 = Fabricate(:tag_group)
category.tags << tag
category.tag_groups << tag_group
category.update!(required_tag_group: tag_group_2)
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
c1 = serialized[:categories].find { |c| c[:id] == category.id }
expect(c1[:allowed_tags]).to contain_exactly(tag.name)
expect(c1[:allowed_tag_groups]).to contain_exactly(tag_group.name)
expect(c1[:required_tag_group_name]).to eq(tag_group_2.name)
end
it "returns correct notification level for categories" do