spree_api 5.2.5 → 5.3.0.rc1

data/app/controllers/spree/api/v2/storefront/account/addresses_controller.rb

@@ -47,23 +47,23 @@ module Spree
             end
 
             def collection_finder
-              Spree::Api::Dependencies.storefront_address_finder.constantize
+              Spree.api.storefront_address_finder
             end
 
             def collection_serializer
-              Spree::Api::Dependencies.storefront_address_serializer.constantize
+              Spree.api.storefront_address_serializer
             end
 
             def resource_serializer
-              Spree::Api::Dependencies.storefront_address_serializer.constantize
+              Spree.api.storefront_address_serializer
             end
 
             def create_service
-              Spree::Api::Dependencies.storefront_address_create_service.constantize
+              Spree.api.storefront_address_create_service
             end
 
             def update_service
-              Spree::Api::Dependencies.storefront_address_update_service.constantize
+              Spree.api.storefront_address_update_service
             end
 
             def address_params

data/app/controllers/spree/api/v2/storefront/account/credit_cards_controller.rb

@@ -30,19 +30,19 @@ module Spree
             end
 
             def collection_serializer
-              Spree::Api::Dependencies.storefront_credit_card_serializer.constantize
+              Spree.api.storefront_credit_card_serializer
             end
 
             def collection_finder
-              Spree::Api::Dependencies.storefront_credit_card_finder.constantize
+              Spree.api.storefront_credit_card_finder
             end
 
             def resource_serializer
-              Spree::Api::Dependencies.storefront_credit_card_serializer.constantize
+              Spree.api.storefront_credit_card_serializer
             end
 
             def destroy_service
-              Spree::Api::Dependencies.storefront_credit_cards_destroy_service.constantize
+              Spree.api.storefront_credit_cards_destroy_service
             end
           end
         end

data/app/controllers/spree/api/v2/storefront/account/orders_controller.rb

@@ -24,19 +24,19 @@ module Spree
             end
 
             def collection_serializer
-              Spree::Api::Dependencies.storefront_order_serializer.constantize
+              Spree.api.storefront_order_serializer
             end
 
             def resource_serializer
-              Spree::Api::Dependencies.storefront_order_serializer.constantize
+              Spree.api.storefront_order_serializer
             end
 
             def collection_finder
-              Spree::Api::Dependencies.storefront_completed_order_finder.constantize
+              Spree.api.storefront_completed_order_finder
             end
 
             def resource_finder
-              Spree::Api::Dependencies.storefront_completed_order_finder.constantize
+              Spree.api.storefront_completed_order_finder
             end
 
             def model_class

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

@@ -23,7 +23,7 @@ module Spree
           end
 
           def resource_serializer
-            Spree::Api::Dependencies.storefront_user_serializer.constantize
+            Spree.api.storefront_user_serializer
           end
 
           def model_class
@@ -31,11 +31,11 @@ module Spree
           end
 
           def create_service
-            Spree::Api::Dependencies.storefront_account_create_service.constantize
+            Spree.api.storefront_account_create_service
           end
 
           def update_service
-            Spree::Api::Dependencies.storefront_account_update_service.constantize
+            Spree.api.storefront_account_update_service
           end
 
           def user_create_params

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

@@ -141,7 +141,7 @@ module Spree
 
           def associate
             guest_order_token = params[:guest_order_token]
