spree_api 5.4.1 → 5.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83149ce5fb5f298d828f2266bafc070b187ae4991b58e8d0f818ffc97c86d3f1
-  data.tar.gz: 174d77410c9c542fa39c0aaa8f46043013f49a7ea65ac441e28d08ee388a052e
+  metadata.gz: 4b295d2c49585c2fd0368b2b31bb782e19b77af7c4580e243896257151f5fd47
+  data.tar.gz: fea6f271b52ec0218ab2991e4bdaaa496d465a1fc2af7ada90bfee238de2216a
 SHA512:
-  metadata.gz: e5b4ae5e127f166c53b143148277ff4d096db433553834f0e6f6f752ae2c7956b9066fd5f96061fab1eff2d74fffaeefa61309aee56284fae3d0b6c8c41c5c89
-  data.tar.gz: dd94385142e6fd7fdb2bbdc579089d0ad69e22c35a8cb3ccb80b46d6775ade8cab7eb6d6ebd92225ed795d7bda0916911d671bba6fdb0b8b70c03d80686d6249
+  metadata.gz: d256c6250da995fd8762ed02f924e0d8f4c97fc3f39c3d94c9fc21b43b2d1878da871c0baff222e33d8d5c42b043878f6ec6aeea7baee6e3963fadb7bc6449b4
+  data.tar.gz: 4c30eff24e0d890cc2cb967e7f6cb0c476783324ea9724d46dc4fb3532bcd37400e81d07640e1e3b764e283ca3bf23c7f3148d7183060eb47b94ce238c129775

data/app/controllers/spree/api/v3/store/carts/fulfillments_controller.rb

@@ -46,11 +46,11 @@ module Spree
 
             # Temporary — Spree 6 removes the checkout state machine.
             def try_advance
-              return if @cart.complete? || @cart.canceled?
+              return if @cart.confirm? || @cart.complete? || @cart.canceled?
 
               loop do
+                break if @cart.payment?
                 break unless @cart.next
-                break if @cart.confirm? || @cart.complete?
               end
             rescue StandardError => e
               Rails.error.report(e, context: { order_id: @cart.id, state: @cart.state }, source: 'spree.checkout')

data/app/controllers/spree/api/v3/store/carts/payment_sessions_controller.rb

@@ -5,24 +5,27 @@ module Spree
         module Carts
           class PaymentSessionsController < Store::BaseController
             include Spree::Api::V3::CartResolvable
+            include Spree::Api::V3::OrderLock
 
             before_action :find_cart!
             before_action :set_payment_session, only: [:show, :update, :complete]
 
             # POST /api/v3/store/carts/:cart_id/payment_sessions
             def create
-              payment_method = current_store.payment_methods.find_by_prefix_id!(permitted_params[:payment_method_id])
-
-              @payment_session = payment_method.create_payment_session(
-                order: @cart,
-                amount: permitted_params[:amount],
-                external_data: permitted_params[:external_data] || {}
-              )
-
-              if @payment_session.persisted?
-                render json: serialize_resource(@payment_session), status: :created
-              else
-                render_errors(@payment_session.errors)
+              with_order_lock do
+                payment_method = current_store.payment_methods.find_by_prefix_id!(permitted_params[:payment_method_id])
+
+                @payment_session = payment_method.create_payment_session(
+                  order: @cart,
+                  amount: permitted_params[:amount],
+                  external_data: permitted_params[:external_data] || {}
+                )
+
+                if @payment_session.persisted?
+                  render json: serialize_resource(@payment_session), status: :created
+                else
+                  render_errors(@payment_session.errors)
+                end
               end
             end
 
@@ -33,30 +36,43 @@ module Spree
 
             # PATCH /api/v3/store/carts/:cart_id/payment_sessions/:id
             def update
