Merge pull request #5031 from coalest/fix-n-plus-ones

Fix some N+1s

Author: cielf

app/controllers/adjustments_controller.rb

@@ -12,7 +12,7 @@ def index
                                        .order(created_at: :desc)
                                        .class_filter(filter_params)
                                        .during(helpers.selected_range)
-    @paginated_adjustments = @adjustments.page(params[:page])
+    @paginated_adjustments = @adjustments.includes(:line_items, :storage_location).page(params[:page])
 
     @storage_locations = StorageLocation.with_adjustments_for(current_organization).select(:id, :name)
     @users = current_organization.users

app/controllers/audits_controller.rb

@@ -5,7 +5,7 @@ class AuditsController < ApplicationController
 
   def index
     @selected_location = filter_params[:at_location]
-    @audits = current_organization.audits.class_filter(filter_params)
+    @audits = current_organization.audits.includes(:line_items, :storage_location).class_filter(filter_params)
     @storage_locations = StorageLocation.with_audits_for(current_organization).select(:id, :name)
   end
 

app/controllers/barcode_items_controller.rb

@@ -7,7 +7,7 @@ def index
     @selected_barcodeable_id = filter_params[:barcodeable_id]
     @selected_partner_key = filter_params[:by_item_partner_key]
     @selected_barcode_id = filter_params[:by_value]
-    @barcode_items = current_organization.barcode_items.class_filter(filter_params)
+    @barcode_items = current_organization.barcode_items.includes(:item, :barcodeable).class_filter(filter_params)
     @selected_item = filter_params[:barcodeable_id]
     @selected_partner_key = filter_params[:by_item_partner_key]
 

app/controllers/distributions_controller.rb

@@ -164,7 +164,7 @@ def new
   end
 
   def show
-    @distribution = Distribution.includes(:line_items).includes(:storage_location).find(params[:id])
+    @distribution = Distribution.includes(:storage_location, line_items: :item).find(params[:id])
     @line_items = @distribution.line_items
 
     @total_quantity = @distribution.total_quantity

app/controllers/donations_controller.rb

@@ -84,7 +84,7 @@ def edit
   end
 
   def show
-    @donation = Donation.includes(:line_items).find(params[:id])
+    @donation = Donation.includes(line_items: :item).find(params[:id])
     @line_items = @donation.line_items
   end
 

app/controllers/product_drive_participants_controller.rb

@@ -6,7 +6,7 @@ class ProductDriveParticipantsController < ApplicationController
   # TODO: Should there be a :destroy action for this?
 
   def index
-    @product_drive_participants = current_organization.product_drive_participants.with_volumes.order(:business_name)
+    @product_drive_participants = current_organization.product_drive_participants.includes(:donations).with_volumes.order(:business_name)
 
     respond_to do |format|
       format.html

app/controllers/purchases_controller.rb

@@ -67,7 +67,7 @@ def edit
   end
 
   def show
-    @purchase = current_organization.purchases.includes(:line_items).find(params[:id])
+    @purchase = current_organization.purchases.includes(line_items: :item).find(params[:id])
     @line_items = @purchase.line_items
   end
 

app/views/adjustments/index.html.erb

@@ -93,7 +93,7 @@
                   <td><%= adjustment.organization.name %></td>
                   <td><%= adjustment.storage_location.name %></td>
                   <td><%= adjustment.comment %></td>
-                  <td><%= pluralize(adjustment.line_items.count, 'change') %></td>
+                  <td><%= pluralize(adjustment.line_items.size, 'change') %></td>
                   <td class="text-right"><%= view_button_to adjustment %></td>
                 </tr>
               <% end %>