raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

EnterpriseSerialiser shows current properties for open shops and all properties for closed shops

Browse Source
This commit is contained in:
Rohan Mitchell
2016-09-09 14:45:11 +10:00
parent f98b25b719
commit 306bd25dd9
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/serializers/api/enterprise_serializer.rb
View File

@@ -42,9 +42,17 @@ class Api::UncachedEnterpriseSerializer < ActiveModel::Serializer
def distributed_properties
# This results in 3 queries per enterprise
product_properties = Spree::Property.currently_sold_by(object)
ids = ProducerProperty.currently_sold_by(object).pluck(:property_id)
producer_properties = Spree::Property.where(id: ids)
if active
product_properties = Spree::Property.currently_sold_by(object)
producer_property_ids = ProducerProperty.currently_sold_by(object).pluck(:property_id)
else
product_properties = Spree::Property.ever_sold_by(object)
producer_property_ids = ProducerProperty.ever_sold_by(object).pluck(:property_id)
end
producer_properties = Spree::Property.where(id: producer_property_ids)
OpenFoodNetwork::PropertyMerge.merge product_properties, producer_properties
end