spree_cm_commissioner 2.5.0.pre.pre1 → 2.5.0.pre.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 766f3c96b11b0771314a8713c96706a97aaa777879fc7de568c6cde2d45a69b3
-  data.tar.gz: 61425d946b1b97f4d56f385fa3fef1e32482d00537b5ed4de2ace0bb7a66a41d
+  metadata.gz: edd6f4b46f3da3028a4bfce9ea79cbf561c9ada3389da25dff55a1f5308caf05
+  data.tar.gz: bba75e416f319cf0cde0f34743030bf23c3f63ca243534f13632c0ebc78bc0c7
 SHA512:
-  metadata.gz: 0f76688e91c61895340e65c38dc8defe2e92eb2d96a8011cb6064d97811b982a26102aa217b257aee237af25cc9eace91fbafa97bd3d0199da1451ea46b2089c
-  data.tar.gz: ccb93229d83dbed6f5196b461dfa006f1be936e9a41b2a7226ba2fbbe3f63ca17425bbe5c1e22da66116ecef6f43402808e4ea1a649447c6ab5df7c5c292dd5d
+  metadata.gz: 712863b2c8323210e4e08a1278ea4ef0db673f73a3f8e088a3dc1a8393a3932026aa9607943869f27f0fcab69e51f38cada274226d806983ae0b0468e5ea73c6
+  data.tar.gz: 50f2fcbdd8aca176085f8a268e6dc85b508ea80c0d314d58ba90e231b34d7b1647b36b3c4caec6e414d51704afbf67ed2e5b6210770e29ef28cee031b40a9b73

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.5.0.pre.pre1)
+    spree_cm_commissioner (2.5.0.pre.pre3)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/interactors/spree_cm_commissioner/stock/stock_movement_creator.rb

@@ -23,10 +23,8 @@ module SpreeCmCommissioner
       private
 
       def adjust_inventory_items_async(variant_id, quantity)
-        params = { variant_id: variant_id, quantity: quantity }
-
-        CmAppLogger.log(label: "#{self.class.name}#adjust_inventory_items_async", data: params) do
-          SpreeCmCommissioner::Stock::InventoryItemsAdjusterJob.perform_later(**params)
+        CmAppLogger.log(label: "#{self.class.name}#adjust_inventory_items_async", data: { variant_id: variant_id, quantity: quantity }) do
+          SpreeCmCommissioner::Stock::InventoryItemsAdjusterJob.perform_later(variant_id: variant_id, quantity: quantity)
         end
       end
     end

data/app/jobs/spree_cm_commissioner/stock/inventory_items_adjuster_job.rb

@@ -1,8 +1,7 @@
 module SpreeCmCommissioner
   module Stock
-    class InventoryItemsAdjusterJob < ApplicationJob
-      # :variant_id, :quantity
-      def perform(options)
+    class InventoryItemsAdjusterJob < ApplicationUniqueJob
+      def perform(options = {})
         variant = Spree::Variant.find(options[:variant_id])
 
         SpreeCmCommissioner::Stock::InventoryItemsAdjuster.call(variant: variant, quantity: options[:quantity])

data/app/models/concerns/spree_cm_commissioner/integrations/integration_mappable.rb

@@ -24,6 +24,9 @@ module SpreeCmCommissioner
 
       included do
         has_many :integration_mappings, as: :internal, class_name: 'SpreeCmCommissioner::IntegrationMapping', dependent: :destroy
+        has_many :external_wins_integration_mappings, lambda {
+                                                        joins(:integration).where(integration: { conflict_strategy: :external_wins })
+                                                      }, as: :internal, class_name: 'SpreeCmCommissioner::IntegrationMapping'
       end
 
       class_methods do

data/app/models/concerns/spree_cm_commissioner/line_item_integration.rb

