spree_cm_commissioner 2.0.3.pre.pre.pre7 → 2.1.0.pre.pre1

data/app/interactors/spree_cm_commissioner/user_registration_with_fb_token.rb

@@ -0,0 +1,62 @@
+module SpreeCmCommissioner
+  class UserRegistrationWithFbToken < BaseInteractor
+    delegate :tenant_id, :provider, to: :context
+
+    def call
+      context.fail!(message: 'provider_missing') unless provider
+
+      ActiveRecord::Base.transaction do
+        register_user!(provider[:name], provider[:email])
+        link_user_account!(provider)
+      end
+    end
+
+    private
+
+    def register_user!(name, email)
+      user = Spree.user_class.new(
+        password: SecureRandom.base64(16),
+        email: email,
+        tenant_id: tenant_id,
+        **name_attributes(name)
+      )
+
+      # Flag as social network registration to skip presence validation for email, login, phone_number, and user_identity_providers
+      # Other validations (uniqueness, format) still run if present
+      user.registering_via_social_network = true
+
+      if user.save
+        context.user = user
+      else
+        context.fail!(message: user.errors.full_messages.join("\n"))
+      end
+    end
+
+    def name_attributes(name)
+      return {} if name.blank?
+
+      parts = name.strip.split
+      {
+        first_name: parts[0],
+        last_name: parts[1..].join(' ').presence
+      }.compact
+    end
+
+    def link_user_account!(provider)
+      user_identity_provider = SpreeCmCommissioner::UserIdentityProvider.where(
+        user_id: context.user.id,
+        identity_type: provider[:identity_type]
+      ).first_or_initialize
+
+      user_identity_provider.sub = provider[:sub]
+      user_identity_provider.email = provider[:email]
+      user_identity_provider.name = provider[:name]
+
+      if user_identity_provider.save
+        context.user_identity_provider = user_identity_provider
+      else
+        context.fail!(message: user_identity_provider.errors.full_messages.join("\n"))
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/variant_block_updater.rb

@@ -0,0 +1,62 @@
+module SpreeCmCommissioner
+  class VariantBlockUpdater < BaseInteractor
+    delegate :variant, :data, :stock_location, :current_store, to: :context
+
+    def call
+      block_ids = data[:block_ids] || []
+
+      ActiveRecord::Base.transaction do
+        update_variant_block!(block_ids, variant)
+        update_stock_item!(variant)
+      end
+
+      context.message = 'Update variant blocks successfully'
+    rescue StandardError => e
+      context.fail!(message: "Update variant blocks Failed: #{e.message}")
+    end
+
+    private
+
+    def update_variant_block!(block_ids, variant)
+      variant.variant_blocks.where.not(block_id: block_ids).destroy_all
+
+      block_ids.each do |block_id|
+        next unless SpreeCmCommissioner::Block.exists?(id: block_id) # Skip invalid block_ids
+
+        block = SpreeCmCommissioner::VariantBlock.find_by(
+          block_id: block_id,
+          trip_id: variant.product.trip.id,
+          variant_id: variant.id
+        )
+
+        next unless block.nil?
+
+        SpreeCmCommissioner::VariantBlock.create!(
+          block_id: block_id,
+          trip_id: variant.product.trip.id,
+          variant_id: variant.id
+        )
+      end
+    end
+
+    def update_stock_item!(variant)
+      stock_items = variant.stock_items
+
+      context.fail!(message: 'Variant has more than one stock item. Please report to admin.') if stock_items.count > 1
+
+      stock_item = stock_items.first || variant.stock_items.create!(stock_location: stock_location)
+      quantity_difference = variant.variant_blocks.count - stock_item.count_on_hand
+
+      resource = SpreeCmCommissioner::Stock::StockMovementCreator.call(
+        variant_id: variant.id,
+        stock_location_id: stock_location.id,
+        current_store: current_store,
+        stock_movement_params: { quantity: quantity_difference }
+      )
+
+      return if resource.success?
+
+      context.fail!(message: "Stock update failed: #{resource.errors}")
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/vehicle_updater.rb

