raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Exchange.any_variant to with_any_variant for clarity

Browse Source
This commit is contained in:
Rohan Mitchell
2014-03-13 12:13:12 +11:00
parent affb2a5743
commit 98776caa51
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/exchange.rb
View File

@@ -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)

2
app/models/order_cycle.rb
View File

@@ -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

4
spec/models/exchange_spec.rb
View File

@@ -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