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

Memoize more repeated queries in #managed_enterprises

Browse Source
This commit is contained in:
Matt-Yorkley
2019-08-09 09:58:09 +01:00
committed by luisramos0
parent e73f2d682c
commit 77105e265e
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/open_food_network/order_cycle_permissions.rb
View File

@@ -14,7 +14,7 @@ module OpenFoodNetwork
def visible_enterprises
return Enterprise.where("1=0") if @coordinator.blank?
if managed_enterprises.include? @coordinator
if managed_enterprise_ids.include? @coordinator.id
coordinator_permitted_ids = [@coordinator]
all_active_ids = []
@@ -76,9 +76,7 @@ module OpenFoodNetwork
# TODO: Remove this when all P-OC are sorted out
# Hubs that currently have outgoing exchanges distributing variants of producers I manage
variants = variants_from_suppliers(
managed_enterprises.is_primary_producer.select("enterprises.id")
)
variants = variants_from_suppliers(managed_producer_ids)
active_exchanges = @order_cycle.
exchanges.outgoing.with_any_variant(variants.select("spree_variants.id"))
@@ -186,7 +184,7 @@ module OpenFoodNetwork
AND spree_products.supplier_id IN (?)
AND incoming = 'f'",
hub.id,
managed_enterprises.is_primary_producer.select("enterprises.id"))
managed_producer_ids)
Spree::Variant.where(id: permitted_variants | active_variants)
end
@@ -253,6 +251,10 @@ module OpenFoodNetwork
@managed_enterprise_ids ||= managed_enterprises.pluck(:id)
end
def managed_producer_ids
@managed_producer_ids ||= managed_enterprises.is_primary_producer.pluck(:id)
end
def managed_participating_enterprises
return @managed_participating_enterprises unless @managed_participating_enterprises.nil?
@@ -274,7 +276,7 @@ module OpenFoodNetwork
def order_cycle_exchange_ids_involving_my_enterprises
# Any exchanges that my managed enterprises are involved in directly
@order_cycle.exchanges.involving(managed_enterprises.select("enterprises.id")).pluck :id
@order_cycle.exchanges.involving(managed_enterprise_ids).pluck :id
end
def order_cycle_exchange_ids_with_distributable_variants