spree_cm_commissioner 1.18.1 → 2.0.0.pre.pre

data/app/controllers/spree_cm_commissioner/well_known_controller.rb

@@ -3,31 +3,19 @@ module SpreeCmCommissioner
     before_action :identify_request_source
     rescue_from StandardError, with: :handle_error
 
-    def assetlinks_json
-      render_universal_link('assetlinks.json')
-    end
-
-    def apple_app_site_association
-      render_universal_link('apple-app-site-association')
-    end
-
-    private
-
-    def render_universal_link(universal_link)
-      result = SpreeCmCommissioner::UniversalLinkFetcher.new(
-        universal_link: universal_link,
-        store: @store,
-        tenant: @tenant,
-        refresh: params[:_refresh].to_s == 'true'
-      ).call
-
-      if result[:success]
-        render json: result[:data]
+    def show
+      case params[:id]
+      when 'assetlinks.json'
+        render_preference(:preferred_assetlinks)
+      when 'apple-app-site-association'
+        render_preference(:preferred_apple_app_site_association)
       else
         render_not_found
       end
     end
 
+    private
+
     def identify_request_source
       host = params[:original_host].presence || request.host.downcase
 
@@ -37,6 +25,16 @@ module SpreeCmCommissioner
       @tenant = result.tenant
     end
 
+    def render_preference(preference_key)
+      if @store&.send(preference_key).present?
+        render json: @store.send(preference_key)
+      elsif @tenant&.send(preference_key).present?
+        render json: @tenant.send(preference_key)
+      else
+        render_not_found
+      end
+    end
+
     def render_not_found
       render json: { error: 'Not found' }, status: :not_found
     end

data/app/finders/spree_cm_commissioner/accommodations/find.rb

