Skip to content

Commit

Permalink
Eliminate some N+1s
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuay03 committed Aug 30, 2024
1 parent 9c20cbb commit c6578fc
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 11 deletions.
1 change: 1 addition & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,7 @@ PLATFORMS
arm64-darwin-21
arm64-darwin-22
arm64-darwin-23
arm64-darwin-24
x86_64-linux

DEPENDENCIES
Expand Down
4 changes: 3 additions & 1 deletion app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ class ApplicationController < ActionController::Base
def current_profile = current_user&.profile

# TODO: Must change after implementing multi-conference support
def current_conference = Conference.last
def current_conference
@_current_conference ||= Conference.last
end

def vapid_public_key
Base64.urlsafe_decode64(ENV["VAPID_PUBLIC_KEY"]).bytes.to_json
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/schedules_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ def show
@sessions = SessionQuery.new(
relation: current_user.sessions.where(conference: current_conference),
params: filter_params
).call.includes(:attendees, :location, :speakers, :tags).order(:starts_at)
).call.includes(:location, :tags, speakers: [profile: :image_attachment]).order(:starts_at)
end

private
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/sessions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ def index
@sessions = SessionQuery.new(
relation: sessions.joins(:location).distinct,
params: filter_params
).call.includes(:attendees, :tags).order(:starts_at)
).call.includes(:location, :tags, speakers: [profile: :image_attachment]).order(:starts_at)
end

def show
@session = sessions.friendly.find(params[:id])
@session = sessions.friendly.includes(:location, :tags, speakers: [profile: :image_attachment]).find(params[:id])
end

private
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/_bottom_navbar.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<% if unread_notifications.present? %>
<div class="absolute -top-0.5 right-0 w-[18px] h-[18px] rounded-full bg-red flex justify-center items-center">
<span class="text-[11px] text-white font-bold px-1">
<%= unread_notifications.count < 10 ? unread_notifications.count : "+9" %>
<%= unread_notifications.length < 10 ? unread_notifications.length : "+9" %>
</span>
</div>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/schedules/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</a>
</div>
<div class="w-full mx-2 mb-1 border-b"></div>
<div class="mb-1 text-gray-400 text-nowrap"><%= pluralize(sessions.count, "Session") %></div>
<div class="mb-1 text-gray-400 text-nowrap"><%= pluralize(sessions.length, "Session") %></div>
<% end %>
<% sessions.each do |session| %>
<%= render(
Expand Down
4 changes: 2 additions & 2 deletions app/views/sessions/_card.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
:div,
class: [
"flex flex-col ml-2",
"max-w-[200px]": session.speakers.count > 1
"max-w-[200px]": session.speakers.length > 1
]
) do %>
<h2 class="text-sm italic font-black group-hover:text-red group-focus:text-red"><%= speaker.name %></h2>
Expand All @@ -71,7 +71,7 @@
<% end %>

<div class="flex flex-col">
<% if session.tags.exists? %>
<% if session.tags.present? %>
<div class="flex flex-wrap w-full gap-2 mb-3">
<% session.tags.each do |tag| %>
<div class="px-2 py-1 text-xs bg-transparent border rounded-lg border-bluegray-600 text-bluegray-600">
Expand Down
2 changes: 1 addition & 1 deletion app/views/sessions/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</a>
</div>
<div class="w-full mx-2 mb-1 border-b"></div>
<div class="mb-1 text-gray-400 text-nowrap"><%= pluralize(sessions.count, "Session") %></div>
<div class="mb-1 text-gray-400 text-nowrap"><%= pluralize(sessions.length, "Session") %></div>
<% end %>
<% sessions.each do |session| %>
<%= render(
Expand Down
4 changes: 2 additions & 2 deletions app/views/sessions/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<%= content_tag(:div, class: [
"flex flex-col ml-2",
"max-w-[200px]": @session.speakers.count > 1
"max-w-[200px]": @session.speakers.length > 1
] ) do %>
<h2 class="text-sm italic font-black group-hover:text-red group-focus:text-red"><%= speaker.name %></h2>
<p class="text-sm font-normal text-gray-400"><%= speaker.job_title %></p>
Expand Down Expand Up @@ -94,7 +94,7 @@
<div class="flex flex-col items-center w-full p-5 mt-6">
<div class="flex flex-col items-start w-full max-w-screen-sm">
<p class="mb-4 text-2xl italic font-bold text-black">
<%= "About the #{'speaker'.pluralize(@session.speakers.count)}" %>
<%= "About the #{'speaker'.pluralize(@session.speakers.length)}" %>
</p>
<div class="flex flex-col w-full gap-4">
<% @session.speakers.each do |speaker| %>
Expand Down

0 comments on commit c6578fc

Please sign in to comment.