Fix N plus ones for partners (#4952)

* Fix N plus ones for partners

* Fix profile show N+1

Author: coalest

app/controllers/partners/dashboards_controller.rb

@@ -11,14 +11,17 @@ def show
       @partner_requests = @partner.requests.order(created_at: :desc).limit(10)
       @upcoming_distributions = @partner.distributions.order(issued_at: :desc)
                                         .where(issued_at: Time.zone.today..)
-      @distributions = @partner.distributions.order(issued_at: :desc)
+      @distributions = @partner.distributions
+                               .includes(line_items: :item)
+                               .order(issued_at: :desc)
                                .where(issued_at: ...Time.zone.today)
                                .limit(5)
 
       @parent_org = Organization.find(@partner.organization_id)
 
       @requests_in_progress = @parent_org
                               .ordered_requests
+                              .includes(item_requests: :item)
                               .where(partner: @partner.id)
                               .where(status: 0)
 

app/controllers/partners/distributions_controller.rb

@@ -7,7 +7,7 @@ class DistributionsController < BaseController
 
     def index
       @partner = current_partner
-      @distributions = @partner.distributions.order(issued_at: :desc)
+      @distributions = @partner.distributions.includes(:items).order(issued_at: :desc)
 
       @parent_org = Organization.find(@partner.organization_id)
     end

app/controllers/partners/profiles_controller.rb

@@ -1,6 +1,8 @@
 module Partners
   class ProfilesController < BaseController
-    def show; end
+    def show
+      @profile = Partners::Profile.includes(:counties).find_by(partner_id: current_partner.id)
+    end
 
     def edit
       @counties = County.in_category_name_order

app/controllers/partners/requests_controller.rb

@@ -4,7 +4,7 @@ class RequestsController < BaseController
 
     def index
       @partner = current_partner
-      @partner_requests = @partner.requests.order(created_at: :desc).limit(10)
+      @partner_requests = @partner.requests.includes(:item_requests).order(created_at: :desc).limit(10)
     end
 
     def new

app/views/partners/profiles/show.html.erb

@@ -29,15 +29,15 @@
       <div class="container-fluid">
         <div class="row">
           <div class="col-6">
-            <%= render partial: "partners/profiles/show/agency_information", locals: { profile: current_partner.profile } %>
+            <%= render partial: "partners/profiles/show/agency_information", locals: { profile: @profile } %>
           </div>
           <% current_partner.partials_to_show.each do |partial| %>
             <div class="col-6">
-              <%= render partial: "partners/profiles/show/#{partial}", locals: { profile: current_partner.profile } %>
+              <%= render partial: "partners/profiles/show/#{partial}", locals: { profile: @profile } %>
             </div>
           <% end %>
           <div class="col-6">
-            <%= render partial: "partners/profiles/show/partner_settings", locals: { profile: current_partner.profile } %>
+            <%= render partial: "partners/profiles/show/partner_settings", locals: { profile: @profile } %>
           </div>
         </div>
       </div>

app/views/partners/profiles/show/_area_served.html.erb

@@ -5,9 +5,8 @@
     <table>
       <th class="county-heading">County</th><th class="county-heading percent">% of Clients in county</th>
 
-      <% served_area_col = Partners::ServedArea.where(partner_profile: profile) %>
-      <% if served_area_col.any? %>
-        <%= render partial: "partners/profiles/show/served_area_row", collection: served_area_col %>
+      <% if profile.served_areas.load.any? %>
+        <%= render partial: "partners/profiles/show/served_area_row", collection: profile.served_areas %>
       <% else %>
         <tr><td class="county-name"><%= "No County Specified" %></td><td class="client-share percent">100 %</td></tr>
       <% end %>