-              @payment_session.payment_method.update_payment_session(
-                payment_session: @payment_session,
-                amount: permitted_params[:amount],
-                external_data: permitted_params[:external_data] || {}
-              )
-
-              if @payment_session.errors.empty?
-                render json: serialize_resource(@payment_session.reload)
-              else
-                render_errors(@payment_session.errors)
+              with_order_lock do
+                @payment_session.reload
+
+                @payment_session.payment_method.update_payment_session(
+                  payment_session: @payment_session,
+                  amount: permitted_params[:amount],
+                  external_data: permitted_params[:external_data] || {}
+                )
+
+                if @payment_session.errors.empty?
+                  render json: serialize_resource(@payment_session.reload)
+                else
+                  render_errors(@payment_session.errors)
+                end
               end
             end
 
             # PATCH /api/v3/store/carts/:cart_id/payment_sessions/:id/complete
             def complete
-              @payment_session.payment_method.complete_payment_session(
-                payment_session: @payment_session,
-                params: complete_params
-              )
-
-              if @payment_session.errors.empty?
-                render json: serialize_resource(@payment_session.reload)
-              else
-                render_errors(@payment_session.errors)
+              with_order_lock do
+                @payment_session.reload
+
+                if @payment_session.completed?
+                  render json: serialize_resource(@payment_session)
+                  return
+                end
+
+                @payment_session.payment_method.complete_payment_session(
+                  payment_session: @payment_session,
+                  params: complete_params
+                )
+
+                if @payment_session.errors.empty?
+                  render json: serialize_resource(@payment_session.reload)
+                else
+                  render_errors(@payment_session.errors)
+                end
               end
             end
 
@@ -77,7 +93,8 @@ module Spree
             private
 
             def set_payment_session
-              @payment_session = @cart.payment_sessions.find_by_prefix_id!(params[:id])
+              @payment_session = @cart.payment_sessions.find_by_prefix_id(params[:id]) ||
+                                 @cart.payment_sessions.find_by!(external_id: params[:id])
             end
 
             def serialize_resource(resource)

data/app/controllers/spree/api/v3/store/products/filters_controller.rb

@@ -7,24 +7,48 @@ module Spree
             include Spree::Api::V3::Store::SearchProviderSupport
 
             def index
-              result = search_provider.search_and_filter(
-                scope: filters_scope,
-                query: search_query,
-                filters: (search_filters || {}).merge('_category' => category),
-                page: 1,
-                limit: 0
-              )
-
-              render json: {
-                filters: result.filters,
-                sort_options: result.sort_options,
-                default_sort: result.default_sort,
-                total_count: result.total_count
-              }
+              json = Rails.cache.fetch(filters_cache_key, expires_in: 15.minutes) do
+                result = search_provider.filters(
+                  scope: filters_scope,
+                  query: search_query,
+                  filters: (search_filters || {}).merge('_category' => category)
+                )
+
+                {
+                  filters: result.filters,
+                  sort_options: result.sort_options,
+                  default_sort: result.default_sort,
+                  total_count: result.total_count
+                }
+              end
+
+              render json: json
             end
 
             private
 
+            def filters_cache_key
+              products_table = Spree::Product.table_name
+              stats = current_store.products.active(current_currency)
+                        .pick(Arel.sql("MAX(#{products_table}.updated_at)"), Arel.sql("COUNT(DISTINCT #{products_table}.id)"))
+              max_updated = stats&.first&.to_i
+              product_count = stats&.last || 0
+
+              parts = [
+                'spree/api/v3/store/filters',
+                current_store.id,
+                current_currency,
+                current_locale,
+                category&.cache_key_with_version,
+                search_query,
+                search_filters&.sort_by(&:first)&.to_json,
+                max_updated,
+                product_count
+              ]
+
+              parts.compact.join('/')
+            end
+
             def filters_scope
               scope = current_store.products.active(current_currency)
               scope = scope.in_category(category) if category.present?

data/app/controllers/spree/api/v3/store/products_controller.rb

@@ -55,7 +55,6 @@ module Spree
               limit: limit
             )
 
