spree_api 4.8.3 → 4.10.0

data/app/serializers/spree/v2/storefront/shipping_method_serializer.rb

@@ -0,0 +1,10 @@
+module Spree
+  module V2
+    module Storefront
+      class ShippingMethodSerializer < BaseSerializer
+        set_type   :shipping_method
+        attributes :name, :public_metadata
+      end
+    end
+  end
+end

data/app/services/spree/api/error_handler.rb

@@ -32,6 +32,7 @@ module Spree
       def report_error(exception:, message:, opts:)
         # overwrite this method in your application to support different error handlers
         # eg. Sentry, Rollbar, etc
+        Sentry.capture_exception(exception) if defined?(Sentry)
 
         success(exception: exception, message: message)
       end

data/app/services/spree/webhooks/subscribers/handle_request.rb

@@ -19,7 +19,7 @@ module Spree
           end
           return process(:warn, msg("failed for '#{url}'")) if request.failed_request?
 
-          process(:debug, msg("success for URL '#{url}'"))
+          process
         end
 
         private
@@ -30,8 +30,8 @@ module Spree
         delegate :id, :url, to: :subscriber
         delegate :created_at, :id, to: :event, prefix: true
 
-        def process(log_level, msg)
-          Rails.logger.public_send(log_level, msg)
+        def process(log_level = nil, msg = nil)
+          Rails.logger.public_send(log_level, msg) if msg.present? && log_level.present?
           make_request
           update_event(msg)
           nil
@@ -59,7 +59,7 @@ module Spree
           )
         end
 
