From d478cc1f69a1ed7d4436ef5e323acaec5de5d39c Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 29 May 2015 14:03:44 +1000
Subject: [PATCH] Serialize taxons and relatives in expected format

---
 app/serializers/api/enterprise_serializer.rb  | 16 ++++++++----
 .../serializers/enterprise_serializer_spec.rb | 25 +++++++++++++------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/app/serializers/api/enterprise_serializer.rb b/app/serializers/api/enterprise_serializer.rb
index fc843a5138..44364c4dbc 100644
--- a/app/serializers/api/enterprise_serializer.rb
+++ b/app/serializers/api/enterprise_serializer.rb
@@ -3,7 +3,6 @@ class Api::EnterpriseSerializer < ActiveModel::Serializer
   Api::IdSerializer
 
   def serializable_hash
-
     cached_serializer_hash.merge uncached_serializer_hash
   end
 
@@ -51,11 +50,11 @@ class Api::CachedEnterpriseSerializer < ActiveModel::Serializer
 
 
   def taxons
-    options[:data].distributed_taxons[object.id]
+    ids_to_objs options[:data].distributed_taxons[object.id]
   end
 
   def supplied_taxons
-    options[:data].supplied_taxons[object.id]
+    ids_to_objs options[:data].supplied_taxons[object.id]
   end
 
   def pickup
@@ -90,12 +89,12 @@ class Api::CachedEnterpriseSerializer < ActiveModel::Serializer
 
   def producers
     relatives = options[:data].relatives[object.id]
-    relatives ? relatives[:producers] : []
+    relatives ? ids_to_objs(relatives[:producers]) : []
   end
 
   def hubs
     relatives = options[:data].relatives[object.id]
-    relatives ? relatives[:distributors] : []
+    relatives ? ids_to_objs(relatives[:distributors]) : []
   end
 
   # Map svg icons.
@@ -135,4 +134,11 @@ class Api::CachedEnterpriseSerializer < ActiveModel::Serializer
     }
     icon_fonts[object.category]
   end
+
+
+  private
+
+  def ids_to_objs(ids)
+    ids.andand.map { |id| {id: id} }
+  end
 end
diff --git a/spec/serializers/enterprise_serializer_spec.rb b/spec/serializers/enterprise_serializer_spec.rb
index 7c467d9c3d..f70852d973 100644
--- a/spec/serializers/enterprise_serializer_spec.rb
+++ b/spec/serializers/enterprise_serializer_spec.rb
@@ -1,20 +1,31 @@
 #require 'spec_helper'
 
 describe Api::EnterpriseSerializer do
+  let(:serializer) { Api::EnterpriseSerializer.new enterprise, data: data }
   let(:enterprise) { create(:distributor_enterprise) }
   let(:taxon) { create(:taxon) }
-  let(:data_class) { Struct.new(:earliest_closing_times, :active_distributors,
-                                :distributed_taxons, :supplied_taxons,
-                                :shipping_method_services, :relatives) }
-  let(:data) { data_class.new({}, [], {}, {}, {}, {producers: [], distributors: []}) }
+  let(:data) { OpenStruct.new(earliest_closing_times: {},
+                              active_distributors: [],
+                              distributed_taxons: {enterprise.id => [123]},
+                              supplied_taxons: {enterprise.id => [456]},
+                              shipping_method_services: {},
+                              relatives: {enterprise.id => {producers: [123], distributors: [456]}}) }
 
   it "serializes an enterprise" do
-    serializer = Api::EnterpriseSerializer.new enterprise, data: data
     serializer.to_json.should match enterprise.name
   end
 
-  it "will render urls" do
-    serializer = Api::EnterpriseSerializer.new enterprise, data: data
+  it "serializes taxons as ids only" do
+    serializer.serializable_hash[:taxons].should == [{id: 123}]
+    serializer.serializable_hash[:supplied_taxons].should == [{id: 456}]
+  end
+
+  it "serializes producers and hubs as ids only" do
+    serializer.serializable_hash[:producers].should == [{id: 123}]
+    serializer.serializable_hash[:hubs].should == [{id: 456}]
+  end
+
+  it "serializes icons" do
     serializer.to_json.should match "map_005-hub.svg"
   end
 end