@@ -0,0 +1,36 @@
+# Caches the integration status of a line item's variant in private_metadata.
+#
+# Why cache?
+# Most products don't have integrations, so checking `variant.vendor.integration.present?`
+# on every read would cause N+1 queries. Caching avoids this performance hit.
+#
+# Behavior:
+# The flag is set once at line item creation and remains immutable. This preserves
+# the historical integration state of the order, even if the vendor's integration
+# status changes later. We don't have use cases requiring dynamic updates of this yet,
+# so we keep it constant for simplicity and consistency.
+module SpreeCmCommissioner
+  module LineItemIntegration
+    extend ActiveSupport::Concern
+
+    included do
+      before_create :set_integration_flag
+    end
+
+    def integration?
+      return false if private_metadata['integration'].nil?
+
+      ActiveModel::Type::Boolean.new.cast(private_metadata['integration'])
+    end
+
+    private
+
+    def set_integration_flag
+      return if private_metadata.key?('integration')
+      return if variant.nil? || variant.vendor.nil?
+
+      # We use variant.vendor instead of .vendor directly as on create, the association may not be set to line item yet.
+      private_metadata['integration'] ||= variant.vendor.integration.present?
+    end
+  end
+end

data/app/models/concerns/spree_cm_commissioner/order_integration.rb

@@ -0,0 +1,33 @@
+module SpreeCmCommissioner
+  module OrderIntegration
+    # Checks if any line item in this order has an integration (i.e., is from a vendor with an integration).
+    # This is used to determine if inventory management operations should be delegated to an external system.
+    def integration?
+      line_items.any?(&:integration?)
+    end
+
+    # Attempts to unstock inventory for all integration line items in this order.
+    # Groups line items by vendor and delegates to the vendor's integration service.
+    def unstock_inventory_from_external_system!
+      integration_line_items = line_items.select(&:integration?)
+      return if integration_line_items.empty?
+
+      integration_line_items.group_by(&:vendor_id).each do |_, line_items|
+        integration = line_items.first&.vendor&.integration
+        integration.unstock_external_inventory!(self, line_items) if integration.present?
+      end
+    end
+
+    # Attempts to restock inventory for all integration line items in this order.
+    # Groups line items by vendor and delegates to the vendor's integration service.
+    def restock_inventory_from_external_system!
+      integration_line_items = line_items.select(&:integration?)
+      return if integration_line_items.empty?
+
+      integration_line_items.group_by(&:vendor_id).each do |_, line_items|
+        integration = line_items.first&.vendor&.integration
+        integration.restock_external_inventory!(self, line_items) if integration.present?
+      end
+    end
+  end
+end

data/app/models/concerns/spree_cm_commissioner/order_state_machine.rb

@@ -143,6 +143,7 @@ module SpreeCmCommissioner
         # The payment will be reversed in vPago gem, and `Spree::Checkout::Complete` will be called, which checks `order.reload.complete?`.
         # This is critical because if the order state is complete, the payment will be marked as paid.
 
+        unstock_inventory_from_external_system!
         reserve_blocks!
         unstock_inventory_in_redis!
 
@@ -161,6 +162,7 @@ module SpreeCmCommissioner
 
     def restock_inventory!
       ActiveRecord::Base.transaction do
+        restock_inventory_from_external_system!
         cancel_blocks!
         restock_inventory_in_redis!
       end

data/app/models/spree_cm_commissioner/guest.rb

@@ -3,6 +3,8 @@ module SpreeCmCommissioner
   class Guest < SpreeCmCommissioner::Base # rubocop:disable Metrics/ClassLength
     include SpreeCmCommissioner::KycBitwise
     include SpreeCmCommissioner::PhoneNumberSanitizer
+    include SpreeCmCommissioner::StoreMetadata
+    include SpreeCmCommissioner::Integrations::IntegrationMappable
 
     delegate :kyc, to: :line_item, allow_nil: true
     delegate :allowed_upload_later?, to: :line_item, allow_nil: true
@@ -212,9 +214,20 @@ module SpreeCmCommissioner
     end
 
     def qr_data
+      return external_qr_data if external_qr_data.present?
+
       token
     end
 
