spree_api 4.2.4 → 4.3.0.rc3

data/app/controllers/spree/api/v2/storefront/cart_controller.rb

@@ -50,11 +50,25 @@ module Spree
           def empty
             spree_authorize! :update, spree_current_order, order_token
 
-            # TODO: we should extract this logic into service and let
-            # developers overwrite it
-            spree_current_order.empty!
+            result = empty_cart_service.call(order: spree_current_order)
 
-            render_serialized_payload { serialized_current_order }
+            if result.success?
+              render_serialized_payload { serialized_current_order }
+            else
+              render_error_payload(result.error)
+            end
+          end
+
+          def destroy
+            spree_authorize! :update, spree_current_order, order_token
+
+            result = destroy_cart_service.call(order: spree_current_order)
+
+            if result.success?
+              head 204
+            else
+              render_error_payload(result.error)
+            end
           end
 
           def set_quantity
@@ -128,6 +142,14 @@ module Spree
             Spree::Api::Dependencies.storefront_cart_add_item_service.constantize
           end
 
+          def empty_cart_service
+            Spree::Api::Dependencies.storefront_cart_empty_service.constantize
+          end
+
+          def destroy_cart_service
+            Spree::Api::Dependencies.storefront_cart_destroy_service.constantize
+          end
+
           def set_item_quantity_service
             Spree::Api::Dependencies.storefront_cart_set_item_quantity_service.constantize
           end
@@ -149,7 +171,7 @@ module Spree
           end
 
           def load_variant
-            @variant = Spree::Variant.find(params[:variant_id])
+            @variant = current_store.variants.find(params[:variant_id])
           end
 
           def render_error_item_quantity
@@ -163,7 +185,7 @@ module Spree
           def serialize_estimated_shipping_rates(shipping_rates)
             estimate_shipping_rates_serializer.new(
               shipping_rates,
-              params: { currency: spree_current_order.currency }
+              params: serializer_params
             ).serializable_hash
           end
 

data/app/controllers/spree/api/v2/storefront/checkout_controller.rb

@@ -119,12 +119,13 @@ module Spree
           end
 
           def serialize_payment_methods(payment_methods)
-            payment_methods_serializer.new(payment_methods).serializable_hash
+            payment_methods_serializer.new(payment_methods, params: serializer_params).serializable_hash
           end
 
           def serialize_shipping_rates(shipments)
             shipping_rates_serializer.new(
               shipments,
+              params: serializer_params,
               include: [:shipping_rates, :stock_location]
             ).serializable_hash
           end

data/app/controllers/spree/api/v2/storefront/cms_pages_controller.rb

