Skip to content

A platform for community discussion. Free, open, simple.

PERF: Cache negative results in `User#whisperer?`

Régis Hanolc9e23e45bcb7
diff --git a/app/models/concerns/roleable.rb b/app/models/concerns/roleable.rb
index 62fd303e040..e30343f009d 100644
--- a/app/models/concerns/roleable.rb
+++ b/app/models/concerns/roleable.rb
@@ -20,12 +20,11 @@ module Roleable
end
def whisperer?
- @whisperer ||=
- begin
- return false if SiteSetting.whispers_allowed_groups_map.empty?
- return true if admin
- group_users&.exists?(group_id: SiteSetting.whispers_allowed_groups_map)
- end
+ return false if SiteSetting.whispers_allowed_groups_map.empty?
+ return true if admin
+ return @whisperer unless @whisperer.nil?
+
+ @whisperer = group_users.exists?(group_id: SiteSetting.whispers_allowed_groups_map)
end
def category_group_moderator?
diff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rb
index 13e4910bdb6..a19f4077444 100644
--- a/spec/lib/search_spec.rb
+++ b/spec/lib/search_spec.rb
@@ -1203,7 +1203,7 @@ RSpec.describe Search do
expect(results.posts).to eq([])
user.groups << whisperers_group
- results = Search.execute("tiger", guardian: Guardian.new(user))
+ results = Search.execute("tiger", guardian: Guardian.new(user.reload))
expect(results.posts).to eq([post])
end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 6d56910cfad..2f656a8ec60 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -3821,13 +3821,20 @@ RSpec.describe User do
group.add(whisperer)
- expect(whisperer.whisperer?).to eq(true)
+ expect(whisperer.reload.whisperer?).to eq(true)
expect(user.whisperer?).to eq(false)
end
it "returns false if no whispers groups exist" do
expect(user.whisperer?).to eq(false)
end
+
+ it "looks up whisper group membership once" do
+ SiteSetting.whispers_allowed_groups = "#{group.id}"
+ user.whisperer?
+
+ expect(track_sql_queries { user.whisperer? }).to be_empty
+ end
end
describe "#grouped_unread_notifications" do
diff --git a/spec/serializers/user_post_bookmark_serializer_spec.rb b/spec/serializers/user_post_bookmark_serializer_spec.rb
index 116e7979d0e..6b48f93d99b 100644
--- a/spec/serializers/user_post_bookmark_serializer_spec.rb
+++ b/spec/serializers/user_post_bookmark_serializer_spec.rb
@@ -22,6 +22,7 @@ RSpec.describe UserPostBookmarkSerializer do
expect(serializer.highest_post_number).to eq(3)
user.groups << whisperers_group
+ user.reload
expect(serializer.highest_post_number).to eq(4)
end