A platform for community discussion. Free, open, simple.
PERF: Load user menu messages without building a topic list
Régis Hanol415dba802d6a
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rbindex bc1295ba157..0e68f2f0825 100644--- a/app/controllers/users_controller.rb+++ b/app/controllers/users_controller.rb@@ -2086,10 +2086,10 @@ class UsersController < ApplicationControllerexclude_topic_ids = unread_notifications.filter_map(&:topic_id).uniqlimit = USER_MENU_LIST_LIMIT - unread_notifications.size- messages_list =+ messages =TopicQuery.new(current_user, per_page: limit)- .list_private_messages_direct_and_groups(+ .private_messages_direct_and_groups(current_user,groups_messages_notification_level: :watching,) do |query|@@ -2119,9 +2119,7 @@ class UsersController < ApplicationController)end- if messages_list- serialized_messages = serialize_data(messages_list.topics, UserMenuMessageSerializer)- end+ serialized_messages = serialize_data(messages, UserMenuMessageSerializer) if messagesif read_notifications.present?Notification.populate_acting_user(read_notifications)diff --git a/lib/topic_query/private_message_lists.rb b/lib/topic_query/private_message_lists.rbindex 817c3e9c988..c94ee75ca11 100644--- a/lib/topic_query/private_message_lists.rb+++ b/lib/topic_query/private_message_lists.rb@@ -11,18 +11,16 @@ class TopicQuerycreate_list(:private_messages, {}, list, &blk)end- def list_private_messages_direct_and_groups(user, groups_messages_notification_level: nil, &blk)- list =- user_personal_and_groups_private_messages(- user,- groups_messages_notification_level: groups_messages_notification_level,- )-+ def private_messages_direct_and_groups(user, groups_messages_notification_level: nil)+ list = user_personal_and_groups_private_messages(user, groups_messages_notification_level:)list = not_archived(list, user)list = not_archived_in_groups(list)list = have_posts_from_others(list, user)+ list = yield(list) if block_given?- create_list(:private_messages, {}, list, &blk)+ topics = list.except(:includes).to_a+ topic_lookup = TopicUser.lookup_for(user, topics)+ topics.each { |topic| topic.user_data = topic_lookup[topic.id] }enddef list_private_messages_archive(user)diff --git a/spec/lib/topic_query/private_message_lists_spec.rb b/spec/lib/topic_query/private_message_lists_spec.rbindex cd30b0d874a..f62d73f665e 100644--- a/spec/lib/topic_query/private_message_lists_spec.rb+++ b/spec/lib/topic_query/private_message_lists_spec.rb@@ -375,22 +375,20 @@ RSpec.describe TopicQuery::PrivateMessageLists doendend- describe "#list_private_messages_direct_and_groups" do- it "returns a list of all personal and group private messages for a given user" do- expect(- TopicQuery.new(user_2).list_private_messages_direct_and_groups(user_2).topics,- ).to contain_exactly(private_message, group_message)+ describe "#private_messages_direct_and_groups" do+ it "returns all personal and group private messages for a given user with their user data" do+ topics = TopicQuery.new(user_2).private_messages_direct_and_groups(user_2)++ expect(topics).to contain_exactly(private_message, group_message)+ expect(topics.find { |t| t.id == group_message.id }.user_data).to be_presentendit "returns a list of personal private messages and user watching group private messages for a given user when the `groups_notification_level` option is set" doexpect(- TopicQuery- .new(user_2)- .list_private_messages_direct_and_groups(- user_2,- groups_messages_notification_level: :watching,- )- .topics,+ TopicQuery.new(user_2).private_messages_direct_and_groups(+ user_2,+ groups_messages_notification_level: :watching,+ ),).to contain_exactly(private_message, group_message)TopicUser.find_by(user: user_2, topic: group_message).update!(@@ -398,13 +396,10 @@ RSpec.describe TopicQuery::PrivateMessageLists do)expect(- TopicQuery- .new(user_2)- .list_private_messages_direct_and_groups(- user_2,- groups_messages_notification_level: :watching,- )- .topics,+ TopicQuery.new(user_2).private_messages_direct_and_groups(+ user_2,+ groups_messages_notification_level: :watching,+ ),).to contain_exactly(private_message)endenddiff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rbindex 22edd22d958..af18ffa4511 100644--- a/spec/requests/users_controller_spec.rb+++ b/spec/requests/users_controller_spec.rb@@ -9168,9 +9168,10 @@ RSpec.describe UsersController do)end- it "includes the last poster of each message" do- get "/u/#{user.username}/user-menu-private-messages"+ it "includes the last poster of each message without loading posts" do+ queries = track_sql_queries { get "/u/#{user.username}/user-menu-private-messages" }expect(response.status).to eq(200)+ expect(queries.grep(/FROM "posts"/)).to be_emptytopic =response.parsed_body["topics"].find { |t| t["id"] == message_without_notification.id }