From 98776caa5199af1457f8d9e71a7c92c1c4e917a8 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Thu, 13 Mar 2014 12:13:12 +1100 Subject: [PATCH] Rename Exchange.any_variant to with_any_variant for clarity --- app/models/exchange.rb | 2 +- app/models/order_cycle.rb | 2 +- spec/models/exchange_spec.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/exchange.rb b/app/models/exchange.rb index 484afc77de..66a5894c1e 100644 --- a/app/models/exchange.rb +++ b/app/models/exchange.rb @@ -20,7 +20,7 @@ class Exchange < ActiveRecord::Base scope :from_enterprises, lambda { |enterprises| where('exchanges.sender_id IN (?)', enterprises) } scope :to_enterprises, lambda { |enterprises| where('exchanges.receiver_id IN (?)', enterprises) } scope :with_variant, lambda { |variant| joins(:exchange_variants).where('exchange_variants.variant_id = ?', variant) } - scope :any_variant, lambda { |variants| joins(:exchange_variants).where('exchange_variants.variant_id IN (?)', variants).select('DISTINCT exchanges.*') } + scope :with_any_variant, lambda { |variants| joins(:exchange_variants).where('exchange_variants.variant_id IN (?)', variants).select('DISTINCT exchanges.*') } scope :with_product, lambda { |product| joins(:exchange_variants).where('exchange_variants.variant_id IN (?)', product.variants_including_master) } def clone!(new_order_cycle) diff --git a/app/models/order_cycle.rb b/app/models/order_cycle.rb index f934a4d632..3d126b5cd7 100644 --- a/app/models/order_cycle.rb +++ b/app/models/order_cycle.rb @@ -220,6 +220,6 @@ class OrderCycle < ActiveRecord::Base def exchanges_supplying(order) variants = order.line_items.map(&:variant) - exchanges.to_enterprises([coordinator, order.distributor]).any_variant(variants) + exchanges.to_enterprises([coordinator, order.distributor]).with_any_variant(variants) end end diff --git a/spec/models/exchange_spec.rb b/spec/models/exchange_spec.rb index 4562cdda05..675f7d475a 100644 --- a/spec/models/exchange_spec.rb +++ b/spec/models/exchange_spec.rb @@ -111,7 +111,7 @@ describe Exchange do Exchange.with_variant(v).should == [ex] end - it "finds exchanges with any of a number of variants" do + it "finds exchanges with any of a number of variants, without returning duplicates" do v1 = create(:variant) v2 = create(:variant) v3 = create(:variant) @@ -119,7 +119,7 @@ describe Exchange do ex.variants << v1 ex.variants << v2 - Exchange.any_variant([v1, v2, v3]).should == [ex] + Exchange.with_any_variant([v1, v2, v3]).should == [ex] end it "finds exchanges with a particular product's master variant" do