@@ -0,0 +1,37 @@
+module SpreeCmCommissioner
+  module Accommodations
+    class Find
+      attr_reader :from_date, :to_date, :state_id, :number_of_guests
+
+      def initialize(from_date:, to_date:, state_id:, number_of_adults:, number_of_kids:)
+        @from_date = from_date
+        @to_date = to_date
+        @state_id = state_id
+        @number_of_guests = number_of_adults.to_i + number_of_kids.to_i
+      end
+
+      def execute
+        scope
+          .where(default_state_id: state_id)
+          .where(inventory_items: { inventory_date: stay_dates })
+          .where('CAST(spree_variants.public_metadata->\'cm_options\'->>\'number-of-adults\' AS INTEGER) +
+                  CAST(spree_variants.public_metadata->\'cm_options\'->>\'number-of-kids\' AS INTEGER) >= ?', number_of_guests
+          )
+          .where('inventory_items.quantity_available > 0')
+          .distinct
+      end
+
+      private
+
+      def scope
+        Spree::Vendor
+          .joins(variants: :inventory_items)
+          .where(primary_product_type: :accommodation, state: :active)
+      end
+
+      def stay_dates
+        from_date..to_date
+      end
+    end
+  end
+end

data/app/finders/spree_cm_commissioner/accommodations/find_variant.rb

@@ -0,0 +1,32 @@
+module SpreeCmCommissioner
+  module Accommodations
+    class FindVariant
+      attr_reader :vendor_id, :from_date, :to_date, :number_of_guests
+
+      def initialize(vendor_id:, from_date:, to_date:, number_of_adults:, number_of_kids:)
+        @vendor_id = vendor_id
+        @from_date = from_date
+        @to_date = to_date
+        @number_of_guests = number_of_adults.to_i + number_of_kids.to_i
+      end
+
+      def execute
+        Spree::Variant
+          .joins(:inventory_items)
+          .where(vendor_id: vendor_id)
+          .where(inventory_items: { inventory_date: stay_dates })
+          .where('CAST(public_metadata->\'cm_options\'->>\'number-of-adults\' AS INTEGER) +
+                  CAST(public_metadata->\'cm_options\'->>\'number-of-kids\' AS INTEGER) >= ?', number_of_guests
+          )
+          .where('inventory_items.quantity_available > 0')
+          .distinct
+      end
+
+      private
+
+      def stay_dates
+        from_date..to_date
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/ensure_correct_product_type.rb

@@ -0,0 +1,40 @@
+module SpreeCmCommissioner
+  class EnsureCorrectProductType < BaseInteractor
+    def call
+      Spree::Product
+        .left_joins(variants_including_master: %i[inventory_items line_items])
+        .where(
+          'spree_variants.product_type IS NULL OR
+          spree_variants.product_type != spree_products.product_type OR
+
+          cm_inventory_items.product_type IS NULL OR
+          cm_inventory_items.product_type != spree_products.product_type OR
+
+          spree_line_items.product_type IS NULL OR
+          spree_line_items.product_type != spree_products.product_type OR
+
+          spree_products.product_type IS NOT NULL
+          '
+        )
+        .distinct.find_each do |product|
+        sync_product_type_for(product)
+      end
+    end
+
+    def sync_product_type_for(product)
+      product_type = Spree::Variant.product_types[product.product_type]
+
+      product.variants_including_master
+             .where('spree_variants.product_type IS NULL OR spree_variants.product_type != ?', product_type)
+             .update_all(product_type: product_type) # rubocop:disable Rails/SkipsModelValidations
+
+      product.line_items
+             .where('spree_line_items.product_type IS NULL OR spree_line_items.product_type != ?', product_type)
+             .update_all(product_type: product_type) # rubocop:disable Rails/SkipsModelValidations
+
+      product.inventory_items
+             .where('cm_inventory_items.product_type IS NULL OR cm_inventory_items.product_type != ?', product_type)
+             .update_all(product_type: product_type) # rubocop:disable Rails/SkipsModelValidations
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/inventory_item_syncer.rb

@@ -0,0 +1,25 @@
+module SpreeCmCommissioner
+  class InventoryItemSyncer < BaseInteractor
+    # inventory_id_and_quantities = [{ inventory_id: inventory_item1.id, quantity: 5 } ]
+    delegate :inventory_id_and_quantities, to: :context
+
+    def call
+      ActiveRecord::Base.transaction do
+        inventory_items.each do |inventory_item|
+          quantity = inventory_id_and_quantities.find { |item| item[:inventory_id] == inventory_item.id }&.dig(:quantity) || 0
+          adjust_quantity_available(inventory_item, quantity)
+        end
+      end
+    end
+
+    private
+
+    def adjust_quantity_available(inventory_item, quantity)
+      inventory_item.update!(quantity_available: inventory_item.quantity_available + quantity)
+    end
+
+    def inventory_items
+      @inventory_items ||= InventoryItem.where(id: inventory_id_and_quantities.pluck(:inventory_id))
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+module SpreeCmCommissioner
+  module Stock
+    class InventoryItemResetter < BaseInteractor
+      delegate :inventory_item, to: :context
+
+      def call
+        max_capacity = variant_total_inventory
+        total_purchases = variant_total_purchases
+        quantity_available = [max_capacity - total_purchases, 0].max
+
+        updated = inventory_item.update(max_capacity: max_capacity, quantity_available: quantity_available)
+        return context.fail!(message: 'Failed to update inventory item', errors: inventory_item.errors.full_messages) unless updated
+
+        clear_inventory_cache
+      end
+
+      def variant_total_inventory
+        # for shipment, total_on_hand is not orignal stock. shipment does subtract the stock.
+        # to get desire result, we need to add to total_purchase.
+        if inventory_item.variant.delivery_required?
+          inventory_item.variant.total_on_hand.to_i + variant_total_purchases
+        else
+          inventory_item.variant.total_on_hand.to_i
+        end
+      end
+
+      def variant_total_purchases
+        scope = inventory_item.variant.complete_line_items
+
+        if inventory_item.permanent_stock?
+          scope.where('? BETWEEN from_date AND to_date', inventory_item.inventory_date).sum(:quantity).to_i
+        else
+          scope.sum(:quantity).to_i
+        end
+      end
+
+      def clear_inventory_cache
+        SpreeCmCommissioner.redis_pool.with do |redis|
+          redis.del(inventory_item.redis_key)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module SpreeCmCommissioner
+  module Stock
+    class InventoryItemsAdjuster < BaseInteractor
+      delegate :variant, :quantity, to: :context
+
+      def call
+        variant.inventory_items.active.find_each do |inventory_item|
+          inventory_item.adjust_quantity!(quantity)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module SpreeCmCommissioner
+  module Stock
+    class InventoryItemsGenerator < BaseInteractor
+      delegate :variant, to: :context
+
+      def call
+        if variant.permanent_stock?
+          SpreeCmCommissioner::Stock::PermanentInventoryItemsGenerator.call(variant_ids: [variant.id])
+        else
+          variant.create_default_non_permanent_inventory_item! unless variant.default_inventory_item_exist?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,75 @@
+module SpreeCmCommissioner
+  module Stock
+    class PermanentInventoryItemsGenerator < BaseInteractor
+      delegate :variant_ids, to: :context
+
+      def variants_per_batch = 1000
+
+      def pre_inventory_days_for(variant)
+        context.pre_inventory_days || variant.pre_inventory_days
+      end
+
+      def call
+        variants.in_batches(of: variants_per_batch) do |batch|
+          generate_inventory_items_for_batch(batch)
+        end
+      end
+
+      private
+
+      def generate_inventory_items_for_batch(batch)
+        total_on_hand_by_variant = total_on_hand_for(batch)
+        batch.each do |variant|
+          count_on_hand = total_on_hand_by_variant[variant.id] || 0
+          generate_inventory_items_for_variant(variant, count_on_hand)
+        end
+      end
+
+      def generate_inventory_items_for_variant(variant, count_on_hand)
+        inventory_dates_for(variant).each do |inventory_date|
+          next if inventory_exist?(variant, inventory_date)
+
+          create_inventory_item(variant, inventory_date, count_on_hand)
+        end
+      end
+
+      def inventory_dates_for(variant)
+        start_date = Time.zone.tomorrow
+        end_date = Time.zone.today + pre_inventory_days_for(variant)
+
+        (start_date..end_date)
+      end
+
+      def inventory_exist?(variant, inventory_date)
+        variant.inventory_items.exists?(inventory_date: inventory_date)
+      end
+
+      def create_inventory_item(variant, inventory_date, count_on_hand)
+        variant.inventory_items.create!(
+          inventory_date: inventory_date,
+          quantity_available: count_on_hand,
+          max_capacity: count_on_hand,
+          product_type: variant.product_type
+        )
+      end
+
+      # Returns a hash: { variant_id => total_on_hand, ... }
+      def total_on_hand_for(variants)
+        variant_ids = variants.pluck(:id)
+
+        Spree::StockItem
+          .joins(:stock_location)
+          .where(deleted_at: nil, variant_id: variant_ids)
+          .where(spree_stock_locations: { active: true })
+          .group(:variant_id)
+          .sum(:count_on_hand)
+      end
+
+      def variants
+        scope = Spree::Variant.active.with_permanent_stock.where(is_master: false)
+        scope = scope.where(id: variant_ids) if variant_ids.present?
+        scope
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module SpreeCmCommissioner
+  module Stock
+    class StockMovementCreator < BaseInteractor
+      delegate :variant_id, :stock_location_id, :current_store, :stock_movement_params, to: :context
+
+      def call
+        variant = current_store.variants.find(variant_id)
+
+        return context.fail!(message: Spree.t(:doesnt_track_inventory)) unless variant.track_inventory?
+
+        stock_location = Spree::StockLocation.find(stock_location_id)
+        stock_movement = stock_location.stock_movements.build(stock_movement_params)
+        stock_movement.stock_item = stock_location.set_up_stock_item(variant)
+
+        if stock_movement.save
+          adjust_inventory_items_async(variant_id, stock_movement.quantity)
+          context.stock_movement = stock_movement
+        else
+          context.fail!(message: stock_movement.errors.full_messages.join(', '))
+        end
+      end
+
+      private
+
+      def adjust_inventory_items_async(variant_id, quantity)
+        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
+  end
+end

data/app/interactors/spree_cm_commissioner/vattanac_bank_initiator.rb

@@ -93,10 +93,6 @@ module SpreeCmCommissioner
       context.fail!(message: "User creation failed: #{context.user.errors.full_messages.join(', ')}")
     end
 
-    def disable_services
-      'bus,ferry'
-    end
-
     def construct_data
       user = context.user
 
@@ -105,7 +101,7 @@ module SpreeCmCommissioner
         name: user.full_name,
         phone: user.phone_number,
         email: user.email,
-        webUrl: "#{Spree::Store.default.formatted_url}/vattanac_bank_web_app?session_id=#{session_id}&ds=#{CGI.escape(disable_services)}"
+        webUrl: "#{Spree::Store.default.formatted_url}/vattanac_bank_web_app?session_id=#{session_id}"
       }
 
       json_data = raw_data.to_json

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,23 @@ 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?
 
-      date_range = (from_date.to_date..to_date.to_date).to_a
-      date_range.pop if date_range.size > 1
-      date_range
+      (from_date.to_date..to_date.to_date).to_a
     end
 
-    def date_range_including_checkout
-      return [] unless date_present?
-
-      (from_date.to_date..to_date.to_date).to_a
+    def checkin_date
+      from_date&.to_date
     end
 
-    def date_range
-      if accommodation?
-        date_range_excluding_checkout
-      else
-        date_range_including_checkout
-      end
+    def checkout_date
+      return to_date ? to_date.to_date - 1.day : nil if accommodation?
+
+      to_date&.to_date
     end
 
     private

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 = {
@@ -47,12 +40,7 @@ module SpreeCmCommissioner
       'bib-zerofill' => 'integer',
       '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-number-positions' => 'array'
     }.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