+    # QR data for check-in. If external_wins? is true, use their QR data (they have their own check-in system).
+    # Otherwise, use our system's QR data. Only applicable to models with QR support (e.g., line_item, guest).
+    def external_qr_data
+      return nil if line_item.nil? || !line_item.integration?
+
+      mapping = external_wins_integration_mappings.first
+      mapping.external_qr_data if mapping.present?
+    end
+
     def current_age
       return nil if dob.nil?
 

data/app/models/spree_cm_commissioner/integration.rb

@@ -6,7 +6,7 @@ module SpreeCmCommissioner
     enum conflict_strategy: { newest_wins: 0, internal_wins: 1, external_wins: 2, manual_resolution: 3 }
 
     belongs_to :tenant, class_name: 'SpreeCmCommissioner::Tenant', optional: true
-    belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
+    belongs_to :vendor, class_name: 'Spree::Vendor', optional: false, inverse_of: :integration
 
     has_many :integration_mappings, class_name: 'SpreeCmCommissioner::IntegrationMapping', dependent: :destroy, inverse_of: :integration
     has_many :integration_sync_sessions, class_name: 'SpreeCmCommissioner::IntegrationSyncSession', dependent: :destroy, inverse_of: :integration
@@ -17,5 +17,13 @@ module SpreeCmCommissioner
     def sync_manager
       raise NotImplementedError, 'Subclasses must implement the sync_manager method'
     end
+
+    def restock_external_inventory!(_order, _line_items)
+      raise NotImplementedError, 'Subclasses must implement the restock_external_inventory! method'
+    end
+
+    def unstock_external_inventory!(_order, _line_items)
+      raise NotImplementedError, 'Subclasses must implement the unstock_external_inventory! method'
+    end
   end
 end

data/app/models/spree_cm_commissioner/integration_mapping.rb

@@ -11,6 +11,10 @@ module SpreeCmCommissioner
     validates :external_id, presence: true, uniqueness: { scope: %i[integration_id internal_type internal_id date] }
     validate :validate_internal_exists, if: -> { internal_type.present? && internal_id.present? }
 
+    # QR data for check-in. If external_wins? is true, use their QR data (they have their own check-in system).
+    # Otherwise, use our system's QR data. Only applicable to map with internal that has QR support (e.g., line_item, guest).
+    store_public_metadata :external_qr_data, :string, default: nil
+
     def mark_as_archived!
       self.status = :archived
       self.last_synced_at = Time.zone.now

data/app/models/spree_cm_commissioner/integrations/stadium_x_v1.rb

@@ -11,6 +11,22 @@ class SpreeCmCommissioner::Integrations::StadiumXV1 < SpreeCmCommissioner::Integ
     )
   end
 
