Skip to content

Fix N+1 queries detected by Bullet #2665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mroderick merged 1 commit into from
Jun 30, 2026
+6 −6
Merged

Fix N+1 queries detected by Bullet #2665

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/controllers/events_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ def set_event

def fetch_upcoming_events
events = [
Workshop.includes(:chapter, :sponsors, :host, :permissions)
Workshop.includes(:chapter, :sponsors, :host, :permissions, :organisers)
.upcoming
.joins(:chapter)
.merge(Chapter.active)
]
events << Meeting.upcoming.includes(:venue, :permissions).all
events << Event.upcoming.includes(:venue, :sponsors, :sponsorships, :permissions).all
events << Meeting.upcoming.includes(:venue, :organisers).all
events << Event.upcoming.includes(:venue, :sponsors, :sponsorships, :permissions, :organisers).all

sorted = events.compact.flatten.sort_by(&:date_and_time)
return [{}, nil] if sorted.empty?
Expand All @@ -95,13 +95,13 @@ def fetch_upcoming_events

def fetch_past_events
events = [
Workshop.includes(:chapter, :sponsors, :host, :permissions)
Workshop.includes(:chapter, :sponsors, :host, :permissions, :organisers)
.past
.joins(:chapter)
.merge(Chapter.active)
]
events << Meeting.past.includes(:venue, :permissions).all
events << Event.past.includes(:venue, :sponsors, :sponsorships, :permissions).all
events << Meeting.past.includes(:venue, :organisers).all
events << Event.past.includes(:venue, :sponsors, :sponsorships, :permissions, :organisers).all

sorted = events.compact.flatten.sort_by(&:date_and_time).reverse
return [{}, nil] if sorted.empty?
Expand Down