fix: eager load organisers on homepage events#2498
Merged
mroderick merged 1 commit intocodebar:masterfrom Feb 21, 2026
Merged
Conversation
Add missing :organisers include to Workshop, Meeting, and Event queries in DashboardController#upcoming_events to prevent N+1 queries when rendering the homepage.
80f6696 to
2c76d4b
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
:organisersassociation on Workshop, Meeting, and Event queries inDashboardController#upcoming_eventsandupcoming_events_for_userAnalysis
The homepage (
DashboardController#show) was causing N+1 queries when rendering events because::chapterand:sponsorsbut not:organisers:venue:venueand:sponsorsbut not:organisersWhen rendering
_event.html.haml, the view accessesevent.organiserswhich triggered a separate database query for each event.Fix
Added
:organisersto the.includes()calls for all three event types:Verification
SQL proof: With
:organisersincluded, ActiveRecord generates a single query with LEFT OUTER JOINs to fetch permissions and members:Why tests don't fail: The test factories create workshops without individual organiser permissions (only chapter-level), so N+1 doesn't trigger in tests. The N+1 would appear in production when workshops/events have specific organiser permissions.
Testing in production: