Merge pull request openfoodfoundation#12872 from mkllnk/enterprise-se…

…rialiser Clean up enterprise serialiser for shop page speed
macanudo527 · Sep 23, 2024 · 099da3f · 099da3f
2 parents 7078c4e + 318790d
commit 099da3f
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/app/serializers/api/cached_enterprise_serializer.rb b/app/serializers/api/cached_enterprise_serializer.rb
@@ -95,9 +95,7 @@ def distributed_product_properties
         .merge(Exchange.to_enterprise(enterprise))
         .select('DISTINCT spree_properties.*')
 
-      return properties.merge(OrderCycle.active) if active
-
-      properties
+      properties.merge(OrderCycle.active)
     end
 
     def distributed_producer_properties
@@ -106,16 +104,14 @@ def distributed_producer_properties
       properties = Spree::Property
         .joins(
           producer_properties: {
-            producer: { supplied_products: { variants: { exchanges: :order_cycle } } }
+            producer: { supplied_variants: { exchanges: :order_cycle } }
           }
         )
         .merge(Exchange.outgoing)
         .merge(Exchange.to_enterprise(enterprise))
         .select('DISTINCT spree_properties.*')
 
-      return properties.merge(OrderCycle.active) if active
-
-      properties
+      properties.merge(OrderCycle.active)
     end
 
     def active