+  # override
+  def unstock_external_inventory!(order, line_items)
+    result = SpreeCmCommissioner::Integrations::StadiumXV1::Inventory::UnstockInventory.new.call(
+      integration: self,
+      order: order,
+      line_items: line_items
+    )
+
+    raise SpreeCmCommissioner::Integrations::SyncError, result.error unless result.success?
+  end
+
+  # override
+  def restock_external_inventory!(_order, _line_items)
+    raise SpreeCmCommissioner::Integrations::SyncError, 'Ticket cannot be cancelled'
+  end
+
   def client
     SpreeCmCommissioner::Integrations::StadiumXV1::ExternalClient::Client.new(
       public_key: public_key,

data/app/models/spree_cm_commissioner/line_item_decorator.rb

@@ -72,10 +72,12 @@ module SpreeCmCommissioner
     def self.include_modules(base)
       base.include Spree::Core::NumberGenerator.new(prefix: 'L')
       base.include SpreeCmCommissioner::StoreMetadata
+      base.include SpreeCmCommissioner::LineItemIntegration
       base.include SpreeCmCommissioner::LineItemDurationable
       base.include SpreeCmCommissioner::LineItemsFilterScope
       base.include SpreeCmCommissioner::LineItemGuestsConcern
       base.include SpreeCmCommissioner::LineItemTransitable
+      base.include SpreeCmCommissioner::Integrations::IntegrationMappable
       base.include SpreeCmCommissioner::ProductType
       base.include SpreeCmCommissioner::ProductDelegation
       base.include SpreeCmCommissioner::KycBitwise
@@ -198,11 +200,21 @@ module SpreeCmCommissioner
     end
 
     def qr_data
+      return external_qr_data if external_qr_data.present?
       return nil if order.nil?
 
       "#{order.number}-#{order.token}-L#{id}"
     end
 
+    # QR data for check-in. If external_wins? is true, use their QR data (they have their own check-in system).
+    # Otherwise, use our system's QR data. Only applicable to models with QR support (e.g., line_item, guest).
+    def external_qr_data
+      return nil unless integration?
+
+      mapping = external_wins_integration_mappings.first
+      mapping.external_qr_data if mapping.present?
+    end
+
     def generate_completion_steps
       generate_completion_steps!
       true
@@ -255,7 +267,7 @@ module SpreeCmCommissioner
     end
 
     def update_vendor_id
-      self.vendor_id = variant.vendor_id
+      self.vendor_id = variant&.vendor_id
     end
 
     def subscription?

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -3,6 +3,7 @@ module SpreeCmCommissioner
     def self.prepended(base) # rubocop:disable Metrics/MethodLength
       base.include SpreeCmCommissioner::StoreMetadata
       base.include SpreeCmCommissioner::PhoneNumberSanitizer
+      base.include SpreeCmCommissioner::OrderIntegration
       base.include SpreeCmCommissioner::OrderSeatable
       base.include SpreeCmCommissioner::OrderStateMachine
       base.include SpreeCmCommissioner::RouteOrderCountable

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -40,6 +40,9 @@ module SpreeCmCommissioner
       base.has_many :vendor_kind_option_values,
                     through: :option_value_vendors, source: :option_value
 
+      # currently a vendor can have only one integration, but in future it can be many.
+      base.has_one :integration, class_name: 'SpreeCmCommissioner::Integration', dependent: :destroy, inverse_of: :vendor
+
       base.has_many :branches, -> { branch }, class_name: 'SpreeCmCommissioner::VendorPlace'
       base.has_many :stops, -> { stop }, class_name: 'SpreeCmCommissioner::VendorPlace'
       base.has_many :locations, -> { location }, class_name: 'SpreeCmCommissioner::VendorPlace'

data/app/services/spree_cm_commissioner/integrations/stadium_x_v1/inventory/unstock_inventory.rb

@@ -0,0 +1,83 @@
+class SpreeCmCommissioner::Integrations::StadiumXV1
+  module Inventory
+    class UnstockInventory
+      prepend ::Spree::ServiceModule::Base
+
+      def call(integration:, order:, line_items:)
+        ApplicationRecord.transaction do
+          line_items.each do |line_item|
+            raise SpreeCmCommissioner::Integrations::SyncError, 'Invalid guests' if line_item.guests.size != line_item.quantity
+
+            sync_line_item!(integration, order, line_item)
+          end
+
+          success(order: order, line_items: line_items)
+        end
+      rescue SpreeCmCommissioner::Integrations::SyncError,
+             SpreeCmCommissioner::Integrations::ExternalClientError => e
+        failure(nil, e.message)
+      end
+
+      def sync_line_item!(integration, order, line_item)
+        zone_mapping = line_item.product.integration_mappings.find_by(integration_id: integration.id)
+        raise SpreeCmCommissioner::Integrations::SyncError, 'Integration mapping not found for product' if zone_mapping.nil?
+
+        external_zone_id = zone_mapping.external_id
+        raise SpreeCmCommissioner::Integrations::SyncError, 'zone_id is required' if external_zone_id.blank?
+
+        external_match_id = zone_mapping.external_payload&.dig('match_id')
+        raise SpreeCmCommissioner::Integrations::SyncError, 'match_id is required' if external_match_id.blank?
+
+        external_club_id = zone_mapping.external_payload&.dig('club_id')
+        raise SpreeCmCommissioner::Integrations::SyncError, 'club_id is required' if external_club_id.blank?
+
+        tickets = integration.client.create_tickets!(
+          match_id: external_match_id,
+          user_id: order.number,
+          club_id: external_club_id,
+          zone_id: external_zone_id,
+          quantity: line_item.quantity
+        )
+
+        # External system did not create the correct number of tickets, we cannot proceed as it would lead to data inconsistency between systems.
+        # We raise an error to rollback the transaction & we can manually investigate the issue.
+        if tickets.size != line_item.quantity
+          raise SpreeCmCommissioner::Integrations::SyncError,
+                "Created tickets count (#{tickets.size}) does not match line item quantity (#{line_item.quantity})"
+        end
+
+        sync_guests!(line_item.guests, tickets, integration)
+
+        line_item_mapping = line_item.integration_mappings.find_or_initialize_by(
+          integration: integration,
+          external_id: tickets.map(&:_id).sort.join(',')
+        )
+        line_item_mapping.external_qr_data = group_ticket_qr_data(tickets)
+        line_item_mapping.mark_as_active!(external_payload: {})
+      end
+
+      def sync_guests!(guests, tickets, integration)
+        guests.each_with_index do |guest, index|
+          ticket = tickets[index]
+          next if ticket.blank?
+
+          guest_mapping = guest.integration_mappings.find_or_initialize_by(
+            external_id: ticket._id,
+            integration: integration
+          )
+
+          guest_mapping.external_qr_data = ticket._id
+          guest_mapping.mark_as_active!(external_payload: ticket.to_h)
+        end
+      end
+
+      def group_ticket_qr_data(tickets)
+        {
+          match_id: tickets.first.match_id,
+          ticket_ids: tickets.map(&:_id).sort,
+          is_online: true
+        }.to_json
+      end
+    end
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.5.0-pre1'.freeze
+  VERSION = '2.5.0-pre3'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.5.0.pre.pre1
+  version: 2.5.0.pre.pre3
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-12 00:00:00.000000000 Z
+date: 2025-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1378,11 +1378,13 @@ files:
 - app/models/concerns/spree_cm_commissioner/kyc_bitwise.rb
 - app/models/concerns/spree_cm_commissioner/line_item_durationable.rb
 - app/models/concerns/spree_cm_commissioner/line_item_guests_concern.rb
+- app/models/concerns/spree_cm_commissioner/line_item_integration.rb
 - app/models/concerns/spree_cm_commissioner/line_item_transitable.rb
 - app/models/concerns/spree_cm_commissioner/line_items_filter_scope.rb
 - app/models/concerns/spree_cm_commissioner/metafield.rb
 - app/models/concerns/spree_cm_commissioner/option_type_attr_type.rb
 - app/models/concerns/spree_cm_commissioner/option_value_attr_type.rb
+- app/models/concerns/spree_cm_commissioner/order_integration.rb
 - app/models/concerns/spree_cm_commissioner/order_scopes.rb
 - app/models/concerns/spree_cm_commissioner/order_seatable.rb
 - app/models/concerns/spree_cm_commissioner/order_state_machine.rb
@@ -2005,6 +2007,7 @@ files:
 - app/services/spree_cm_commissioner/integrations/polling.rb
 - app/services/spree_cm_commissioner/integrations/polling_scheduler.rb
 - app/services/spree_cm_commissioner/integrations/stadium_x_v1/external_client/client.rb
+- app/services/spree_cm_commissioner/integrations/stadium_x_v1/inventory/unstock_inventory.rb
 - app/services/spree_cm_commissioner/integrations/stadium_x_v1/polling/sync_matches.rb
 - app/services/spree_cm_commissioner/integrations/stadium_x_v1/polling/sync_zones.rb
 - app/services/spree_cm_commissioner/integrations/stadium_x_v1/resources/base.rb