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.rbindex 62fd303e040..e30343f009d 100644--- a/app/models/concerns/roleable.rb+++ b/app/models/concerns/roleable.rb@@ -20,12 +20,11 @@ module Roleableenddef 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)enddef category_group_moderator?diff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rbindex 13e4910bdb6..a19f4077444 100644--- a/spec/lib/search_spec.rb+++ b/spec/lib/search_spec.rb@@ -1203,7 +1203,7 @@ RSpec.describe Search doexpect(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])enddiff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rbindex 6d56910cfad..2f656a8ec60 100644--- a/spec/models/user_spec.rb+++ b/spec/models/user_spec.rb@@ -3821,13 +3821,20 @@ RSpec.describe User dogroup.add(whisperer)- expect(whisperer.whisperer?).to eq(true)+ expect(whisperer.reload.whisperer?).to eq(true)expect(user.whisperer?).to eq(false)endit "returns false if no whispers groups exist" doexpect(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+ endenddescribe "#grouped_unread_notifications" dodiff --git a/spec/serializers/user_post_bookmark_serializer_spec.rb b/spec/serializers/user_post_bookmark_serializer_spec.rbindex 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 doexpect(serializer.highest_post_number).to eq(3)user.groups << whisperers_group+ user.reloadexpect(serializer.highest_post_number).to eq(4)end