@@ -0,0 +1,41 @@
+module SpreeCmCommissioner
+  class VehicleUpdater < BaseInteractor
+    def call
+      vehicle = context.vehicle
+      data    = context.data
+
+      option_value_ids = data[:option_value_ids] || []
+      option_type_ids  = data[:option_type_ids] || []
+
+      ActiveRecord::Base.transaction do
+        update_vehicle!(vehicle, data[:vehicle_attributes])
+        update_amenities!(vehicle, option_value_ids, option_type_ids)
+      end
+
+      context.message = I18n.t('views.transit.vehicles.update_success')
+    rescue StandardError => e
+      context.fail!(message: "Failed to update vehicle: #{e.message}")
+    end
+
+    private
+
+    def update_vehicle!(vehicle, attributes)
+      return if vehicle.update(attributes.slice(:code, :license_plate, :allow_seat_selection, :vehicle_type, :number_of_seats))
+
+      raise vehicle.errors.full_messages.to_sentence
+    end
+
+    def update_amenities!(vehicle, option_value_ids, option_type_ids)
+      vehicle.option_value_vehicles.where.not(option_value_id: option_value_ids).destroy_all
+      vehicle.vehicle_option_types.where.not(option_type_id: option_type_ids).destroy_all
+
+      option_value_ids.each do |option_value_id|
+        vehicle.option_value_vehicles.find_or_create_by(option_value_id: option_value_id)
+      end
+
+      option_type_ids.each do |option_type_id|
+        vehicle.vehicle_option_types.find_or_create_by(option_type_id: option_type_id)
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/application_job.rb

@@ -1,5 +1,25 @@
 module SpreeCmCommissioner
   class ApplicationJob < ::ApplicationJob
     queue_as :default
+
+    around_perform :log_exceptions
+
+    private
+
+    def log_exceptions
+      yield
+    rescue StandardError => e
+      CmAppLogger.log(
+        label: "#{self.class.name} failed",
+        data: {
+          error_class: e.class.name,
+          error_message: e.message,
+          arguments: arguments.inspect,
+          backtrace: e.backtrace&.first(5)&.join("\n")
+        }
+      )
+
+      raise # Re-raise the exception to let Sidekiq handle retries or failure
+    end
   end
 end

data/app/jobs/spree_cm_commissioner/application_unique_job.rb

@@ -2,5 +2,25 @@
 module SpreeCmCommissioner
   class ApplicationUniqueJob < ::ApplicationUniqueJob
     queue_as :default
+
+    around_perform :log_exceptions
+
+    private
+
+    def log_exceptions
+      yield
+    rescue StandardError => e
+      CmAppLogger.log(
+        label: "#{self.class.name} failed",
+        data: {
+          error_class: e.class.name,
+          error_message: e.message,
+          arguments: arguments.inspect,
+          backtrace: e.backtrace&.first(5)&.join("\n")
+        }
+      )
+
+      raise # Re-raise the exception to let Sidekiq handle retries or failure
+    end
   end
 end

data/app/jobs/spree_cm_commissioner/ensure_correct_product_type_job.rb

@@ -0,0 +1,7 @@
+module SpreeCmCommissioner
+  class EnsureCorrectProductTypeJob < ApplicationJob
+    def perform
+      SpreeCmCommissioner::EnsureCorrectProductType.call
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/inventory_item_syncer_job.rb

@@ -0,0 +1,7 @@
+module SpreeCmCommissioner
+  class InventoryItemSyncerJob < ApplicationUniqueJob
+    def perform(inventory_id_and_quantities:)
+      InventoryItemSyncer.call(inventory_id_and_quantities:)
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  module Stock
+    class InventoryItemsAdjusterJob < ApplicationUniqueJob
+      def perform(variant_id:, quantity:)
+        variant = Spree::Variant.find(variant_id)
+
+        SpreeCmCommissioner::Stock::InventoryItemsAdjuster.call(variant: variant, quantity: quantity)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  module Stock
+    class InventoryItemsGeneratorJob < ApplicationUniqueJob
+      def perform(variant_id:)
+        variant = Spree::Variant.find(variant_id)
+
+        SpreeCmCommissioner::Stock::InventoryItemsGenerator.call(variant: variant)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  module Stock
+    class PermanentInventoryItemsGeneratorJob < ApplicationUniqueJob
+      def perform
+        SpreeCmCommissioner::Stock::PermanentInventoryItemsGenerator.call
+      end
+    end
+  end
+end

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

@@ -18,29 +18,32 @@ module SpreeCmCommissioner
     def date_unit
       return nil unless permanent_stock?
 
-      date_range_excluding_checkout.size if accommodation?
+      date_range.size
     end
 
-    def date_range_excluding_checkout
+    def date_range
       return [] unless date_present?
