From 146797ea613eea7b884be3ea307fe3f21c6f33d2 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 5 Feb 2016 09:37:10 +1100 Subject: [PATCH] Generalise method for reuse --- lib/open_food_network/products_cache.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/open_food_network/products_cache.rb b/lib/open_food_network/products_cache.rb index d01bcf86e3..b1d63c0b9a 100644 --- a/lib/open_food_network/products_cache.rb +++ b/lib/open_food_network/products_cache.rb @@ -76,7 +76,7 @@ module OpenFoodNetwork def self.refresh_supplier_fee(enterprise_fee) outgoing_exchanges = Set.new - incoming_exchanges_for_enterprise_fee(enterprise_fee).each do |exchange| + incoming_exchanges(enterprise_fee.exchanges).each do |exchange| outgoing_exchanges.merge outgoing_exchanges_with_variants(exchange.order_cycle, exchange.variant_ids) end @@ -106,8 +106,9 @@ module OpenFoodNetwork end - def self.incoming_exchanges_for_enterprise_fee(enterprise_fee) - enterprise_fee.exchanges.incoming. + def self.incoming_exchanges(exchanges) + exchanges. + incoming. joins(:order_cycle). merge(OrderCycle.dated). merge(OrderCycle.not_closed)