From 51177b833e1e2f4e9abb2cbdecbe46730cd68e36 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Fri, 29 Nov 2019 17:09:12 +0100
Subject: [PATCH] Remove customer_code N+1 from packing reports

---
 lib/open_food_network/packing_report.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/open_food_network/packing_report.rb b/lib/open_food_network/packing_report.rb
index 3f5e420626..82cb79d4de 100644
--- a/lib/open_food_network/packing_report.rb
+++ b/lib/open_food_network/packing_report.rb
@@ -95,7 +95,7 @@ module OpenFoodNetwork
     def columns
       if is_by_customer?
         [proc { |line_items| line_items.first.order.distributor.name },
-         proc { |line_items| customer_code(line_items.first.order.email) },
+         proc { |line_items| customer_code(line_items.first.order) },
          proc { |line_items| line_items.first.order.bill_address.firstname },
          proc { |line_items| line_items.first.order.bill_address.lastname },
          proc { |line_items| line_items.first.product.supplier.name },
@@ -107,7 +107,7 @@ module OpenFoodNetwork
         [
           proc { |line_items| line_items.first.order.distributor.name },
           proc { |line_items| line_items.first.product.supplier.name },
-          proc { |line_items| customer_code(line_items.first.order.email) },
+          proc { |line_items| customer_code(line_items.first.order) },
           proc { |line_items| line_items.first.order.bill_address.firstname },
           proc { |line_items| line_items.first.order.bill_address.lastname },
           proc { |line_items| line_items.first.product.name },
@@ -125,7 +125,7 @@ module OpenFoodNetwork
     end
 
     def line_item_includes
-      [{ order: [:bill_address, :distributor],
+      [{ order: [:bill_address, :distributor, :customer],
          variant: [{ option_values: :option_type }, { product: :supplier }] }]
     end
 
@@ -146,8 +146,8 @@ module OpenFoodNetwork
       params[:report_type] == "pack_by_customer"
     end
 
-    def customer_code(email)
-      customer = Customer.where(email: email).first
+    def customer_code(order)
+      customer = order.customer
       customer.nil? ? "" : customer.code
     end
   end