From 1c61e4324ff328e1c0263c45e74aadfbd51b0a6a Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 10 Mar 2025 15:27:55 +0800
Subject: [PATCH] PERF: Fix N+1 problem on
 `DiscoursePostEvent::EventsController#index` (#698)

---
 .../discourse_post_event/events_controller.rb |  5 +++-
 spec/requests/events_controller_spec.rb       | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/controllers/discourse_post_event/events_controller.rb b/app/controllers/discourse_post_event/events_controller.rb
index 84ea4f06..fb734255 100644
--- a/app/controllers/discourse_post_event/events_controller.rb
+++ b/app/controllers/discourse_post_event/events_controller.rb
@@ -3,7 +3,10 @@
 module DiscoursePostEvent
   class EventsController < DiscoursePostEventController
     def index
-      @events = DiscoursePostEvent::EventFinder.search(current_user, filtered_events_params)
+      @events =
+        DiscoursePostEvent::EventFinder.search(current_user, filtered_events_params).includes(
+          post: :topic,
+        )
 
       # The detailed serializer is currently not used anywhere in the frontend, but available via API
       serializer = params[:include_details] == "true" ? EventSerializer : EventSummarySerializer
diff --git a/spec/requests/events_controller_spec.rb b/spec/requests/events_controller_spec.rb
index 0dff77e2..9b04ded8 100644
--- a/spec/requests/events_controller_spec.rb
+++ b/spec/requests/events_controller_spec.rb
@@ -9,6 +9,28 @@ module DiscoursePostEvent
       SiteSetting.displayed_invitees_limit = 3
     end
 
+    describe "#index" do
+      fab!(:event_1) { Fabricate(:event, original_starts_at: 1.day.from_now) }
+
+      it "should not result in N+1 queries problem when multiple events are returned" do
+        original_queries = track_sql_queries { get "/discourse-post-event/events.json" }
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["events"].length).to eq(1)
+
+        event_2 = Fabricate(:event, original_starts_at: 2.days.from_now)
+        event_3 = Fabricate(:event, original_starts_at: 3.days.from_now)
+
+        new_queries = track_sql_queries { get "/discourse-post-event/events.json" }
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["events"].length).to eq(3)
+
+        # TODO: There is still N+1 query problem here so uncomment this line when it is fixed
+        # expect(new_queries.count).to eq(original_queries.count)
+      end
+    end
+
     context "with an existing post" do
       let(:user) { Fabricate(:user, admin: true) }
       let(:topic) { Fabricate(:topic, user: user) }
@@ -210,9 +232,11 @@ module DiscoursePostEvent
 
         context "when filtering by category" do
           fab!(:category)
+
           fab!(:subcategory) do
             Fabricate(:category, parent_category: category, name: "category subcategory")
           end
+
           fab!(:event_1) do
             Fabricate(
               :event,
@@ -220,6 +244,7 @@ module DiscoursePostEvent
               post: Fabricate(:post, post_number: 1, topic: Fabricate(:topic, category: category)),
             )
           end
+
           fab!(:event_2) do
             Fabricate(
               :event,
@@ -228,6 +253,7 @@ module DiscoursePostEvent
                 Fabricate(:post, post_number: 1, topic: Fabricate(:topic, category: subcategory)),
             )
           end
+
           fab!(:event_3) do
             Fabricate(
               :event,