raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-10 23:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

EnterpriseRelationship.relatives does not show duplicates

Browse Source
This commit is contained in:
Rohan Mitchell
2015-05-29 12:19:38 +10:00
parent 69c54e1d70
commit 3f4f8afacd
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/enterprise_relationship.rb
View File

@@ -33,8 +33,8 @@ class EnterpriseRelationship < ActiveRecord::Base
relatives = {}
relationships.each do |r|
relatives[r.parent_id] ||= {distributors: [], producers: []}
relatives[r.child_id] ||= {distributors: [], producers: []}
relatives[r.parent_id] ||= {distributors: Set.new, producers: Set.new}
relatives[r.child_id] ||= {distributors: Set.new, producers: Set.new}
if !activated_only || r.child.activated?
relatives[r.parent_id][:producers] << r.child_id if r.child.is_primary_producer

12
spec/models/enterprise_relationship_spec.rb
View File

@@ -74,21 +74,27 @@ describe EnterpriseRelationship do
let(:e1) { create(:supplier_enterprise) }
let(:e2) { create(:supplier_enterprise, sells: 'any') }
let!(:er) { create(:enterprise_relationship, parent: e1, child: e2) }
let(:er_reverse) { create(:enterprise_relationship, parent: e2, child: e1) }
it "categorises enterprises into distributors and producers" do
EnterpriseRelationship.relatives.should ==
{e1.id => {distributors: [e2.id], producers: [e2.id]},
e2.id => {distributors: [], producers: [e1.id]}}
{e1.id => {distributors: Set.new([e2.id]), producers: Set.new([e2.id])},
e2.id => {distributors: Set.new([]), producers: Set.new([e1.id])}}
end
it "finds inactive enterprises by default" do
e1.update_attribute :confirmed_at, nil
EnterpriseRelationship.relatives[e2.id][:producers].should == [e1.id]
EnterpriseRelationship.relatives[e2.id][:producers].should == Set.new([e1.id])
end
it "does not find inactive enterprises when requested" do
e1.update_attribute :confirmed_at, nil
EnterpriseRelationship.relatives(true)[e2.id][:producers].should be_empty
end
it "does not show duplicates" do
er_reverse
EnterpriseRelationship.relatives[e2.id][:producers].should == Set.new([e1.id])
end
end
end