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

Improve permissions query building

Browse Source 
For larger queries and especially where filtering and paginating, these simpler product queries are way more efficient. It cuts out some very large subqueries with large lists of product ids.
This commit is contained in:
Matt-Yorkley
2022-04-05 21:35:53 +01:00
parent c4fc8e9396
commit eef59bbaae
2 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/open_food_network/permissions.rb
View File

@@ -60,21 +60,23 @@ module OpenFoodNetwork
end
def editable_products
permitted_enterprise_products_ids = product_ids_supplied_by(
related_enterprises_granting(:manage_products)
)
Spree::Product.where(
id: managed_enterprise_products.select(:id) | permitted_enterprise_products_ids
return Spree::Product.all if admin?
Spree::Product.where(supplier_id: @user.enterprises).or(
Spree::Product.where(supplier_id: related_enterprises_granting(:manage_products))
)
end
def visible_products
permitted_enterprise_products_ids = product_ids_supplied_by(
related_enterprises_granting(:manage_products) |
related_enterprises_granting(:add_to_order_cycle)
)
return Spree::Product.all if admin?
Spree::Product.where(
id: managed_enterprise_products.select(:id) | permitted_enterprise_products_ids
supplier_id: @user.enterprises
).or(
Spree::Product.where(
supplier_id: related_enterprises_granting(:manage_products) |
related_enterprises_granting(:add_to_order_cycle)
)
)
end