-            @search_result = result
             @pagy = result.pagy
             @collection = result.products
           end

data/app/controllers/spree/api/v3/webhooks/payments_controller.rb

@@ -31,7 +31,7 @@ module Spree
 
             # Process asynchronously — gateways have timeout limits and will
             # retry on timeouts, so we must return 200 quickly.
-            Spree::Payments::HandleWebhookJob.perform_later(
+            Spree::Payments::HandleWebhookJob.set(wait: 30.seconds).perform_later(
               payment_method_id: payment_method.id,
               action: result[:action].to_s,
               payment_session_id: result[:payment_session].id

data/app/serializers/spree/api/v3/fulfillment_serializer.rb

@@ -36,7 +36,9 @@ module Spree
         # Which items (and how many) are in this fulfillment.
         # A line item can be split across fulfillments with different quantities.
         attribute :items do |shipment|
-          shipment.manifest.map do |item|
+          shipment.manifest.filter_map do |item|
+            next unless item.line_item
+
             {
               item_id: item.line_item.prefixed_id,
               variant_id: item.variant.prefixed_id,

data/app/services/spree/api/v3/filters_aggregator.rb

@@ -81,13 +81,106 @@ module Spree
         end
 
         def option_type_filters
-          Spree::OptionType.filterable.includes(:option_values).order(:position).filter_map do |option_type|
-            # Disjunctive: count against scope WITHOUT this option type's filter
-            count_scope = disjunctive_scope_for(option_type)
-            values = option_type.option_values.for_products(count_scope).distinct.order(:position)
-            next if values.empty?
+          option_types = Spree::OptionType.filterable.order(:position).to_a
+          return [] if option_types.empty?
 
-            count_ids = count_scope.reorder('').distinct.pluck(:id)
+          type_ids = option_types.map(&:id)
+
+          # Pluck only the columns we need — avoids instantiating thousands of AR models.
+          # Force default locale so Mobility returns column values (not translations);
+          # translated labels are overlaid separately via load_option_value_translations.
+          ov_rows = Mobility.with_locale(I18n.default_locale) do
+            Spree::OptionValue
+              .where(option_type_id: type_ids)
+              .order(:position)
+              .pluck(:id, :option_type_id, :name, :presentation, :position, :color_code)
+          end
+          return [] if ov_rows.empty?
+
+          all_ov_ids = ov_rows.map(&:first)
+
+          # Batch-load image attachment existence (single query)
+          ov_ids_with_images = ActiveStorage::Attachment
+            .where(record_type: 'Spree::OptionValue', name: 'image', record_id: all_ov_ids)
+            .pluck(:record_id)
+            .to_set
+
+          # Batch-load translations for current locale (single query, skip for default locale with column_fallback)
+          ov_translations = load_option_value_translations(all_ov_ids)
+
+          # Group rows by option type
+          ov_rows_by_type = ov_rows.group_by { |row| row[1] }
+
+          # Batch counts
+          if grouped_selected_options.empty?
+            counts = batch_option_value_counts(@scope_before_options, all_ov_ids)
+          else
+            scope_groups = option_types.group_by { |ot| disjunctive_scope_for(ot) }
+            counts = {}
+            scope_groups.each do |scope, types|
+              ov_ids = types.flat_map { |t| ov_rows_by_type[t.id]&.map(&:first) || [] }
+              counts.merge!(batch_option_value_counts(scope, ov_ids))
+            end
+          end
+
+          build_option_type_results(option_types, ov_rows_by_type, counts, ov_ids_with_images, ov_translations)
+        end
+
+        # Single grouped COUNT query for all option value IDs against a product scope.
+        # Returns { option_value_id => product_count }
+        def batch_option_value_counts(product_scope, option_value_ids)
+          return {} if option_value_ids.empty?
+
+          ovv_table = Spree::OptionValueVariant.table_name
+          var_table = Spree::Variant.table_name
+
+          Spree::OptionValueVariant
+            .joins("INNER JOIN #{var_table} ON #{var_table}.id = #{ovv_table}.variant_id AND #{var_table}.deleted_at IS NULL")
+            .where(var_table => { product_id: product_scope.reorder('').select(:id) })
+            .where(ovv_table => { option_value_id: option_value_ids })
+            .group("#{ovv_table}.option_value_id")
+            .distinct
+            .count("#{var_table}.product_id")
+        end
+
+        # Load translated presentations for option values.
+        # Returns { option_value_id => translated_presentation } or empty hash when using the default locale.
+        def load_option_value_translations(ov_ids)
+          locale = Spree::Current.locale || I18n.locale.to_s
+          return {} if locale.to_s == I18n.default_locale.to_s
+
+          Spree::OptionValue::Translation
+            .where(spree_option_value_id: ov_ids, locale: locale)
+            .pluck(:spree_option_value_id, :presentation)
+            .to_h
+        end
+
+        def build_option_type_results(option_types, ov_rows_by_type, counts, ov_ids_with_images, ov_translations)
+          # Pre-load image URLs for option values that have images (single batch)
+          image_urls = load_image_urls(ov_ids_with_images)
+
+          option_types.filter_map do |option_type|
+            rows = ov_rows_by_type[option_type.id]
+            next if rows.blank?
+
+            # rows: [id, option_type_id, name, presentation, position, color_code]
+            options = rows.filter_map do |id, _, name, presentation, position, color_code|
+              count = counts[id] || 0
+              next if count.zero?
+
+              label = ov_translations[id] || presentation
+
+              {
+                id: encode_prefixed_id(:optval, id),
+                name: name,
+                label: label,
+                position: position,
+                color_code: color_code,
+                image_url: image_urls[id],
+                count: count
+              }
+            end
+            next if options.empty?
 
             {
               id: option_type.prefixed_id,
@@ -95,28 +188,25 @@ module Spree
               name: option_type.name,
               label: option_type.label,
               kind: option_type.kind,
-              options: values.map { |ov| option_value_data(count_ids, ov) }
+              options: options
             }
           end
         end
 
-        def option_value_data(product_ids, option_value)
-          count = Spree::Product
-            .where(id: product_ids)
-            .joins(:option_value_variants)
-            .where(Spree::OptionValueVariant.table_name => { option_value_id: option_value.id })
-            .distinct
-            .count
+        # Load image URLs for option values that have images.
+        # Only instantiates AR models for the small subset with images (typically color swatches).
+        def load_image_urls(ov_ids_with_images)
+          return {} if ov_ids_with_images.empty?
 
-          {
-            id: option_value.prefixed_id,
-            name: option_value.name,
-            label: option_value.label,
-            position: option_value.position,
-            color_code: option_value.color_code,
-            image_url: option_value.image.attached? ? Rails.application.routes.url_helpers.cdn_image_url(option_value.image) : nil,
-            count: count
-          }
+          Spree::OptionValue.where(id: ov_ids_with_images.to_a)
+            .includes(image_attachment: :blob)
+            .each_with_object({}) do |ov, urls|
+              urls[ov.id] = Rails.application.routes.url_helpers.cdn_image_url(ov.image)
+            end
+        end
+
+        def encode_prefixed_id(prefix, id)
+          "#{prefix}_#{Spree::PrefixedId::SQIDS.encode([id])}"
         end
 
         # Returns the scope with all option type filters EXCEPT the given one applied.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 5.4.1
+  version: 5.4.2
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-14 00:00:00.000000000 Z
+date: 2026-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rswag-specs
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.16'
-- !ruby/object:Gem::Dependency
-  name: pagy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '43.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '43.0'
 - !ruby/object:Gem::Dependency
   name: typelizer
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.1
+        version: 5.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.1
+        version: 5.4.2
 description: Spree's API
 email:
 - hello@spreecommerce.org
@@ -277,9 +263,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.1
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.2
 post_install_message:
 rdoc_options: []
 require_paths: