From f57e8513d564926ae87a3b0d034fbf7ba506388f Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Thu, 10 Jul 2014 12:46:25 +1000 Subject: [PATCH] Spiking out products serializers and caching --- app/controllers/shop_controller.rb | 4 ++++ .../api/master_variant_serializer.rb | 4 ++++ app/serializers/api/product_serializer.rb | 22 +++++++++++++++++++ app/serializers/api/property_serializer.rb | 3 +++ app/serializers/api/taxon_image_serializer.rb | 11 ++++++++++ app/serializers/api/variant_serializer.rb | 8 +++++++ 6 files changed, 52 insertions(+) create mode 100644 app/serializers/api/master_variant_serializer.rb create mode 100644 app/serializers/api/product_serializer.rb create mode 100644 app/serializers/api/property_serializer.rb create mode 100644 app/serializers/api/taxon_image_serializer.rb create mode 100644 app/serializers/api/variant_serializer.rb diff --git a/app/controllers/shop_controller.rb b/app/controllers/shop_controller.rb index b3e338e645..2398a50840 100644 --- a/app/controllers/shop_controller.rb +++ b/app/controllers/shop_controller.rb @@ -8,12 +8,16 @@ class ShopController < BaseController end def products + # Can we make this query less slow? unless @products = current_order_cycle.andand .valid_products_distributed_by(current_distributor).andand .select { |p| !p.deleted? && p.has_stock_for_distribution?(current_order_cycle, current_distributor) }.andand .sort_by {|p| p.name } render json: "", status: 404 end + render status: 200, + json: ActiveModel::ArraySerializer.new(@products, each_serializer: Api::ProductSerializer, + current_order_cycle: current_order_cycle, current_distributor: current_distributor).to_json end def order_cycle diff --git a/app/serializers/api/master_variant_serializer.rb b/app/serializers/api/master_variant_serializer.rb new file mode 100644 index 0000000000..8012e8f055 --- /dev/null +++ b/app/serializers/api/master_variant_serializer.rb @@ -0,0 +1,4 @@ +class Api::MasterVariantSerializer < ActiveModel::Serializer + attributes :id, :is_master, :count_on_hand, :name_to_display, :unit_to_display, :count_on_hand, :on_demand + has_many :images, serializer: Api::TaxonImageSerializer +end diff --git a/app/serializers/api/product_serializer.rb b/app/serializers/api/product_serializer.rb new file mode 100644 index 0000000000..f079480fff --- /dev/null +++ b/app/serializers/api/product_serializer.rb @@ -0,0 +1,22 @@ +class Api::ProductSerializer < ActiveModel::Serializer + # TODO + # Prices can't be cached? How? + + cached + delegate :cache_key, to: :object + + attributes :id, :name, :permalink, :count_on_hand, :on_demand, :group_buy, + :notes, :description, :price + + has_many :variants, serializer: Api::VariantSerializer + has_many :taxons, serializer: Api::IdSerializer + has_many :properties, serializer: Api::PropertySerializer + + has_one :supplier, serializer: Api::IdSerializer + has_one :primary_taxon, serializer: Api::TaxonSerializer + has_one :master, serializer: Api::MasterVariantSerializer + + def price + object.master.price_with_fees(options[:current_distributor], options[:current_order_cycle]) + end +end diff --git a/app/serializers/api/property_serializer.rb b/app/serializers/api/property_serializer.rb new file mode 100644 index 0000000000..ce04480d30 --- /dev/null +++ b/app/serializers/api/property_serializer.rb @@ -0,0 +1,3 @@ +class Api::PropertySerializer < ActiveModel::Serializer + +end diff --git a/app/serializers/api/taxon_image_serializer.rb b/app/serializers/api/taxon_image_serializer.rb new file mode 100644 index 0000000000..bc920637cd --- /dev/null +++ b/app/serializers/api/taxon_image_serializer.rb @@ -0,0 +1,11 @@ +class Api::TaxonImageSerializer < ActiveModel::Serializer + attributes :id, :alt, :small_url, :large_url + + def small_url + object.attachment.url(:small, false) + end + + def large_url + object.attachment.url(:large, false) + end +end diff --git a/app/serializers/api/variant_serializer.rb b/app/serializers/api/variant_serializer.rb new file mode 100644 index 0000000000..20728fb935 --- /dev/null +++ b/app/serializers/api/variant_serializer.rb @@ -0,0 +1,8 @@ +class Api::VariantSerializer < ActiveModel::Serializer + attributes :id, :is_master, :count_on_hand, :name_to_display, :unit_to_display, :on_demand, :price + has_many :images, serializer: Api::TaxonImageSerializer + + def price + 0.0 + end +end