Fix N+1 query issues.

The previous rework was slow because it executed additional queries for
each status cell. This change brings it back to only use preloaded
information.

Author: dutow

app/controllers/topics_controller.rb

@@ -5,7 +5,7 @@ class TopicsController < ApplicationController
 
   def index
     @search_query = nil
-    base_query = apply_filters(Topic.includes(:creator))
+    base_query = apply_filters(Topic.includes(:creator, creator_person: :default_alias, last_sender_person: :default_alias))
 
     apply_cursor_pagination(base_query)
     preload_topic_participants
@@ -240,7 +240,7 @@ def user_state_frame
     return head :unauthorized unless user_signed_in?
     return head :ok if topic_ids.empty?
 
-    @topics = Topic.includes(:creator).where(id: topic_ids)
+    @topics = Topic.includes(:creator, creator_person: :default_alias, last_sender_person: :default_alias).where(id: topic_ids)
     preload_topic_states
     preload_note_counts
     preload_participation_flags
@@ -771,7 +771,7 @@ def filter_team_readers(topic, team_id:)
   end
 
   def topics_base_query(search_query: nil)
-    return apply_filters(Topic.includes(:creator)) if search_query.nil?
+    return apply_filters(Topic.includes(:creator, creator_person: :default_alias, last_sender_person: :default_alias)) if search_query.nil?
 
     cleaned_query = search_query.to_s.strip
     return Topic.none if cleaned_query.blank?
@@ -790,7 +790,6 @@ def build_search_query(query)
     union_sql = "(#{title_sql}) UNION (#{message_sql})"
 
     Topic.where("topics.id IN (#{union_sql})")
-         .includes(:creator)
   end
 
   def viewing_since_param
@@ -930,7 +929,7 @@ def hydrate_topics_from_entries(entries)
     ids = entries.map { |e| e[:id] }
     return [] if ids.empty?
 
-    topics_map = Topic.includes(:creator).where(id: ids).index_by(&:id)
+    topics_map = Topic.includes(:creator, creator_person: :default_alias, last_sender_person: :default_alias).where(id: ids).index_by(&:id)
     entries.filter_map do |entry|
       topic = topics_map[entry[:id]]
       next unless topic

app/views/topics/_status_cell.html.slim

@@ -10,11 +10,11 @@ td.topic-title.status-border class=status_class id=dom_id(topic, "status_cell")
       .topic-byline
         - if creator
           span.topic-byline-item
-            = image_tag creator.display_gravatar_url(size: 20), class: "topic-byline-avatar", alt: creator.name
+            = image_tag creator.gravatar_url(size: 20), class: "topic-byline-avatar", alt: creator.name
             span.topic-byline-name = creator.name
         - if last_sender
           span.topic-byline-item.topic-byline-right
-            = image_tag last_sender.display_gravatar_url(size: 20), class: "topic-byline-avatar", alt: last_sender.name
+            = image_tag last_sender.gravatar_url(size: 20), class: "topic-byline-avatar", alt: last_sender.name
             span.topic-byline-name = last_sender.name
     .topic-row-footer
       .topic-footer-icons

app/views/topics/_topics_page.html.slim

@@ -33,7 +33,7 @@
           - role_label = participant.contributor_badge
           - badge_text = role_label ? "#{participant.name} (#{role_label})" : participant.name
           = link_to person_path(participant.email), class: "participant-avatar-link" do
-            = image_tag participant.display_gravatar_url(size: 32), class: css_classes.join(" "), alt: participant.name, title: badge_text
+            = image_tag participant.gravatar_url(size: 32), class: css_classes.join(" "), alt: participant.name, title: badge_text
       - if topic.participant_count > 5
         span.participants-count +#{topic.participant_count - 5}
     .topic-column.replies-col