@@ -0,0 +1,41 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class CmsPagesController < ::Spree::Api::V2::ResourceController
+          private
+
+          def model_class
+            Spree::CmsPage
+          end
+
+          def resource
+            @resource ||= scope.find_by(slug: params[:id]) || scope.find(params[:id])
+          end
+
+          def resource_serializer
+            Spree::Api::Dependencies.storefront_cms_page_serializer.constantize
+          end
+
+          def collection_serializer
+            Spree::Api::Dependencies.storefront_cms_page_serializer.constantize
+          end
+
+          def collection_finder
+            Spree::Api::Dependencies.storefront_cms_page_finder.constantize
+          end
+
+          def scope
+            super.by_locale(I18n.locale)
+          end
+
+          def scope_includes
+            {
+              cms_sections: :linked_resource
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/storefront/countries_controller.rb

@@ -3,30 +3,27 @@ module Spree
     module V2
       module Storefront
         class CountriesController < ::Spree::Api::V2::ResourceController
+          before_action :set_default_per_page
+
           private
 
           def serialize_collection(collection)
-            collection_serializer.new(collection).serializable_hash
+            collection_serializer.new(
+              collection,
+              collection_options(collection).merge(params: collection_serializer_params)
+            ).serializable_hash
           end
 
-          def serialize_resource(resource)
-            resource_serializer.new(
-              resource,
-              include: resource_includes,
-              fields: sparse_fields,
-              params: resource_serializer_params
-            ).serializable_hash
+          def serializer_params
+            super.merge(include_states: true)
           end
 
-          def resource_serializer_params
-            {
-              include_states: true,
-              current_store: current_store
-            }
+          def collection_serializer_params
+            serializer_params.merge(include_states: false)
           end
 
           def resource
-            return scope.default if params[:iso] == 'default'
+            return current_store.default_country if params[:iso] == 'default'
 
             scope.find_by(iso: params[:iso]&.upcase) ||
               scope.find_by(id: params[:iso]&.upcase) ||
@@ -48,6 +45,11 @@ module Spree
           def model_class
             Spree::Country
           end
+
+          # by default we want to return all countries on a single page
+          def set_default_per_page
+            params[:per_page] ||= Spree::Country.count
+          end
         end
       end
     end

data/app/controllers/spree/api/v2/storefront/menus_controller.rb

@@ -0,0 +1,35 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class MenusController < ::Spree::Api::V2::ResourceController
+          private
+
+          def resource_serializer
+            Spree::Api::Dependencies.storefront_menu_serializer.constantize
+          end
+
+          def collection_serializer
+            Spree::Api::Dependencies.storefront_menu_serializer.constantize
+          end
+
+          def collection_finder
+            Spree::Api::Dependencies.storefront_menu_finder.constantize
+          end
+
+          def model_class
+            Spree::Menu
+          end
+
+          def scope
+            super.by_locale(I18n.locale)
+          end
+
+          def scope_includes
+            { menu_items: [:children, :parent, :icon] }
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/storefront/order_status_controller.rb

@@ -10,7 +10,7 @@ module Spree
           private
 
           def resource
-            resource = resource_finder.new(number: params[:number], token: order_token).execute.take
+            resource = resource_finder.new(number: params[:number], token: order_token, store: current_store).execute.take
             raise ActiveRecord::RecordNotFound if resource.nil?
 
             resource

data/app/controllers/spree/api/v2/storefront/products_controller.rb

@@ -3,18 +3,20 @@ module Spree
     module V2
       module Storefront
         class ProductsController < ::Spree::Api::V2::ResourceController
-          private
+          include ::Spree::Api::V2::ProductListIncludes
+
+          protected
 
           def sorted_collection
             collection_sorter.new(collection, current_currency, params, allowed_sort_attributes).call
           end
 
           def collection
-            collection_finder.new(scope: scope, params: params, current_currency: current_currency).execute
+            @collection ||= collection_finder.new(scope: scope, params: finder_params).execute
           end
 
           def resource
-            scope.find_by(slug: params[:id]) || scope.find(params[:id])
+            @resource ||= scope.find_by(slug: params[:id]) || scope.find(params[:id])
           end
 
           def collection_sorter
@@ -38,15 +40,11 @@ module Spree
           end
 
           def scope_includes
-            {
-              master: :default_price,
-              variants: [],
-              variant_images: [],
-              taxons: [],
-              product_properties: :property,
-              option_types: :option_values,
-              variants_including_master: %i[default_price option_values]
-            }
+            product_list_includes
+          end
+
+          def allowed_sort_attributes
+            super << :available_on
           end
         end
       end

data/app/controllers/spree/api/v2/storefront/stores_controller.rb

@@ -10,7 +10,7 @@ module Spree
           end
 
           def resource
-            scope.find_by!(code: params[:code])
+            @resource ||= scope.find_by!(code: params[:code])
           end
 
           def resource_serializer

data/app/controllers/spree/api/v2/storefront/taxons_controller.rb

@@ -18,15 +18,11 @@ module Spree
           end
 
           def paginated_collection
-            collection_paginator.new(collection, params).call
-          end
-
-          def collection
-            collection_finder.new(scope: scope, params: params).execute
+            @paginated_collection ||= collection_paginator.new(collection, params).call
           end
 
           def resource
-            scope.find_by(permalink: params[:id]) || scope.find(params[:id])
+            @resource ||= scope.find_by(permalink: params[:id]) || scope.find(params[:id])
           end
 
           def model_class
@@ -34,16 +30,19 @@ module Spree
           end
 
           def scope_includes
-            node_includes = %i[icon products parent taxonomy]
+            node_includes = %i[icon parent taxonomy]
 
             {
               parent: node_includes,
               children: node_includes,
               taxonomy: [root: node_includes],
-              products: [],
               icon: [attachment_attachment: :blob]
             }
           end
+
+          def serializer_params
+            super.merge(include_products: action_name == 'show')
+          end
         end
       end
     end

data/app/helpers/spree/api/v2/display_money_helper.rb

@@ -13,7 +13,7 @@ module Spree
             price = find_price(product_or_variant, currency)
             return nil if price.new_record?
 
-            format('%.2f', price.amount)
+            price.amount
           end
 
           def display_price(product_or_variant, currency)
@@ -27,7 +27,7 @@ module Spree
             price = find_price(product_or_variant, currency)
             return nil if price.new_record? || price.compare_at_amount.blank?
 
-            format('%.2f', price.compare_at_amount)
+            price.compare_at_amount
           end
 
           def display_compare_at_price(product_or_variant, currency)

data/app/models/spree/api_configuration.rb

@@ -1,7 +1,10 @@
 module Spree
   class ApiConfiguration < Preferences::Configuration
     preference :requires_authentication, :boolean, default: true
+    preference :api_v2_serializers_cache_ttl, :integer, default: 3600 # 1 hour in seconds
+    preference :api_v2_collection_cache_ttl, :integer, default: 3600 # 1 hour in seconds
+    preference :api_v2_collection_cache_namespace, :string, default: 'api_v2_collection_cache'
     preference :api_v2_content_type, :string, default: 'application/vnd.api+json'
-    preference :api_v2_per_page_limit, :integer, default: 100
+    preference :api_v2_per_page_limit, :integer, default: 500
   end
 end

data/app/models/spree/api_dependencies.rb

@@ -5,18 +5,21 @@ module Spree
     INJECTION_POINTS = [
       :storefront_cart_create_service, :storefront_cart_add_item_service, :storefront_cart_remove_line_item_service,
       :storefront_cart_remove_item_service, :storefront_cart_set_item_quantity_service, :storefront_cart_recalculate_service,
+      :storefront_cms_page_serializer, :storefront_cms_page_finder,
       :storefront_cart_update, :storefront_coupon_handler, :storefront_checkout_next_service, :storefront_checkout_advance_service,
       :storefront_checkout_update_service, :storefront_checkout_complete_service, :storefront_checkout_add_store_credit_service,
       :storefront_checkout_remove_store_credit_service, :storefront_checkout_get_shipping_rates_service,
       :storefront_cart_compare_line_items_service, :storefront_cart_serializer, :storefront_credit_card_serializer,
       :storefront_credit_card_finder, :storefront_shipment_serializer, :storefront_payment_method_serializer, :storefront_country_finder,
-      :storefront_country_serializer, :storefront_current_order_finder, :storefront_completed_order_finder, :storefront_order_sorter,
-      :storefront_collection_paginator, :storefront_user_serializer, :storefront_products_sorter, :storefront_products_finder,
-      :storefront_product_serializer, :storefront_taxon_serializer, :storefront_taxon_finder, :storefront_find_by_variant_finder,
-      :storefront_cart_update_service, :storefront_cart_estimate_shipping_rates_service, :storefront_estimated_shipment_serializer,
+      :storefront_country_serializer, :storefront_menu_serializer, :storefront_menu_finder, :storefront_current_order_finder,
+      :storefront_completed_order_finder, :storefront_order_sorter, :storefront_collection_paginator, :storefront_user_serializer,
+      :storefront_products_sorter, :storefront_products_finder, :storefront_product_serializer, :storefront_taxon_serializer,
+      :storefront_taxon_finder, :storefront_find_by_variant_finder, :storefront_cart_update_service,
+      :storefront_cart_estimate_shipping_rates_service, :storefront_estimated_shipment_serializer,
       :storefront_store_serializer, :storefront_address_serializer, :storefront_order_serializer,
       :storefront_account_create_address_service, :storefront_account_update_address_service, :storefront_address_finder,
-      :storefront_collection_sorter, :error_handler
+      :storefront_account_create_service, :storefront_account_update_service, :storefront_collection_sorter, :error_handler,
+      :storefront_cart_empty_service, :storefront_cart_destroy_service, :storefront_credit_cards_destroy_service, :platform_products_sorter
     ].freeze
 
     attr_accessor *INJECTION_POINTS
@@ -38,6 +41,8 @@ module Spree
       @storefront_cart_set_item_quantity_service = Spree::Dependencies.cart_set_item_quantity_service
       @storefront_cart_recalculate_service = Spree::Dependencies.cart_recalculate_service
       @storefront_cart_estimate_shipping_rates_service = Spree::Dependencies.cart_estimate_shipping_rates_service
+      @storefront_cart_empty_service = Spree::Dependencies.cart_empty_service
+      @storefront_cart_destroy_service = Spree::Dependencies.cart_destroy_service
 
       # coupon code handler
       @storefront_coupon_handler = Spree::Dependencies.coupon_handler
@@ -52,14 +57,21 @@ module Spree
       @storefront_checkout_get_shipping_rates_service = Spree::Dependencies.checkout_get_shipping_rates_service
 
       # account services
+      @storefront_account_create_service = Spree::Dependencies.account_create_service
+      @storefront_account_update_service = Spree::Dependencies.account_update_service
       @storefront_account_create_address_service = Spree::Dependencies.account_create_address_service
       @storefront_account_update_address_service = Spree::Dependencies.account_update_address_service
 
+      # credit cards
+      @storefront_credit_cards_destroy_service = Spree::Dependencies.credit_cards_destroy_service
+
       # serializers
       @storefront_address_serializer = 'Spree::V2::Storefront::AddressSerializer'
       @storefront_cart_serializer = 'Spree::V2::Storefront::CartSerializer'
+      @storefront_cms_page_serializer = 'Spree::V2::Storefront::CmsPageSerializer'
       @storefront_credit_card_serializer = 'Spree::V2::Storefront::CreditCardSerializer'
       @storefront_country_serializer = 'Spree::V2::Storefront::CountrySerializer'
+      @storefront_menu_serializer = 'Spree::V2::Storefront::MenuSerializer'
       @storefront_user_serializer = 'Spree::V2::Storefront::UserSerializer'
       @storefront_shipment_serializer = 'Spree::V2::Storefront::ShipmentSerializer'
       @storefront_taxon_serializer = 'Spree::V2::Storefront::TaxonSerializer'
@@ -73,6 +85,7 @@ module Spree
       @storefront_collection_sorter = Spree::Dependencies.collection_sorter
       @storefront_order_sorter = Spree::Dependencies.collection_sorter
       @storefront_products_sorter = Spree::Dependencies.products_sorter
+      @platform_products_sorter = Spree::Dependencies.products_sorter
 
       # paginators
       @storefront_collection_paginator = Spree::Dependencies.collection_paginator
@@ -80,6 +93,8 @@ module Spree
       # finders
       @storefront_address_finder = Spree::Dependencies.address_finder
       @storefront_country_finder = Spree::Dependencies.country_finder
+      @storefront_cms_page_finder = Spree::Dependencies.cms_page_finder
+      @storefront_menu_finder = Spree::Dependencies.menu_finder
       @storefront_current_order_finder = Spree::Dependencies.current_order_finder
       @storefront_completed_order_finder = Spree::Dependencies.completed_order_finder
       @storefront_credit_card_finder = Spree::Dependencies.credit_card_finder

data/app/serializers/concerns/spree/api/v2/image_transformation_concern.rb

@@ -0,0 +1,15 @@
+module Spree
+  module Api
+    module V2
+      module ImageTransformationConcern
+        extend ActiveSupport::Concern
+
+        def self.included(base)
+          base.attribute :transformed_url do |image, params|
+            image.generate_url(size: params.dig(:image_transformation, :size))
+          end
+        end
+      end
+    end
+  end
+end

data/app/serializers/concerns/spree/api/v2/resource_serializer_concern.rb

@@ -0,0 +1,16 @@
+module Spree
+  module Api
+    module V2
+      module ResourceSerializerConcern
+        extend ActiveSupport::Concern
+
+        def self.included(base)
+          model_klazz = "Spree::#{base.to_s.demodulize.gsub(/Serializer/, '')}".constantize
+
+          base.set_type model_klazz.json_api_type
+          base.attributes(*model_klazz.json_api_columns)
+        end
+      end
+    end
+  end
+end