+      return [] unless permanent_stock?
 
-      date_range = (from_date.to_date..to_date.to_date).to_a
-      date_range.pop if date_range.size > 1
-      date_range
-    end
+      # For transit products (e.g., bus, train), only return the departure day,
+      # as the booking represents a single trip rather than a duration.
+      return [from_date.to_date] if transit?
 
-    def date_range_including_checkout
-      return [] unless date_present?
+      # For products with a stay or usage period (e.g., hotel, car rental, activities),
+      # return the full date range from start to end, inclusive.
+      return (from_date.to_date..to_date.to_date).to_a if service? || accommodation?
 
-      (from_date.to_date..to_date.to_date).to_a
+      []
     end
 
-    def date_range
-      if accommodation?
-        date_range_excluding_checkout
-      else
-        date_range_including_checkout
-      end
+    def checkin_date
+      from_date&.to_datetime
+    end
+
+    def checkout_date
+      return to_date ? to_date.to_datetime + 1.day : nil if accommodation?
+
+      to_date&.to_datetime
     end
 
     private

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

@@ -1,13 +1,21 @@
+# Number of guests are depend on the variant, but user is allowed to input custom number of guests
+# which will be stored in public_metadata.
+#
+# metadata {
+#   'number_of_adults': 2,
+#   'number_of_kids': 1,
+# }
 module SpreeCmCommissioner
   module LineItemGuestsConcern
     extend ActiveSupport::Concern
 
     included do
-      validate :validate_total_adults, if: -> { public_metadata[:number_of_adults].present? }
-      validate :validate_total_kids, if: -> { public_metadata[:number_of_kids].present? }
+      validate :validate_total_adults, if: -> { valid_integer_metadata?('number_of_adults') }
+      validate :validate_total_kids, if: -> { valid_integer_metadata?('number_of_kids') }
     end
 
-    def remaining_total_guests = [number_of_guests - guests.size, 0].max
+    def number_of_adults = public_metadata['number_of_adults']&.to_i || (variant.number_of_adults * quantity)
+    def number_of_kids = public_metadata['number_of_kids']&.to_i || (variant.number_of_kids * quantity)
     def number_of_guests = number_of_adults + number_of_kids
 
     def allowed_extra_adults = variant.allowed_extra_adults * quantity
@@ -16,8 +24,7 @@ module SpreeCmCommissioner
     def allowed_total_adults = (variant.number_of_adults * quantity) + allowed_extra_adults
     def allowed_total_kids = (variant.number_of_kids * quantity) + allowed_extra_kids
 
-    def number_of_adults = public_metadata[:number_of_adults] || (variant.number_of_adults * quantity)
-    def number_of_kids = public_metadata[:number_of_kids] || (variant.number_of_kids * quantity)
+    def remaining_total_guests = [number_of_guests - guests.size, 0].max
 
     def generate_remaining_guests
       return if remaining_total_guests.zero?
@@ -28,15 +35,17 @@ module SpreeCmCommissioner
     end
 
     def extra_adults
+      return 0 unless valid_integer_metadata?('number_of_adults')
       return 0 unless extra_adults?
 
-      public_metadata[:number_of_adults] - (variant.number_of_adults * quantity)
+      public_metadata['number_of_adults'].to_i - (variant.number_of_adults * quantity)
     end
 
     def extra_kids
+      return 0 unless valid_integer_metadata?('number_of_kids')
       return 0 unless extra_kids?
 
-      public_metadata[:number_of_kids] - (variant.number_of_kids * quantity)
+      public_metadata['number_of_kids'].to_i - (variant.number_of_kids * quantity)
     end
 
     def guest_options
@@ -55,25 +64,30 @@ module SpreeCmCommissioner
     end
 
     def extra_adults?
-      public_metadata[:number_of_adults].present? && public_metadata[:number_of_adults] > variant.number_of_adults * quantity
+      return false unless valid_integer_metadata?('number_of_adults')
+
+      public_metadata['number_of_adults'].to_i > variant.number_of_adults * quantity
     end
 
     def extra_kids?
-      public_metadata[:number_of_kids].present? && public_metadata[:number_of_kids] > variant.number_of_kids * quantity
+      return false unless valid_integer_metadata?('number_of_kids')
+
+      public_metadata['number_of_kids'].to_i > variant.number_of_kids * quantity
     end
 
     private
 