-        def update_event(msg)
+        def update_event(msg = nil)
           event.update(
             execution_time: execution_time,
             request_errors: msg,

data/app/services/spree/webhooks/subscribers/make_request.rb

@@ -45,7 +45,7 @@ module Spree
         def http
           http = Net::HTTP.new(uri_host, uri_port)
           http.read_timeout = webhooks_timeout.to_i if custom_read_timeout?
-          http.use_ssl = true if use_ssl?
+          http.use_ssl = use_ssl?
           http
         end
 
@@ -71,7 +71,7 @@ module Spree
         end
 
         def use_ssl?
-          !(Rails.env.development? || Rails.env.test?)
+          uri.scheme == 'https'
         end
 
         def uri

data/app/services/spree/webhooks/subscribers/queue_requests.rb

@@ -4,8 +4,8 @@ module Spree
       class QueueRequests
         prepend Spree::ServiceModule::Base
 
-        def call(event_name:, webhook_payload_body:, **options)
-          filtered_subscribers(event_name, webhook_payload_body, options).each do |subscriber|
+        def call(event_name:, webhook_payload_body:, record: nil, **options)
+          filtered_subscribers(event_name, webhook_payload_body, record, options).each do |subscriber|
             Spree::Webhooks::Subscribers::MakeRequestJob.perform_later(
               webhook_payload_body, event_name, subscriber
             )
@@ -14,7 +14,7 @@ module Spree
 
         private
 
-        def filtered_subscribers(event_name, _, _)
+        def filtered_subscribers(event_name, webhook_payload_body, record, options)
           Spree::Webhooks::Subscriber.active.with_urls_for(event_name)
         end
       end

data/config/initializers/doorkeeper.rb

@@ -45,4 +45,6 @@ Doorkeeper.configure do
   # using Bcrupt for token secrets is currently not supported by Doorkeeper
   hash_token_secrets fallback: :plain
   hash_application_secrets fallback: :plain, using: '::Doorkeeper::SecretStoring::BCrypt'
+
+  access_token_expires_in 1.month
 end

data/config/routes.rb

@@ -14,7 +14,7 @@ Spree::Core::Engine.add_routes do
           delete 'remove_line_item/:line_item_id', to: 'cart#remove_line_item', as: :cart_remove_line_item
           patch  :set_quantity
           patch  :apply_coupon_code
-          delete 'remove_coupon_code/:coupon_code', to: 'cart#remove_coupon_code', as: :cart_remove_coupon_code
+          delete 'remove_coupon_code/:coupon_code', to: 'cart#remove_coupon_code', as: :cart_remove_coupon_code, constraints: { coupon_code: /[^\/]+/ }
           delete 'remove_coupon_code', to: 'cart#remove_coupon_code', as: :cart_remove_coupon_code_without_code
           get :estimate_shipping_rates
           patch :associate
@@ -45,6 +45,7 @@ Spree::Core::Engine.add_routes do
         get '/countries/:iso', to: 'countries#show', as: :country
         get '/order_status/:number', to: 'order_status#show', as: :order_status
         resources :products, only: %i[index show]
+        get '/products/:id/variants', to: 'variants#index', as: :product_variants
         resources :taxons,   only: %i[index show], id: /.+/
         get '/stores/:code', to: 'stores#show', as: :store
         get '/store', to: 'stores#current', as: :current_store
@@ -59,6 +60,8 @@ Spree::Core::Engine.add_routes do
             post :add_item
             patch 'set_item_quantity/:item_id', to: 'wishlists#set_item_quantity', as: :set_item_quantity
             delete 'remove_item/:item_id', to: 'wishlists#remove_item', as: :remove_item
+            post :add_items
+            delete :remove_items
           end
         end
 

data/lib/spree/api/configuration.rb

@@ -1,6 +1,8 @@
+require 'spree/core/preferences/runtime_configuration'
+
 module Spree
   module Api
-    class Configuration < Preferences::Configuration
+    class Configuration < Spree::Preferences::RuntimeConfiguration
       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'

data/lib/spree/api/dependencies.rb

@@ -1,3 +1,5 @@
+require 'spree/core/dependencies_helper'
+
 module Spree
   module Api
     class ApiDependencies
@@ -60,6 +62,7 @@ module Spree
         storefront_estimated_shipment_serializer: 'Spree::V2::Storefront::EstimatedShippingRateSerializer',
         storefront_store_serializer: 'Spree::V2::Storefront::StoreSerializer',
         storefront_order_serializer: 'Spree::V2::Storefront::OrderSerializer',
+        storefront_variant_serializer: 'Spree::V2::Storefront::VariantSerializer',
 
         # sorters
         storefront_collection_sorter: -> { Spree::Dependencies.collection_sorter },
@@ -81,11 +84,12 @@ module Spree
         storefront_find_by_variant_finder: -> { Spree::Dependencies.line_item_by_variant_finder },
         storefront_products_finder: -> { Spree::Dependencies.products_finder },
         storefront_taxon_finder: -> { Spree::Dependencies.taxon_finder },
+        storefront_variant_finder: -> { Spree::Dependencies.variant_finder },
 
         error_handler: 'Spree::Api::ErrorHandler',
 
         # serializers
-        platform_admin_user_serializer: 'Spree::Api::V2::Platform::UserSerializer',
+        platform_admin_user_serializer: 'Spree::Api::V2::Platform::AdminUserSerializer',
 
         # coupon code handler
         platform_coupon_handler: -> { Spree::Dependencies.coupon_handler },

data/lib/spree/api/engine.rb

@@ -18,17 +18,9 @@ module Spree
         Migrations.new(config, engine_name).check
       end
 
-      def self.activate
-        Dir.glob(File.join(File.dirname(__FILE__), '../../../app/models/spree/api/webhooks/*_decorator*.rb')) do |c|
-          Rails.application.config.cache_classes ? require(c) : load(c)
-        end
-      end
-
       def self.root
         @root ||= Pathname.new(File.expand_path('../../..', __dir__))
       end
-
-      config.to_prepare &method(:activate).to_proc
     end
   end
 end

data/lib/spree/api/testing_support/matchers/webhooks.rb

@@ -26,7 +26,7 @@
 # isn't added to the matcher definition, because it acts in a different
 # way depending on what's the resource being tested.
 #
-RSpec::Matchers.define :emit_webhook_event do |event_to_emit|
+RSpec::Matchers.define :emit_webhook_event do |event_to_emit, record = nil|
   match do |block|
     queue_requests = instance_double(Spree::Webhooks::Subscribers::QueueRequests)
 
@@ -36,7 +36,7 @@ RSpec::Matchers.define :emit_webhook_event do |event_to_emit|
     with_webhooks_enabled { Timecop.freeze { block.call } }
 
     expect(queue_requests).to(
-      have_received(:call).with(event_name: event_to_emit, webhook_payload_body: webhook_payload_body.to_json).once
+      have_received(:call).with(event_name: event_to_emit, webhook_payload_body: webhook_payload_body.to_json, record: record).once
     )
   end
 
@@ -61,7 +61,7 @@ RSpec::Matchers.define :emit_webhook_event do |event_to_emit|
 end
 
 def with_webhooks_enabled
-  ENV['DISABLE_SPREE_WEBHOOKS'] = nil
+  Spree::Webhooks.disabled = false
   yield
-  ENV['DISABLE_SPREE_WEBHOOKS'] = 'true'
+  Spree::Webhooks.disabled = true
 end

data/lib/spree/api/testing_support/spree_webhooks.rb

@@ -1,9 +1,9 @@
 RSpec.configure do |config|
   config.before(:each, :spree_webhooks) do
-    ENV['DISABLE_SPREE_WEBHOOKS'] = nil
+    Spree::Webhooks.disabled = false
   end
 
   config.after(:each, :spree_webhooks) do
-    ENV['DISABLE_SPREE_WEBHOOKS'] = 'true'
+    Spree::Webhooks.disabled = true
   end
 end

data/spree_api.gemspec

@@ -3,12 +3,12 @@ require_relative '../core/lib/spree/core/version'
 Gem::Specification.new do |s|
   s.name          = 'spree_api'
   s.version       = Spree.version
-  s.authors       = ['Ryan Bigg']
-  s.email         = ['ryan@spreecommerce.com']
+  s.authors       = ['Ryan Bigg', 'Spark Solutions Sp. z o.o.', 'Vendo Connect Inc.']
+  s.email         = ['hello@spreecommerce.org']
   s.summary       = %q{Spree's API}
   s.description   = %q{Spree's API}
   s.homepage      = 'https://spreecommerce.org'
-  s.license       = 'BSD-3-Clause'
+  s.licenses       = ['AGPL-3.0-or-later', 'BSD-3-Clause']
 
   s.metadata = {
     'bug_tracker_uri' => 'https://github.com/spree/spree/issues',

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 4.8.3
+  version: 4.10.0
 platform: ruby
 authors:
 - Ryan Bigg
+- Spark Solutions Sp. z o.o.
+- Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -114,24 +116,24 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.8.3
+        version: 4.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.8.3
+        version: 4.10.0
 description: Spree's API
 email:
-- ryan@spreecommerce.com
+- hello@spreecommerce.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- LICENSE
+- LICENSE.md
 - Rakefile
 - app/controllers/concerns/spree/api/v2/caching.rb
 - app/controllers/concerns/spree/api/v2/coupon_codes_helper.rb
@@ -203,6 +205,7 @@ files:
 - app/controllers/spree/api/v2/storefront/products_controller.rb
 - app/controllers/spree/api/v2/storefront/stores_controller.rb
 - app/controllers/spree/api/v2/storefront/taxons_controller.rb
+- app/controllers/spree/api/v2/storefront/variants_controller.rb
 - app/controllers/spree/api/v2/storefront/wishlists_controller.rb
 - app/helpers/spree/api/v2/collection_options_helpers.rb
 - app/helpers/spree/api/v2/display_money_helper.rb
@@ -211,16 +214,16 @@ files:
 - app/models/concerns/spree/user_api_authentication.rb
 - app/models/concerns/spree/user_api_methods.rb
 - app/models/concerns/spree/webhooks/has_webhooks.rb
-- app/models/spree/api/webhooks/order_decorator.rb
-- app/models/spree/api/webhooks/payment_decorator.rb
-- app/models/spree/api/webhooks/product_decorator.rb
-- app/models/spree/api/webhooks/shipment_decorator.rb
-- app/models/spree/api/webhooks/stock_item_decorator.rb
-- app/models/spree/api/webhooks/stock_movement_decorator.rb
-- app/models/spree/api/webhooks/variant_decorator.rb
 - app/models/spree/oauth_access_grant.rb
 - app/models/spree/oauth_access_token.rb
 - app/models/spree/oauth_application.rb
+- app/models/spree/order/webhooks.rb
+- app/models/spree/payment/webhooks.rb
+- app/models/spree/product/webhooks.rb
+- app/models/spree/shipment/webhooks.rb
+- app/models/spree/stock_item/webhooks.rb
+- app/models/spree/stock_movement/webhooks.rb
+- app/models/spree/variant/webhooks.rb
 - app/models/spree/webhooks/base.rb
 - app/models/spree/webhooks/event.rb
 - app/models/spree/webhooks/event_signature.rb
@@ -232,6 +235,7 @@ files:
 - app/serializers/spree/api/v2/base_serializer.rb
 - app/serializers/spree/api/v2/platform/address_serializer.rb
 - app/serializers/spree/api/v2/platform/adjustment_serializer.rb
+- app/serializers/spree/api/v2/platform/admin_user_serializer.rb
 - app/serializers/spree/api/v2/platform/asset_serializer.rb
 - app/serializers/spree/api/v2/platform/base_serializer.rb
 - app/serializers/spree/api/v2/platform/calculator_serializer.rb
@@ -337,6 +341,8 @@ files:
 - app/serializers/spree/v2/storefront/product_serializer.rb
 - app/serializers/spree/v2/storefront/promotion_serializer.rb
 - app/serializers/spree/v2/storefront/shipment_serializer.rb
+- app/serializers/spree/v2/storefront/shipping_category_serializer.rb
+- app/serializers/spree/v2/storefront/shipping_method_serializer.rb
 - app/serializers/spree/v2/storefront/shipping_rate_serializer.rb
 - app/serializers/spree/v2/storefront/state_serializer.rb
 - app/serializers/spree/v2/storefront/stock_location_serializer.rb
@@ -399,12 +405,13 @@ files:
 - spree_api.gemspec
 homepage: https://spreecommerce.org
 licenses:
+- AGPL-3.0-or-later
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.8.3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.10.0
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.8.3
+  source_code_uri: https://github.com/spree/spree/tree/v4.10.0
 post_install_message:
 rdoc_options: []
 require_paths:

data/LICENSE

@@ -1,26 +0,0 @@
-Copyright (c) 2007-2015, Spree Commerce, Inc. and other contributors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name Spree nor the names of its contributors may be used to
-      endorse or promote products derived from this software without specific
-      prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/app/models/spree/api/webhooks/order_decorator.rb

@@ -1,43 +0,0 @@
-module Spree
-  module Api
-    module Webhooks
-      module OrderDecorator
-        def self.prepended(base)
-          def base.custom_webhook_events
-            %w[order.canceled order.placed order.resumed order.shipped]
-          end
-
-          base.after_update_commit :queue_webhooks_requests_for_order_resumed!
-        end
-
-        def after_cancel
-          super
-          queue_webhooks_requests!('order.canceled')
-        end
-
-        def finalize!
-          super
-          queue_webhooks_requests!('order.placed')
-        end
-
-        def after_resume
-          super
-          queue_webhooks_requests!('order.resumed')
-          self.state_machine_resumed = false
-        end
-
-        private
-
-        def queue_webhooks_requests_for_order_resumed!
-          return if state_machine_resumed?
-          return unless state_previously_changed?
-          return unless state_previous_change&.last == 'resumed'
-
-          queue_webhooks_requests!('order.resumed')
-        end
-      end
-    end
-  end
-end
-
-Spree::Order.prepend(Spree::Api::Webhooks::OrderDecorator)

data/app/models/spree/api/webhooks/payment_decorator.rb

@@ -1,26 +0,0 @@
-module Spree
-  module Api
-    module Webhooks
-      module PaymentDecorator
-        def self.prepended(base)
-          def base.custom_webhook_events
-            %w[payment.paid payment.voided]
-          end
-        end
-
-        def after_void
-          super
-          queue_webhooks_requests!('payment.voided')
-        end
-
-        def after_completed
-          super
-          queue_webhooks_requests!('payment.paid')
-          order.queue_webhooks_requests!('order.paid') if order.paid?
-        end
-      end
-    end
-  end
-end
-
-Spree::Payment.prepend(Spree::Api::Webhooks::PaymentDecorator)

data/app/models/spree/api/webhooks/product_decorator.rb

@@ -1,46 +0,0 @@
-module Spree
-  module Api
-    module Webhooks
-      module ProductDecorator
-        def self.prepended(base)
-          def base.custom_webhook_events
-            %w[product.back_in_stock product.backorderable product.discontinued
-               product.out_of_stock product.activated product.archived product.drafted]
-          end
-
-          def base.ignored_attributes_for_update_webhook_event
-            %w[status]
-          end
-
-          base.after_update_commit :queue_webhooks_requests_for_product_discontinued!
-        end
-
-        def after_activate
-          super
-          queue_webhooks_requests!('product.activated')
-        end
-
-        def after_archive
-          super
-          queue_webhooks_requests!('product.archived')
-        end
-
-        def after_draft
-          super
-          queue_webhooks_requests!('product.drafted')
-        end
-
-        private
-
-        def queue_webhooks_requests_for_product_discontinued!
-          return unless discontinue_on_previously_changed?
-          return if (change = discontinue_on_previous_change).blank? || change.last.blank?
-
-          queue_webhooks_requests!('product.discontinued')
-        end
-      end
-    end
-  end
-end
-
-Spree::Product.prepend(Spree::Api::Webhooks::ProductDecorator)

data/app/models/spree/api/webhooks/shipment_decorator.rb

@@ -1,21 +0,0 @@
-module Spree
-  module Api
-    module Webhooks
-      module ShipmentDecorator
-        def self.prepended(base)
-          def base.custom_webhook_events
-            %w[shipment.shipped]
-          end
-        end
-
-        def after_ship
-          super
-          queue_webhooks_requests!('shipment.shipped')
-          order.queue_webhooks_requests!('order.shipped') if order.fully_shipped?
-        end
-      end
-    end
-  end
-end
-
-Spree::Shipment.prepend(Spree::Api::Webhooks::ShipmentDecorator)

data/app/models/spree/api/webhooks/stock_item_decorator.rb

@@ -1,43 +0,0 @@
-module Spree
-  module Api
-    module Webhooks
-      module StockItemDecorator
-        def self.prepended(base)
-          base.around_save :queue_webhooks_requests_for_variant_backorderable!
-          base.around_save :queue_webhooks_requests_for_product_backorderable!
-        end
-
-        private
-
-        def queue_webhooks_requests_for_variant_backorderable!
-          was_out_of_stock = !variant.in_stock_or_backorderable?
-          was_not_backorderable = !variant_backorderable?
-          yield
-          if was_out_of_stock && was_not_backorderable && variant_backorderable?
-            reload
-            variant.queue_webhooks_requests!('variant.backorderable')
-          end
-        end
-
-        def queue_webhooks_requests_for_product_backorderable!
-          product_was_out_of_stock = !product.any_variant_in_stock_or_backorderable?
-          product_was_not_backorderable = !product_backorderable?
-          yield
-          if product_was_out_of_stock && product_was_not_backorderable && product_backorderable?
-            variant.product.queue_webhooks_requests!('product.backorderable')
-          end
-        end
-
-        def product_backorderable?
-          Spree::StockItem.exists?(backorderable: true, variant_id: variant.product.variants.ids)
-        end
-
-        def variant_backorderable?
-          variant.stock_items.exists?(backorderable: true)
-        end
-      end
-    end
-  end
-end
-
-Spree::StockItem.prepend(Spree::Api::Webhooks::StockItemDecorator)

data/app/models/spree/api/webhooks/stock_movement_decorator.rb

@@ -1,52 +0,0 @@
-module Spree
-  module Api
-    module Webhooks
-      module StockMovementDecorator
-        def self.prepended(base)
-          base.around_save :queue_webhooks_requests_for_variant_out_of_stock!
-          base.around_save :queue_webhooks_requests_for_variant_back_in_stock!
-          base.around_save :queue_webhooks_requests_for_product_out_of_stock!
-          base.around_save :queue_webhooks_requests_for_product_back_in_stock!
-        end
-
-        private
-
-        def queue_webhooks_requests_for_variant_out_of_stock!
-          variant_in_stock_before_update = variant.in_stock_or_backorderable?
-          yield
-          if variant_in_stock_before_update && !variant.in_stock_or_backorderable?
-            reload
-            stock_item.variant.queue_webhooks_requests!('variant.out_of_stock')
-          end
-        end
-
-        def queue_webhooks_requests_for_variant_back_in_stock!
-          variant_was_out_of_stock = !variant.in_stock_or_backorderable?
-          yield
-          if variant_was_out_of_stock && variant.in_stock_or_backorderable?
-            reload
-            variant.queue_webhooks_requests!('variant.back_in_stock')
-          end
-        end
-
-        def queue_webhooks_requests_for_product_back_in_stock!
-          product_was_out_of_stock = !product.any_variant_in_stock_or_backorderable?
-          yield
-          if product_was_out_of_stock && product.any_variant_in_stock_or_backorderable?
-            product.queue_webhooks_requests!('product.back_in_stock')
-          end
-        end
-
-        def queue_webhooks_requests_for_product_out_of_stock!
-          product_was_in_stock = product.any_variant_in_stock_or_backorderable?
-          yield
-          if product_was_in_stock && !product.any_variant_in_stock_or_backorderable?
-            product.queue_webhooks_requests!('product.out_of_stock')
-          end
-        end
-      end
-    end
-  end
-end
-
-Spree::StockMovement.prepend(Spree::Api::Webhooks::StockMovementDecorator)

data/app/models/spree/api/webhooks/variant_decorator.rb

@@ -1,26 +0,0 @@
-module Spree
-  module Api
-    module Webhooks
-      module VariantDecorator
-        def self.prepended(base)
-          def base.custom_webhook_events
-            %w[variant.back_in_stock variant.backorderable variant.discontinued variant.out_of_stock]
-          end
-
-          base.after_update_commit :queue_webhooks_requests_for_variant_discontinued!
-        end
-
-        private
-
-        def queue_webhooks_requests_for_variant_discontinued!
-          return unless discontinue_on_previously_changed?
-          return if (change = discontinue_on_previous_change).blank? || change.last.blank?
-
-          queue_webhooks_requests!('variant.discontinued')
-        end
-      end
-    end
-  end
-end
-
-Spree::Variant.prepend(Spree::Api::Webhooks::VariantDecorator)