-            guest_order = ::Spree::Api::Dependencies.storefront_current_order_finder.constantize.new.execute(
+            guest_order = ::Spree.api.storefront_current_order_finder.new.execute(
               store: current_store,
               user: nil,
               token: guest_order_token,
@@ -170,47 +170,47 @@ module Spree
           private
 
           def resource_serializer
-            Spree::Api::Dependencies.storefront_cart_serializer.constantize
+            Spree.api.storefront_cart_serializer
           end
 
           def create_service
-            Spree::Api::Dependencies.storefront_cart_create_service.constantize
+            Spree.api.storefront_cart_create_service
           end
 
           def add_item_service
-            Spree::Api::Dependencies.storefront_cart_add_item_service.constantize
+            Spree.api.storefront_cart_add_item_service
           end
 
           def empty_cart_service
-            Spree::Api::Dependencies.storefront_cart_empty_service.constantize
+            Spree.api.storefront_cart_empty_service
           end
 
           def destroy_cart_service
-            Spree::Api::Dependencies.storefront_cart_destroy_service.constantize
+            Spree.api.storefront_cart_destroy_service
           end
 
           def set_item_quantity_service
-            Spree::Api::Dependencies.storefront_cart_set_item_quantity_service.constantize
+            Spree.api.storefront_cart_set_item_quantity_service
           end
 
           def remove_line_item_service
-            Spree::Api::Dependencies.storefront_cart_remove_line_item_service.constantize
+            Spree.api.storefront_cart_remove_line_item_service
           end
 
           def coupon_handler
-            Spree::Api::Dependencies.storefront_coupon_handler.constantize
+            Spree.api.storefront_coupon_handler
           end
 
           def estimate_shipping_rates_service
-            Spree::Api::Dependencies.storefront_cart_estimate_shipping_rates_service.constantize
+            Spree.api.storefront_cart_estimate_shipping_rates_service
           end
 
           def associate_service
-            Spree::Api::Dependencies.storefront_cart_associate_service.constantize
+            Spree.api.storefront_cart_associate_service
           end
 
           def change_currency_service
-            Spree::Api::Dependencies.storefront_cart_change_currency_service.constantize
+            Spree.api.storefront_cart_change_currency_service
           end
 
           def line_item
@@ -226,7 +226,7 @@ module Spree
           end
 
           def estimate_shipping_rates_serializer
-            Spree::Api::Dependencies.storefront_estimated_shipment_serializer.constantize
+            Spree.api.storefront_estimated_shipment_serializer
           end
 
           def serialize_estimated_shipping_rates(shipping_rates)

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

@@ -114,51 +114,51 @@ module Spree
           private
 
           def resource_serializer
-            Spree::Api::Dependencies.storefront_cart_serializer.constantize
+            Spree.api.storefront_cart_serializer
           end
 
           def next_service
-            Spree::Api::Dependencies.storefront_checkout_next_service.constantize
+            Spree.api.storefront_checkout_next_service
           end
 
           def advance_service
-            Spree::Api::Dependencies.storefront_checkout_advance_service.constantize
+            Spree.api.storefront_checkout_advance_service
           end
 
           def add_store_credit_service
-            Spree::Api::Dependencies.storefront_checkout_add_store_credit_service.constantize
+            Spree.api.storefront_checkout_add_store_credit_service
           end
 
           def remove_store_credit_service
-            Spree::Api::Dependencies.storefront_checkout_remove_store_credit_service.constantize
+            Spree.api.storefront_checkout_remove_store_credit_service
           end
 
           def complete_service
-            Spree::Api::Dependencies.storefront_checkout_complete_service.constantize
+            Spree.api.storefront_checkout_complete_service
           end
 
           def update_service
-            Spree::Api::Dependencies.storefront_checkout_update_service.constantize
+            Spree.api.storefront_checkout_update_service
           end
 
           def payment_methods_serializer
-            Spree::Api::Dependencies.storefront_payment_method_serializer.constantize
+            Spree.api.storefront_payment_method_serializer
           end
 
           def shipping_rates_service
-            Spree::Api::Dependencies.storefront_checkout_get_shipping_rates_service.constantize
+            Spree.api.storefront_checkout_get_shipping_rates_service
           end
 
           def shipping_rates_serializer
-            Spree::Api::Dependencies.storefront_shipment_serializer.constantize
+            Spree.api.storefront_shipment_serializer
           end
 
           def create_payment_service
-            Spree::Api::Dependencies.storefront_payment_create_service.constantize
+            Spree.api.storefront_payment_create_service
           end
 
           def select_shipping_method_service
-            Spree::Api::Dependencies.storefront_checkout_select_shipping_method_service.constantize
+            Spree.api.storefront_checkout_select_shipping_method_service
           end
 
           def serialize_payment_methods(payment_methods)

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

@@ -31,15 +31,15 @@ module Spree
           end
 
           def resource_serializer
-            Spree::Api::Dependencies.storefront_country_serializer.constantize
+            Spree.api.storefront_country_serializer
           end
 
           def collection_serializer
-            Spree::Api::Dependencies.storefront_country_serializer.constantize
+            Spree.api.storefront_country_serializer
           end
 
           def collection_finder
-            Spree::Api::Dependencies.storefront_country_finder.constantize
+            Spree.api.storefront_country_finder
           end
 
           def model_class

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

@@ -17,11 +17,11 @@ module Spree
           end
 
           def resource_finder
-            Spree::Api::Dependencies.storefront_completed_order_finder.constantize
+            Spree.api.storefront_completed_order_finder
           end
 
           def resource_serializer
-            Spree::Api::Dependencies.storefront_cart_serializer.constantize
+            Spree.api.storefront_cart_serializer
           end
 
           def ensure_order_token

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

@@ -6,11 +6,11 @@ module Spree
           private
 
           def collection_serializer
-            Spree::Api::Dependencies.storefront_policy_serializer.constantize
+            Spree.api.storefront_policy_serializer
           end
 
           def resource_serializer
-            Spree::Api::Dependencies.storefront_policy_serializer.constantize
+            Spree.api.storefront_policy_serializer
           end
 
           def resource

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

@@ -18,11 +18,11 @@ module Spree
           end
 
           def collection_finder
-            Spree::Api::Dependencies.storefront_posts_finder.constantize
+            Spree.api.storefront_posts_finder
           end
 
           def collection_sorter
-            Spree::Api::Dependencies.storefront_posts_sorter.constantize
+            Spree.api.storefront_posts_sorter
           end
 
           def collection_serializer

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

@@ -21,26 +21,23 @@ module Spree
           end
 
           def variant_includes
-            [
-              :prices,
-              { option_values: [:option_type] }
-            ]
+            [:images, :prices, { stock_items: :stock_location }]
           end
 
           def collection_sorter
-            Spree::Api::Dependencies.storefront_products_sorter.constantize
+            Spree.api.storefront_products_sorter
           end
 
           def collection_finder
-            Spree::Api::Dependencies.storefront_products_finder.constantize
+            Spree.api.storefront_products_finder
           end
 
           def collection_serializer
-            Spree::Api::Dependencies.storefront_product_serializer.constantize
+            Spree.api.storefront_product_serializer
           end
 
           def resource_serializer
-            Spree::Api::Dependencies.storefront_product_serializer.constantize
+            Spree.api.storefront_product_serializer
           end
 
           def model_class

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

@@ -18,7 +18,7 @@ module Spree
           end
 
           def resource_serializer
-            Spree::Api::Dependencies.storefront_store_serializer.constantize
+            Spree.api.storefront_store_serializer
           end
         end
       end

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

@@ -6,15 +6,15 @@ module Spree
           private
 
           def collection_serializer
-            Spree::Api::Dependencies.storefront_taxon_serializer.constantize
+            Spree.api.storefront_taxon_serializer
           end
 
           def resource_serializer
-            Spree::Api::Dependencies.storefront_taxon_serializer.constantize
+            Spree.api.storefront_taxon_serializer
           end
 
           def collection_finder
-            Spree::Api::Dependencies.storefront_taxon_finder.constantize
+            Spree.api.storefront_taxon_finder
           end
 
           def paginated_collection

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

@@ -19,11 +19,11 @@ module Spree
           end
 
           def collection_finder
-            Spree::Api::Dependencies.storefront_variant_finder.constantize
+            Spree.api.storefront_variant_finder
           end
 
           def collection_serializer
-            Spree::Api::Dependencies.storefront_variant_serializer.constantize
+            Spree.api.storefront_variant_serializer
           end
 
           def scope_includes

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

@@ -5,37 +5,57 @@ module Spree
         extend ActiveSupport::Concern
 
         class_methods do
-          def find_price(product_or_variant, currency)
-            product_or_variant.price_in(currency)
+          def find_price(product_or_variant, currency, context_options = {})
+            variant = product_or_variant.is_a?(Spree::Product) ? product_or_variant.default_variant : product_or_variant
+
+            if context_options.present?
+              context = build_pricing_context(variant, currency, context_options)
+              variant.price_for(context)
+            else
+              variant.price_in(currency)
+            end
           end
 
-          def price(product_or_variant, currency)
-            price = find_price(product_or_variant, currency)
+          def price(product_or_variant, currency, context_options = {})
+            price = find_price(product_or_variant, currency, context_options)
             return nil if price.new_record?
 
             price.amount
           end
 
-          def display_price(product_or_variant, currency)
-            price = find_price(product_or_variant, currency)
+          def display_price(product_or_variant, currency, context_options = {})
+            price = find_price(product_or_variant, currency, context_options)
             return nil if price.new_record?
 
             Spree::Money.new(price.amount, currency: currency).to_s
           end
 
-          def compare_at_price(product_or_variant, currency)
-            price = find_price(product_or_variant, currency)
+          def compare_at_price(product_or_variant, currency, context_options = {})
+            price = find_price(product_or_variant, currency, context_options)
             return nil if price.new_record? || price.compare_at_amount.blank?
 
             price.compare_at_amount
           end
 
-          def display_compare_at_price(product_or_variant, currency)
-            price = find_price(product_or_variant, currency)
+          def display_compare_at_price(product_or_variant, currency, context_options = {})
+            price = find_price(product_or_variant, currency, context_options)
             return nil if price.new_record? || price.compare_at_amount.blank?
 
             Spree::Money.new(price.compare_at_amount, currency: currency).to_s
           end
+
+          private
+
+          def build_pricing_context(variant, currency, options)
+            Spree::Pricing::Context.new(
+              variant: variant,
+              currency: currency,
+              store: options[:store],
+              zone: options[:tax_zone] || options[:zone],
+              user: options[:user],
+              quantity: options[:quantity]
+            )
+          end
         end
       end
     end

data/app/jobs/spree/webhook_delivery_job.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Spree
+  class WebhookDeliveryJob < Spree::BaseJob
+    queue_as Spree.queues.webhooks
+
+    retry_on StandardError, wait: :polynomially_longer, attempts: 5
+
+    def perform(delivery_id, secret_key)
+      delivery = Spree::WebhookDelivery.find_by(id: delivery_id)
+      return if delivery.nil?
+
+      Spree::Webhooks::DeliverWebhook.call(delivery: delivery, secret_key: secret_key)
+    end
+  end
+end

data/app/paginators/spree/api/paginate.rb

@@ -0,0 +1,68 @@
+require 'pagy'
+
+module Spree
+  module Api
+    class Paginate
+      include Pagy::Method
+
+      def initialize(collection, params)
+        @collection = collection
+        @params = params
+
+        per_page_limit = Spree::Api::Config[:api_v2_per_page_limit]
+        @per_page = if params[:per_page].to_i.between?(1, per_page_limit)
+                      params[:per_page].to_i
+                    else
+                      25
+                    end
+      end
+
+      def call
+        # Pass params as a hash-based request object for Pagy
+        # Pagy::Request accepts a hash with :params key
+        # Use to_unsafe_h for ActionController::Parameters, fallback to to_h for regular hashes
+        params_hash = @params.respond_to?(:to_unsafe_h) ? @params.to_unsafe_h : @params.to_h
+        request_hash = { params: params_hash }
+
+        # Uses countish paginator which is faster as it avoids COUNT queries
+        pagy, records = pagy(:countish, @collection, limit: @per_page, request: request_hash)
+
+        PagyCollection.new(records, pagy)
+      end
+    end
+
+    # Wrapper providing Kaminari-compatible interface for CollectionOptionsHelpers
+    # Includes Enumerable so jsonapi-serializer detects it as a collection
+    class PagyCollection < SimpleDelegator
+      include Enumerable
+
+      attr_reader :pagy
+
+      def initialize(records, pagy)
+        super(records)
+        @pagy = pagy
+      end
+
+      # Enumerable requires #each to be defined
+      def each(&block)
+        __getobj__.each(&block)
+      end
+
+      def next_page
+        @pagy.next
+      end
+
+      def prev_page
+        @pagy.previous
+      end
+
+      def total_pages
+        @pagy.pages
+      end
+
+      def total_count
+        @pagy.count
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          has_many :metafields, serializer: Spree::Api::Dependencies.storefront_metafield_serializer.constantize,
+          has_many :metafields, serializer: Spree.api.storefront_metafield_serializer,
                                 record_type: :metafield,
                                 object_method_name: :public_metafields
         end

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

@@ -20,7 +20,7 @@ module Spree
 
           metafield_enabled_resources = Spree::MetafieldDefinition.available_resources || []
           if metafield_enabled_resources.map(&:name).include?(model_klazz.name) && model_klazz.method_defined?(:metafields)
-            base.has_many :metafields, serializer: Spree::Api::Dependencies.platform_metafield_serializer.constantize,
+            base.has_many :metafields, serializer: Spree.api.platform_metafield_serializer,
                                        record_type: :metafield,
                                        object_method_name: :metafields
           end

data/app/serializers/spree/api/v2/platform/address_serializer.rb

@@ -5,9 +5,9 @@ module Spree
         class AddressSerializer < BaseSerializer
           include ResourceSerializerConcern
 
-          belongs_to :country, serializer: Spree::Api::Dependencies.platform_country_serializer.constantize
-          belongs_to :state, serializer: Spree::Api::Dependencies.platform_state_serializer.constantize
-          belongs_to :user, serializer: Spree::Api::Dependencies.platform_user_serializer.constantize
+          belongs_to :country, serializer: Spree.api.platform_country_serializer
+          belongs_to :state, serializer: Spree.api.platform_state_serializer
+          belongs_to :user, serializer: Spree.api.platform_user_serializer
         end
       end
     end

data/app/serializers/spree/api/v2/platform/adjustment_serializer.rb

@@ -5,13 +5,13 @@ module Spree
         class AdjustmentSerializer < BaseSerializer
           include ResourceSerializerConcern
 
-          belongs_to :order, serializer: Spree::Api::Dependencies.platform_order_serializer.constantize
+          belongs_to :order, serializer: Spree.api.platform_order_serializer
           belongs_to :adjustable, polymorphic: true
           belongs_to :source, polymorphic: {
-            Spree::Promotion::Actions::FreeShipping => Spree::Api::Dependencies.platform_promotion_action_serializer.constantize,
-            Spree::Promotion::Actions::CreateAdjustment => Spree::Api::Dependencies.platform_promotion_action_serializer.constantize,
-            Spree::Promotion::Actions::CreateItemAdjustments => Spree::Api::Dependencies.platform_promotion_action_serializer.constantize,
-            Spree::Promotion::Actions::CreateLineItems => Spree::Api::Dependencies.platform_promotion_action_serializer.constantize
+            Spree::Promotion::Actions::FreeShipping => Spree.api.platform_promotion_action_serializer,
+            Spree::Promotion::Actions::CreateAdjustment => Spree.api.platform_promotion_action_serializer,
+            Spree::Promotion::Actions::CreateItemAdjustments => Spree.api.platform_promotion_action_serializer,
+            Spree::Promotion::Actions::CreateLineItems => Spree.api.platform_promotion_action_serializer
           }
         end
       end

data/app/serializers/spree/api/v2/platform/classification_serializer.rb

@@ -5,8 +5,8 @@ module Spree
         class ClassificationSerializer < BaseSerializer
           include ResourceSerializerConcern
 
-          belongs_to :product, serializer: Spree::Api::Dependencies.platform_product_serializer.constantize
-          belongs_to :taxon, serializer: Spree::Api::Dependencies.platform_taxon_serializer.constantize
+          belongs_to :product, serializer: Spree.api.platform_product_serializer
+          belongs_to :taxon, serializer: Spree.api.platform_taxon_serializer
         end
       end
     end

data/app/serializers/spree/api/v2/platform/country_serializer.rb

@@ -5,7 +5,7 @@ module Spree
         class CountrySerializer < BaseSerializer
           include ResourceSerializerConcern
 
-          has_many :states, serializer: Spree::Api::Dependencies.platform_state_serializer.constantize
+          has_many :states, serializer: Spree.api.platform_state_serializer
         end
       end
     end

data/app/serializers/spree/api/v2/platform/credit_card_serializer.rb

@@ -5,8 +5,8 @@ module Spree
         class CreditCardSerializer < BaseSerializer
           include ResourceSerializerConcern
 
-          belongs_to :payment_method, serializer: Spree::Api::Dependencies.platform_payment_method_serializer.constantize
-          belongs_to :user, serializer: Spree::Api::Dependencies.platform_user_serializer.constantize
+          belongs_to :payment_method, serializer: Spree.api.platform_payment_method_serializer
+          belongs_to :user, serializer: Spree.api.platform_user_serializer
         end
       end
     end

data/app/serializers/spree/api/v2/platform/customer_return_serializer.rb

@@ -5,11 +5,11 @@ module Spree
         class CustomerReturnSerializer < BaseSerializer
           include ResourceSerializerConcern
 
-          belongs_to :stock_location, serializer: Spree::Api::Dependencies.platform_stock_location_serializer.constantize
+          belongs_to :stock_location, serializer: Spree.api.platform_stock_location_serializer
 
-          has_many :reimbursements, serializer: Spree::Api::Dependencies.platform_reimbursement_serializer.constantize
-          has_many :return_items, serializer: Spree::Api::Dependencies.platform_return_item_serializer.constantize
-          has_many :return_authorizations, serializer: Spree::Api::Dependencies.platform_return_authorization_serializer.constantize
+          has_many :reimbursements, serializer: Spree.api.platform_reimbursement_serializer
+          has_many :return_items, serializer: Spree.api.platform_return_item_serializer
+          has_many :return_authorizations, serializer: Spree.api.platform_return_authorization_serializer
         end
       end
     end