-    def validate_total_adults
-      return if public_metadata[:number_of_adults] <= allowed_total_adults
+    def valid_integer_metadata?(key)
+      value = public_metadata[key.to_s]
+      value.present? && value.to_s.match?(/\A-?\d+\z/)
+    end
 
-      errors.add(:quantity, 'exceed_total_adults')
+    def validate_total_adults
+      errors.add(:quantity, 'exceed_total_adults') if public_metadata['number_of_adults'].to_i > allowed_total_adults
     end
 
     def validate_total_kids
-      return if public_metadata[:number_of_kids] <= allowed_total_kids
-
-      errors.add(:quantity, 'exceed_total_kids')
+      errors.add(:quantity, 'exceed_total_kids') if public_metadata['number_of_kids'].to_i > allowed_total_kids
     end
   end
 end

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

@@ -0,0 +1,144 @@
+# This concern allow line item to have trip-related metadata.
+#
+# Metadata structure:
+# {
+#   'direction': 'outbound' or 'inbound',
+#   'trip_id': 123,
+#   'boarding_trip_stop_id': 456,
+#   'drop_off_trip_stop_id': 789
+# }
+#
+# Direction:
+# - "outbound": The trip is moving away from the origin (e.g., A → B → C → D).
+#   This term is more flexible than "departure" and applies to both direct and connected trips.
+# - "inbound": The trip is returning toward the origin (e.g., D → C → B → A).
+#   This term is more flexible than "return" and applies to both direct and connected trips.
+module SpreeCmCommissioner
+  module LineItemTransitable
+    extend ActiveSupport::Concern
+
+    DIRECTION = %w[outbound inbound].freeze
+
+    TripKey = Struct.new(:trip_id, :direction, :boarding_trip_stop_id, :drop_off_trip_stop_id)
+
+    included do
+      validates :direction, inclusion: { in: DIRECTION }, allow_nil: true
+      validates :trip_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
+      validates :boarding_trip_stop_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
+      validates :drop_off_trip_stop_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
+
+      validates :pickup_lat, numericality: { greater_than_or_equal_to: -90, less_than_or_equal_to: 90 }, allow_nil: true
+      validates :pickup_lng, numericality: { greater_than_or_equal_to: -180, less_than_or_equal_to: 180 }, allow_nil: true
+      validates :drop_off_lat, numericality: { greater_than_or_equal_to: -90, less_than_or_equal_to: 90 }, allow_nil: true
+      validates :drop_off_lng, numericality: { greater_than_or_equal_to: -180, less_than_or_equal_to: 180 }, allow_nil: true
+
+      validates :passenger_count, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
+
+      # Groups LineItems by trip fields. Some fields can be null,
+      # so use it with caution. Output:
+      # {
+      #   $<TripKey:> => [<LineItem id:1>]
+      #   $<TripKey:> => [<LineItem id:2>]
+      #   $<TripKey:> => [<LineItem id:3>, <LineItem id:4>]
+      # }
+      def self.group_by_trip_key
+        all.group_by do |line_item|
+          TripKey.new(
+            line_item.trip_id,
+            line_item.direction,
+            line_item.boarding_trip_stop_id,
+            line_item.drop_off_trip_stop_id
+          )
+        end
+      end
+    end
+
+    def outbound? = direction == 'outbound'
+    def inbound? = direction == 'inbound'
+
+    def direction = private_metadata['direction']
+    def trip_id = private_metadata['trip_id']&.to_i
+    def boarding_trip_stop_id = private_metadata['boarding_trip_stop_id']&.to_i
+    def drop_off_trip_stop_id = private_metadata['drop_off_trip_stop_id']&.to_i
+
+    def pickup_place_name = public_metadata['pickup_place_name']
+    def drop_off_place_name = public_metadata['drop_off_place_name']
+    def pickup_lat = public_metadata['pickup_lat']&.to_f
+    def pickup_lng = public_metadata['pickup_lng']&.to_f
+    def drop_off_lat = public_metadata['drop_off_lat']&.to_f
+    def drop_off_lng = public_metadata['drop_off_lng']&.to_f
+    def passenger_count = public_metadata['passenger_count']&.to_i
+    def pickup_oob_confirmed = private_metadata['pickup_oob_confirmed']
+    def drop_off_oob_confirmed = private_metadata['drop_off_oob_confirmed']
+
+    def direction=(value)
+      set_private_metadata_value('direction', value)
+    end
+
+    def trip_id=(value)
+      set_private_metadata_value('trip_id', value)
+    end
+
+    def boarding_trip_stop_id=(value)
+      set_private_metadata_value('boarding_trip_stop_id', value)
+    end
+
+    def drop_off_trip_stop_id=(value)
+      set_private_metadata_value('drop_off_trip_stop_id', value)
+    end
+
+    def pickup_oob_confirmed=(value)
+      set_private_metadata_value('pickup_oob_confirmed', value)
+    end
+
+    def drop_off_oob_confirmed=(value)
+      set_private_metadata_value('drop_off_oob_confirmed', value)
+    end
+
+    def pickup_place_name=(value)
+      set_public_metadata_value('pickup_place_name', value)
+    end
+
+    def drop_off_place_name=(value)
+      set_public_metadata_value('drop_off_place_name', value)
+    end
+
+    def pickup_lat=(value)
+      set_public_metadata_value('pickup_lat', value)
+    end
+
+    def pickup_lng=(value)
+      set_public_metadata_value('pickup_lng', value)
+    end
+
+    def drop_off_lat=(value)
+      set_public_metadata_value('drop_off_lat', value)
+    end
+
+    def drop_off_lng=(value)
+      set_public_metadata_value('drop_off_lng', value)
+    end
+
+    def passenger_count=(value)
+      set_public_metadata_value('passenger_count', value)
+    end
+
+    private
+
+    def set_public_metadata_value(key, value)
+      if value.nil?
+        public_metadata.delete(key)
+      else
+        public_metadata[key] = value.to_s
+      end
+    end
+
+    def set_private_metadata_value(key, value)
+      if value.nil?
+        private_metadata.delete(key)
+      else
+        private_metadata[key] = value.to_s
+      end
+    end
+  end
+end

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

