raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-03 02:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing bug on OC interface that prevented hubs from pulling their own products through

Browse Source
This commit is contained in:
Rob Harrington
2015-05-14 13:04:16 +10:00
parent 359328a96e
commit 3855ae1337
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/open_food_network/order_cycle_permissions.rb
View File

@@ -128,6 +128,8 @@ module OpenFoodNetwork
producers = related_enterprises_granting(:add_to_order_cycle, to: [hub], scope: Enterprise.is_primary_producer)
permitted_variants = Spree::Variant.joins(:product).where('spree_products.supplier_id IN (?)', producers)
hub_variants = Spree::Variant.joins(:product).where('spree_products.supplier_id = (?)', hub)
# PLUS any variants that are already in an outgoing exchange of this hub, so things don't break
# TODO: Remove this when all P-OC are sorted out
active_variants = []
@@ -135,7 +137,7 @@ module OpenFoodNetwork
active_variants = exchange.variants
end
Spree::Variant.where(id: coordinator_variants | permitted_variants | active_variants)
Spree::Variant.where(id: coordinator_variants | hub_variants | permitted_variants | active_variants)
else
# Any variants produced by MY PRODUCERS that are in this order cycle, where my producer has granted P-OC to the hub
producers = related_enterprises_granting(:add_to_order_cycle, to: [hub], scope: managed_participating_producers)
@@ -165,6 +167,8 @@ module OpenFoodNetwork
producers = related_enterprises_granting(:add_to_order_cycle, to: [hub], scope: Enterprise.is_primary_producer)
permitted_variants = Spree::Variant.joins(:product).where('spree_products.supplier_id IN (?)', producers)
hub_variants = Spree::Variant.joins(:product).where('spree_products.supplier_id = (?)', hub)
# PLUS any variants that are already in an outgoing exchange of this hub, so things don't break
# TODO: Remove this when all P-OC are sorted out
active_variants = []
@@ -172,7 +176,7 @@ module OpenFoodNetwork
active_variants = exchange.variants
end
Spree::Variant.where(id: coordinator_variants | permitted_variants | active_variants)
Spree::Variant.where(id: coordinator_variants | hub_variants | permitted_variants | active_variants)
else
# Any of my managed producers in this order cycle granted P-OC by the hub
granted_producers = related_enterprises_granted(:add_to_order_cycle, by: [hub], scope: managed_participating_producers)

20
spec/lib/open_food_network/order_cycle_permissions_spec.rb
View File

@@ -545,6 +545,16 @@ module OpenFoodNetwork
expect(visible).to_not include v2
end
context "where the hub produces products" do
# NOTE: No relationship to self required
let!(:v3) { create(:variant, product: create(:simple_product, supplier: hub)) }
it "returns any variants produced by the hub" do
visible = permissions.visible_variants_for_outgoing_exchanges_to(hub)
expect(visible).to include v3
end
end
# TODO: for backwards compatability, remove later
context "when an exchange exists between the coordinator and the hub within this order cycle" do
let!(:ex) { create(:exchange, order_cycle: oc, sender: coordinator, receiver: hub, incoming: false) }
@@ -712,6 +722,16 @@ module OpenFoodNetwork
expect(visible).to_not include v2
end
context "where the hub produces products" do
# NOTE: No relationship to self required
let!(:v3) { create(:variant, product: create(:simple_product, supplier: hub)) }
it "returns any variants produced by the hub" do
visible = permissions.visible_variants_for_outgoing_exchanges_to(hub)
expect(visible).to include v3
end
end
# TODO: for backwards compatability, remove later
context "when an exchange exists between the coordinator and the hub within this order cycle" do
let!(:ex) { create(:exchange, order_cycle: oc, sender: coordinator, receiver: hub, incoming: false) }