From d93fe3cf2cffabbb1e35934a3990bde2d64089ba Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 28 Oct 2016 16:34:01 +1100
Subject: [PATCH] Cache enterprise supplied and distributed taxons

---
 app/serializers/api/enterprise_serializer.rb | 31 ++++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/serializers/api/enterprise_serializer.rb b/app/serializers/api/enterprise_serializer.rb
index 3537bcdd24..c7b45937f6 100644
--- a/app/serializers/api/enterprise_serializer.rb
+++ b/app/serializers/api/enterprise_serializer.rb
@@ -23,7 +23,6 @@ class Api::UncachedEnterpriseSerializer < ActiveModel::Serializer
   include SerializerHelper
 
   attributes :orders_close_at, :active
-  attributes :taxons, :supplied_taxons
   has_many :supplied_properties, serializer: Api::PropertySerializer
   has_many :distributed_properties, serializer: Api::PropertySerializer
 
@@ -59,18 +58,6 @@ class Api::UncachedEnterpriseSerializer < ActiveModel::Serializer
 
     OpenFoodNetwork::PropertyMerge.merge product_properties, producer_properties
   end
-
-  def taxons
-    if active
-      ids_to_objs options[:data].current_distributed_taxons[object.id]
-    else
-      ids_to_objs options[:data].all_distributed_taxons[object.id]
-    end
-  end
-
-  def supplied_taxons
-    ids_to_objs options[:data].supplied_taxons[object.id]
-  end
 end
 
 class Api::CachedEnterpriseSerializer < ActiveModel::Serializer
@@ -90,6 +77,8 @@ class Api::CachedEnterpriseSerializer < ActiveModel::Serializer
     :email_address, :hash, :logo, :promo_image, :path, :pickup, :delivery,
     :icon, :icon_font, :producer_icon_font, :category, :producers, :hubs
 
+  attributes :taxons, :supplied_taxons
+
   has_one :address, serializer: Api::AddressSerializer
 
   def pickup
@@ -132,6 +121,22 @@ class Api::CachedEnterpriseSerializer < ActiveModel::Serializer
     ids_to_objs(relatives.andand[:distributors])
   end
 
+  def taxons
+    if active
+      ids_to_objs options[:data].current_distributed_taxons[object.id]
+    else
+      ids_to_objs options[:data].all_distributed_taxons[object.id]
+    end
+  end
+
+  def supplied_taxons
+    ids_to_objs options[:data].supplied_taxons[object.id]
+  end
+
+  def active
+    options[:data].active_distributors.andand.include? object
+  end
+
   # Map svg icons.
   def icon
     icons = {