From 42d04b658146deafee132773b9df45d17144da60 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sat, 15 Jul 2023 17:31:39 +0100
Subject: [PATCH] Update OrderAvailableShippingMethods service

---
 app/services/order_available_shipping_methods.rb       | 6 ++----
 spec/services/order_available_shipping_methods_spec.rb | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/services/order_available_shipping_methods.rb b/app/services/order_available_shipping_methods.rb
index 95603f9a68..9b4bcf76ba 100644
--- a/app/services/order_available_shipping_methods.rb
+++ b/app/services/order_available_shipping_methods.rb
@@ -3,9 +3,7 @@
 class OrderAvailableShippingMethods
   attr_reader :order, :customer
 
-  delegate :distributor,
-           :order_cycle,
-           to: :order
+  delegate :distributor, :order_cycle, to: :order
 
   def initialize(order, customer = nil)
     @order, @customer = order, customer
@@ -23,7 +21,7 @@ class OrderAvailableShippingMethods
     return methods unless OpenFoodNetwork::FeatureToggle.enabled?(:match_shipping_categories,
                                                                   distributor&.owner)
 
-    required_category_ids = order.products.pluck(:shipping_category_id).to_set
+    required_category_ids = order.variants.pluck(:shipping_category_id).to_set
     return methods if required_category_ids.empty?
 
     methods.select do |method|
diff --git a/spec/services/order_available_shipping_methods_spec.rb b/spec/services/order_available_shipping_methods_spec.rb
index 315f2397c4..16104614f9 100644
--- a/spec/services/order_available_shipping_methods_spec.rb
+++ b/spec/services/order_available_shipping_methods_spec.rb
@@ -217,9 +217,7 @@ describe OrderAvailableShippingMethods do
 
   context "when certain shipping categories are required" do
     subject { OrderAvailableShippingMethods.new(order) }
-    let(:order) {
-      build(:order, distributor: distributor, order_cycle: oc)
-    }
+    let(:order) { build(:order, distributor: distributor, order_cycle: oc) }
     let(:oc) { create(:order_cycle) }
     let(:distributor) { oc.distributors.first }
     let(:standard_shipping) {
@@ -249,7 +247,7 @@ describe OrderAvailableShippingMethods do
 
     it "filters shipping methods for products needing refrigeration" do
       product = oc.products.first
-      product.update!(shipping_category: refrigerated)
+      product.variants.first.update!(shipping_category: refrigerated)
       order.line_items << build(:line_item, variant: product.variants.first)
       expect(subject.to_a).to eq [cooled_shipping]
     end