@@ -14,13 +14,6 @@ module SpreeCmCommissioner
       state_selection
       payment_option
       delivery_option
-      amenity
-      departure_time
-      duration
-      vehicle_id
-      origin
-      destination
-      place_id
     ].freeze
 
     RESERVED_OPTIONS = {
@@ -48,11 +41,9 @@ module SpreeCmCommissioner
       'bib-display-prefix' => 'boolean',
       'bib-pre-generation-on-create' => 'boolean',
       'seat-number-positions' => 'array',
-      'origin' => 'place_id',
-      'destination' => 'place_id',
-      'departure-time' => 'time',
-      'vehicle' => 'vehicle_id',
-      'allow-seat-selection' => 'boolean'
+      'seat-type' => 'string',
+      'intercity-taxi' => 'string',
+      'pickup-time' => 'integer'
     }.freeze
 
     included do

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

@@ -0,0 +1,44 @@
+module SpreeCmCommissioner
+  module OrderSeatable
+    def should_manage_blocks?
+      preload_block_ids.any?
+    end
+
+    def hold_blocks!
+      return unless should_manage_blocks?
+
+      CmAppLogger.log(label: "#{self.class.name}#hold_blocks!", data: { order_id: id }) do
+        SpreeCmCommissioner::Seats::BlocksHolder.new(line_item_ids: line_item_ids, hold_by: user).hold_blocks!
+      end
+    end
+
+    def cancel_blocks!
+      return unless should_manage_blocks?
+
+      CmAppLogger.log(label: "#{self.class.name}#cancel_blocks!", data: { order_id: id }) do
+        SpreeCmCommissioner::Seats::BlocksCanceler.new(order_id: id, cancel_by: user).cancel_blocks!
+      end
+    end
+
+    def reserve_blocks!
+      return unless should_manage_blocks?
+
+      CmAppLogger.log(label: "#{self.class.name}#reserve_blocks!", data: { order_id: id }) do
+        SpreeCmCommissioner::Seats::BlocksReserver.new(line_item_ids: line_item_ids, reserve_by: user).reserve_blocks!
+      end
+    end
+
+    # Calling `.block_ids` directly can cause many slow database queries (N+1 problem)
+    # every time `.should_manage_blocks?` or `.preload_block_ids` runs.
+    # To avoid this, we store a precomputed list of block IDs in `private_metadata`.
+    # This list is updated whenever a guest’s block is saved or destroy.
+    def preload_block_ids=(preload_block_ids = [])
+      self.private_metadata ||= {}
+      self.private_metadata['preload_block_ids'] = preload_block_ids
+    end
+
+    def preload_block_ids
+      self.private_metadata&.fetch('preload_block_ids', []) || []
+    end
+  end
+end