spree_cm_commissioner 2.0.0 → 2.0.1.pre.pre

data/app/models/spree_cm_commissioner/line_item_decorator.rb

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
   module LineItemDecorator
-    def self.prepended(base) # rubocop:disable Metrics/MethodLength
+    def self.prepended(base) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
       include_modules(base)
 
       base.belongs_to :accepter, class_name: 'Spree::User', optional: true
@@ -10,31 +10,32 @@ module SpreeCmCommissioner
       base.has_one :google_wallet, class_name: 'SpreeCmCommissioner::GoogleWallet', through: :product
 
       base.has_many :option_types, through: :product
+
+      base.has_many :inventory_items, lambda { |line_item|
+        where(inventory_date: nil).or(where(inventory_date: line_item.date_range))
+      }, through: :variant
+
       base.has_many :taxons, class_name: 'Spree::Taxon', through: :product
       base.has_many :guests, class_name: 'SpreeCmCommissioner::Guest', dependent: :destroy
+      base.has_many :guests_with_blocks, -> { where.not(block_id: nil) }, class_name: 'SpreeCmCommissioner::Guest'
+      base.has_many :reserved_blocks, through: :guests, class_name: 'SpreeCmCommissioner::ReservedBlock'
       base.has_many :pending_guests, pending_guests_query, class_name: 'SpreeCmCommissioner::Guest', dependent: :destroy
       base.has_many :product_completion_steps, class_name: 'SpreeCmCommissioner::ProductCompletionStep', through: :product
-      base.has_many :line_item_seats, class_name: 'SpreeCmCommissioner::LineItemSeat', dependent: :destroy
 
       base.before_save :update_vendor_id
-      base.before_save :update_quantity, if: :transit?
-
-      base.validate :validate_seats_reservation, if: :transit?
 
       base.before_create :add_due_date, if: :subscription?
+      base.before_save -> { self.product_type = variant.product_type }, if: -> { product_type.nil? }
 
       base.validate :ensure_not_exceed_max_quantity_per_order, if: -> { variant&.max_quantity_per_order.present? }
 
       base.whitelisted_ransackable_associations |= %w[guests order]
       base.whitelisted_ransackable_attributes |= %w[number to_date from_date vendor_id]
 
-      base.delegate :delivery_required?, :permanent_stock?, :high_demand, :transit?,
+      base.delegate :delivery_required?, :high_demand,
                     to: :variant
-      base.delegate :discontinue_on, :product_type, :accommodation?, :service?, :ecommerce?, :need_confirmation,
-                    to: :product
 
       base.accepts_nested_attributes_for :guests, allow_destroy: true
-      base.accepts_nested_attributes_for :line_item_seats, allow_destroy: true
 
       def base.json_api_columns
         json_api_columns = column_names.reject { |c| c.match(/_id$|id|preferences|(.*)password|(.*)token|(.*)api_key/) }
@@ -42,6 +43,10 @@ module SpreeCmCommissioner
         json_api_columns << :vendor_id
       end
 
+      def discontinue_on
+        variant.discontinue_on || product.discontinue_on
+      end
+
       def base.search_by_qr_data!(data)
         matches = data.match(/(R\d+)-([A-Za-z0-9_\-]+)-(L\d+)/)&.captures
 
@@ -60,6 +65,7 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::LineItemDurationable
       base.include SpreeCmCommissioner::LineItemsFilterScope
       base.include SpreeCmCommissioner::LineItemGuestsConcern
+      base.include SpreeCmCommissioner::ProductType
       base.include SpreeCmCommissioner::ProductDelegation
       base.include SpreeCmCommissioner::KycBitwise
     end
@@ -75,24 +81,39 @@ module SpreeCmCommissioner
       }
     end
 
-    def reservation?
-      date_present? && !subscription?
-    end
+    # override to calculate price per date for permanent stock
+    def update_price_from_modifier(currency, opts)
+      self.currency = currency
 
-    # date_unit could be number of nights, or days or hours depending on usecases
-    # For example:
-    # - accomodation uses number of nights.
-    # - appointment uses number of hours, etc.
-    #
-    # override
-    def amount
-      base_price = price * quantity
+      # these fields can be null during this process below.
+      # it is needed for permanent_stock?, date_range to work.
+      self.product_type = variant.product_type
+      self.from_date = opts.delete(:from_date)&.to_date
+      self.to_date = opts.delete(:to_date)&.to_date
 
-      if permanent_stock? && date_unit.present?
-        base_price * date_unit
-      else
-        base_price
-      end
+      base_price = variant.price_in(currency)
+
+      self.price = if permanent_stock?
+                     date_range.map do |date|
+                       selected_price = variant.price_for_date(date: date, currency: currency) || base_price
+                       (selected_price.amount || 0) + variant.price_modifier_amount_in(currency, opts.merge(date: date))
+                     end.sum
+                   else
+                     (base_price.amount || 0) + variant.price_modifier_amount_in(currency, opts)
+                   end
+    end
+
+    # override to calculate price per date for permanent stock
+    def update_price
+      base_price = variant.price_in(order.currency)
+      self.price = if permanent_stock?
+                     date_range.map do |date|
+                       selected_price = variant.price_for_date(date: date, currency: order.currency) || base_price
+                       selected_price.amount || 0
+                     end.sum
+                   else
+                     base_price.amount || 0
+                   end
     end
 
     def allowed_self_check_in?
@@ -179,8 +200,6 @@ module SpreeCmCommissioner
 
     # override
     def sufficient_stock?
-      return transit_sufficient_stock? if variant.product.product_type == 'transit'
-
       SpreeCmCommissioner::Stock::LineItemAvailabilityChecker.new(self).can_supply?(quantity)
     end
 
@@ -199,18 +218,6 @@ module SpreeCmCommissioner
       errors.add(:quantity, 'exceeded_max_quantity_per_order') if quantity > variant.max_quantity_per_order
     end
 
-    def transit_sufficient_stock?
-      return selected_seats_available? if reservation_trip.allow_seat_selection
-
-      seat_quantity_available?(reservation_trip)
-    end
-
-    def update_quantity
-      return if line_item_seats.blank?
-
-      self.quantity = line_item_seats.size
-    end
-
     def update_vendor_id
       self.vendor_id = variant.vendor_id
     end
@@ -233,45 +240,6 @@ module SpreeCmCommissioner
 
       from_date + variant.month.month + day.days
     end
-
-    def validate_seats_reservation
-      if reservation_trip.allow_seat_selection && !selected_seats_available?
-        errors.add(:base, :some_seats_are_booked, message: 'Some seats are already booked')
-      elsif !reservation_trip.allow_seat_selection && !seat_quantity_available?(reservation_trip)
-        errors.add(:quantity, :exceeded_available_quantity, message: 'exceeded available quantity')
-      end
-    end
-
-    def selected_seats_available?
-      selected_seat_ids = line_item_seats.map(&:seat_id)
-      !selected_seat_ids_occupied?(selected_seat_ids)
-    end
-
-    def seat_quantity_available?(trip)
-      booked_quantity = Spree::LineItem.joins(:order)
-                                       .where(variant_id: variant_id, date: date, spree_orders: { state: 'complete' })
-                                       .where.not(spree_line_items: { id: id })
-                                       .sum(:quantity)
-      remaining_quantity = trip.vehicle.number_of_seats - booked_quantity
-      remaining_quantity >= quantity
-    end
-
-    def reservation_trip
-      return @trip if defined? @trip
-
-      route = Spree::Variant.find_by(id: variant_id).product
-      @trip = route.trip
-    end
-
-    def selected_seat_ids_occupied?(selected_seat_ids)
-      # check to see if there are any selected_ids exist in the line_item_seats and belongs to completed order
-      SpreeCmCommissioner::LineItemSeat.joins(line_item: :order)
-                                       .where(seat_id: selected_seat_ids, date: date, variant_id: variant_id, spree_orders: { state: 'complete',
-                                                                                                                              canceled_at: nil
-}
-                                       )
-                                       .present?
-    end
   end
 end
 

data/app/models/spree_cm_commissioner/notification_taxon.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  class NotificationTaxon < SpreeCmCommissioner::Base
+  class NotificationTaxon < Base
     belongs_to :customer_notification, class_name: 'SpreeCmCommissioner::CustomerNotification'
     belongs_to :taxon, class_name: 'Spree::Taxon'
   end

data/app/models/spree_cm_commissioner/option_type_decorator.rb

@@ -6,7 +6,7 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::ParameterizeName
       base.include SpreeCmCommissioner::OptionTypeAttrType
 
-      base.enum kind: %i[variant product vendor vehicle_type transit]
+      base.enum kind: %i[variant product vendor vehicle]
 
       base.validates :name, presence: true
 
@@ -19,16 +19,6 @@ module SpreeCmCommissioner
       base.scope :promoted, -> { where(promoted: true) }
       base.whitelisted_ransackable_attributes = %w[kind]
 
-      def base.amenities
-        Spree::OptionType.where(kind: 'vehicle_type', name: 'amenities', presentation: 'Amenities', attr_type: 'amenity').first_or_create
-      end
-
-      def base.vehicle
-        Spree::OptionType.where(presentation: 'vehicle', attr_type: 'vehicle_id', kind: 'variant',
-                                name: 'vehicle'
-        ).first_or_create
-      end
-
       def base.rules_option_type
         Spree::OptionType.find_by(name: RULES_OPTION_TYPE_NAME)
       end

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -2,6 +2,7 @@ module SpreeCmCommissioner
   module OrderDecorator
     def self.prepended(base) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
       base.include SpreeCmCommissioner::PhoneNumberSanitizer
+      base.include SpreeCmCommissioner::OrderSeatable
       base.include SpreeCmCommissioner::OrderStateMachine
 
       base.scope :subscription, -> { where.not(subscription_id: nil) }
@@ -42,6 +43,8 @@ module SpreeCmCommissioner
       base.has_many :vendors, through: :products, class_name: 'Spree::Vendor'
       base.has_many :taxons, through: :products, class_name: 'Spree::Taxon'
       base.has_many :guests, through: :line_items, class_name: 'SpreeCmCommissioner::Guest'
+      base.has_many :blocks, through: :guests, class_name: 'SpreeCmCommissioner::Block', source: :block
+      base.has_many :reserved_blocks, through: :guests, class_name: 'SpreeCmCommissioner::ReservedBlock'
       base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variants
 
       base.delegate :customer, to: :user, allow_nil: true
@@ -58,6 +61,13 @@ module SpreeCmCommissioner
       end
     end
 
+    # override
+    # spree use this method to check stock availability & consider whether :order can continue to next state.
+    def insufficient_stock_lines
+      checker = SpreeCmCommissioner::Stock::OrderAvailabilityChecker.new(self)
+      checker.insufficient_stock_lines
+    end
+
     def ticket_seller_user?
       return false if user.nil?
 
@@ -106,7 +116,14 @@ module SpreeCmCommissioner
     end
 
     def mark_as_archive
-      update(archived_at: Time.current)
+      blocks_canceled = begin
+        cancel_blocks!
+        true
+      rescue StandardError
+        false
+      end
+
+      update(archived_at: Time.current) if blocks_canceled
     end
 
     # overrided
@@ -199,6 +216,18 @@ module SpreeCmCommissioner
 
     private
 
+    def unstock_inventory_in_redis!
+      CmAppLogger.log(label: "#{self.class.name}#unstock_inventory_in_redis!", data: { order_id: id }) do
+        SpreeCmCommissioner::RedisStock::InventoryUpdater.new(line_item_ids).unstock!
+      end
+    end
+
+    def restock_inventory_in_redis!
+      CmAppLogger.log(label: "#{self.class.name}#restock_inventory_in_redis!", data: { order_id: id }) do
+        SpreeCmCommissioner::RedisStock::InventoryUpdater.new(line_item_ids).restock!
+      end
+    end
+
     # override :spree_api
     def webhook_payload_body
       resource_serializer.new(

data/app/models/spree_cm_commissioner/place.rb

@@ -1,7 +1,5 @@
-require_dependency 'spree_cm_commissioner'
-
 module SpreeCmCommissioner
-  class Place < ApplicationRecord
+  class Place < Base
     acts_as_nested_set
 
     validates :reference, presence: true, if: :validate_reference?
@@ -17,7 +15,6 @@ module SpreeCmCommissioner
     has_many :products, through: :product_places
 
     has_many :children, -> { order(:lft) }, class_name: 'SpreeCmCommissioner::Place', foreign_key: :parent_id, dependent: :destroy
-    has_many :vendor_stops, class_name: 'SpreeCmCommissioner::VendorStop', dependent: :destroy, foreign_key: :stop_id
 
     has_many :taxon_places, class_name: 'SpreeCmCommissioner::TaxonPlace', dependent: :destroy
     has_many :taxons, through: :taxon_places

data/app/models/spree_cm_commissioner/price_decorator.rb

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  module PriceDecorator
+    def self.prepended(base)
+      base.belongs_to :inventory_item, class_name: 'SpreeCmCommissioner::InventoryItem', inverse_of: :prices, optional: true
+    end
+  end
+end
+
+Spree::Price.prepend(SpreeCmCommissioner::PriceDecorator) unless Spree::Price.included_modules.include?(SpreeCmCommissioner::PriceDecorator)

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -6,7 +6,6 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::KycBitwise
       base.include SpreeCmCommissioner::Metafield
       base.include SpreeCmCommissioner::TenantUpdatable
-      base.include SpreeCmCommissioner::RouteType
 
       base.has_many :variant_kind_option_types, -> { where(kind: :variant).order(:position) },
                     through: :product_option_types, source: :option_type
@@ -33,6 +32,7 @@ module SpreeCmCommissioner
       base.has_one :google_wallet, class_name: 'SpreeCmCommissioner::GoogleWallet', dependent: :destroy
 
       base.has_many :complete_line_items, through: :classifications, source: :line_items
+      base.has_many :inventory_items, through: :variants
       base.has_many :guests, through: :line_items
 
       base.has_many :product_places, class_name: 'SpreeCmCommissioner::ProductPlace', dependent: :destroy
@@ -64,20 +64,17 @@ module SpreeCmCommissioner
       base.before_validation :set_event_id
 
       base.validate :validate_event_taxons, if: -> { taxons.event.present? }
-
       base.validate :validate_product_date, if: -> { available_on.present? && discontinue_on.present? }
-
+      base.validate :product_type_unchanged, on: :update
       base.validates :commission_rate, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 100 }, allow_nil: true
 
-      base.whitelisted_ransackable_attributes = %w[description name slug discontinue_on status vendor_id short_name route_type]
+      base.whitelisted_ransackable_attributes = %w[description name slug discontinue_on status vendor_id short_name]
 
       base.after_update :update_variants_vendor_id, if: :saved_change_to_vendor_id?
       base.after_update :sync_event_id_to_children, if: :saved_change_to_event_id?
 
       base.enum purchasable_on: { both: 0, web: 1, app: 2 }
 
-      base.accepts_nested_attributes_for :trip, allow_destroy: true
-
       base.multi_tenant :tenant, class_name: 'SpreeCmCommissioner::Tenant'
       base.before_save :set_tenant
     end
@@ -86,28 +83,6 @@ module SpreeCmCommissioner
       "#{Spree::Store.default.formatted_url}/tickets/#{slug}"
     end
 
-    def dynamic_fields_by_collection_phase
-      {
-        pre_registration: dynamic_fields.pre_registration.order(:position),
-        post_registration: dynamic_fields.post_registration.order(:position),
-        during_check_in: dynamic_fields.during_check_in.order(:position)
-      }
-    end
-
-    def required_dynamic_fields_completed?(guest, phase)
-      required_fields = dynamic_fields.where(data_fill_stage: phase)
-      return true if required_fields.empty?
-
-      filled_ids = guest.guest_dynamic_fields.where(dynamic_field_id: required_fields.select(:id)).pluck(:dynamic_field_id)
-      (required_fields.pluck(:id) - filled_ids).empty?
-    end
-
-    def required_fields_for_guest(guest)
-      dynamic_fields_by_collection_phase.transform_values do |fields|
-        fields.select { |field| guest.guest_dynamic_fields.where(dynamic_field: field).empty? }
-      end
-    end
-
     private
 
     def set_tenant
@@ -136,6 +111,13 @@ module SpreeCmCommissioner
 
       errors.add(:discontinue_on, 'must be after the available on date')
     end
+
+    def product_type_unchanged
+      return if product_type_was.nil?
+      return unless product_type_changed?
+
+      errors.add(:product_type, 'cannot be changed once set')
+    end
   end
 end
 

data/app/models/spree_cm_commissioner/redis_stock/cached_inventory_items_builder.rb

@@ -0,0 +1,41 @@
+module SpreeCmCommissioner
+  module RedisStock
+    class CachedInventoryItemsBuilder
+      attr_reader :inventory_items
+
+      def initialize(inventory_items)
+        @inventory_items = inventory_items
+      end
+
+      # output: [ CachedInventoryItem(...), CachedInventoryItem(...) ]
+      def call
+        keys = inventory_items.map { |item| "inventory:#{item.id}" }
+        return [] unless keys.any?
+
+        counts = SpreeCmCommissioner.redis_pool.with { |redis| redis.mget(*keys) }
+        inventory_items.map.with_index do |inventory_item, i|
+          ::SpreeCmCommissioner::CachedInventoryItem.new(
+            inventory_key: keys[i],
+            active: inventory_item.active?,
+            quantity_available: cache_inventory(keys[i], inventory_item, counts[i]),
+            inventory_item_id: inventory_item.id,
+            variant_id: inventory_item.variant_id
+          )
+        end
+      end
+
+      private
+
+      def cache_inventory(key, inventory_item, count_in_redis)
+        return count_in_redis.to_i if count_in_redis.present?
+        return inventory_item.quantity_available unless inventory_item.active?
+
+        SpreeCmCommissioner.redis_pool.with do |redis|
+          redis.set(key, inventory_item.quantity_available, ex: inventory_item.redis_expired_in)
+        end
+
+        inventory_item.quantity_available
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/redis_stock/inventory_updater.rb

@@ -0,0 +1,126 @@
+module SpreeCmCommissioner
+  module RedisStock
+    class InventoryUpdater
+      class UnableToRestock < StandardError; end
+      class UnableToUnstock < StandardError; end
+
+      def initialize(line_item_ids)
+        @line_item_ids = line_item_ids
+      end
+
+      def unstock!
+        keys, quantities, inventory_ids = extract_inventory_data
+
+        raise UnableToUnstock, Spree.t(:insufficient_stock_lines_present) unless unstock(keys, quantities)
+
+        inventory_id_and_quantities = inventory_ids.map.with_index do |inventory_id, i|
+          { inventory_id: inventory_id, quantity: -quantities[i] }
+        end
+
+        schedule_sync_inventory(inventory_id_and_quantities)
+      end
+
+      def restock!
+        keys, quantities, inventory_ids = extract_inventory_data
+
+        raise UnableToRestock unless restock(keys, quantities)
+
+        inventory_id_and_quantities = inventory_ids.map.with_index do |inventory_id, i|
+          { inventory_id: inventory_id, quantity: quantities[i] }
+        end
+
+        schedule_sync_inventory(inventory_id_and_quantities)
+      end
+
+      private
+
+      # only unstock or restock when variants is available, track inventory, not backorderable & not need_confirmation.
+      # otherwise, we can ignore them.
+      def line_items
+        return @line_items if defined?(@line_items)
+
+        @line_items = Spree::LineItem.where(id: @line_item_ids).includes(variant: :stock_items)
+        @line_items = @line_items.map do |line_item|
+          next unless line_item.variant.available?
+          next unless line_item.variant.should_track_inventory?
+          next if line_item.variant.backorderable?
+          next if line_item.variant.need_confirmation?
+
+          line_item
+        end.compact
+      end
+
+      def unstock(keys, quantities)
+        SpreeCmCommissioner.redis_pool.with do |redis|
+          redis.eval(unstock_redis_script, keys: keys, argv: quantities)
+        end.positive?
+      end
+
+      def restock(keys, quantities)
+        SpreeCmCommissioner.redis_pool.with do |redis|
+          redis.eval(restock_redis_script, keys: keys, argv: quantities)
+        end.positive?
+      end
+
+      # Return: [CachedInventoryItem(...), CachedInventoryItem(...)]
+      def cached_inventory_items
+        @cached_inventory_items ||= SpreeCmCommissioner::RedisStock::LineItemsCachedInventoryItemsBuilder.new(line_item_ids: line_items.pluck(:id))
+                                                                                                         .call.values.flatten
+      end
+
+      def extract_inventory_data
+        keys = []
+        quantities = []
+        inventory_ids = []
+
+        cached_inventory_items.each do |cached_inventory_item|
+          keys << cached_inventory_item.inventory_key
+          quantities << line_items.find { |item| item.variant_id == cached_inventory_item.variant_id }.quantity
+          inventory_ids << cached_inventory_item.inventory_item_id
+        end
+
+        [keys, quantities, inventory_ids]
+      end
+
+      def unstock_redis_script
+        <<~LUA
+          local keys = KEYS
+          local quantities = ARGV
+
+          -- Check availability first
+          for i, key in ipairs(keys) do
+            local current = tonumber(redis.call('GET', key) or 0)
+            if current - tonumber(quantities[i]) < 0 then
+              return 0
+            end
+          end
+
+          -- Apply updates
+          for i, key in ipairs(keys) do
+            redis.call('DECRBY', key, tonumber(quantities[i]))
+          end
+
+          return 1
+        LUA
+      end
+
+      def restock_redis_script
+        <<~LUA
+          local keys = KEYS
+          local quantities = ARGV
+
+          -- Apply restock updates
+          for i, key in ipairs(keys) do
+            redis.call('INCRBY', key, tonumber(quantities[i]))
+          end
+
+          return 1
+        LUA
+      end
+
+      def schedule_sync_inventory(inventory_id_and_quantities)
+        SpreeCmCommissioner::InventoryItemSyncerJob.perform_later(inventory_id_and_quantities:)
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/redis_stock/line_items_cached_inventory_items_builder.rb

@@ -0,0 +1,36 @@
+module SpreeCmCommissioner
+  module RedisStock
+    class LineItemsCachedInventoryItemsBuilder
+      attr_reader :line_item_ids
+
+      def initialize(line_item_ids:)
+        @line_item_ids = line_item_ids
+      end
+
+      # return list of inventory items group by :line_item_id:
+      # {
+      #   1: [ CachedInventoryItem(...), CachedInventoryItem(...) ],
+      #   2: [ CachedInventoryItem(...), CachedInventoryItem(...) ],
+      # }
+      def call
+        cached_inventory_items.group_by do |cached_inventory_item|
+          line_item = line_items.find { |item| item.variant_id == cached_inventory_item.variant_id }
+          line_item.id
+        end
+      end
+
+      def cached_inventory_items
+        @cached_inventory_items ||= SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new(inventory_items)
+                                                                                                .call
+      end
+
+      def inventory_items
+        @inventory_items ||= line_items.flat_map(&:inventory_items)
+      end
+
+      def line_items
+        @line_items ||= Spree::LineItem.where(id: line_item_ids).includes(:inventory_items)
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/redis_stock/variant_cached_inventory_items_builder.rb

@@ -0,0 +1,25 @@
+module SpreeCmCommissioner
+  module RedisStock
+    class VariantCachedInventoryItemsBuilder
+      attr_reader :variant_id, :dates
+
+      def initialize(variant_id:, dates: [])
+        @variant_id = variant_id
+        @dates = dates
+      end
+
+      # output: [ CachedInventoryItem(...), CachedInventoryItem(...) ]
+      def call
+        ::SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new(inventory_items).call
+      end
+
+      def inventory_items
+        variant = Spree::Variant.find(variant_id)
+
+        inventory_items = variant.inventory_items
+        inventory_items = inventory_items.where(inventory_date: dates) if variant.permanent_stock?
+        inventory_items
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/reserved_block.rb

@@ -0,0 +1,30 @@
+module SpreeCmCommissioner
+  class ReservedBlock < Base
+    has_paper_trail
+
+    belongs_to :updated_by, optional: true, class_name: 'Spree::User'
+    belongs_to :guest, optional: true, class_name: 'SpreeCmCommissioner::Guest'
+    belongs_to :inventory_item, class_name: 'SpreeCmCommissioner::InventoryItem'
+    belongs_to :block, class_name: 'SpreeCmCommissioner::Block'
+
+    enum status: {
+      reserved: 0, # confirmed reservation
+      on_hold: 1, # temporary hold
+      canceled: 2
+    }
+
+    validates :status, presence: true
+    validates :expired_at, presence: true, if: -> { on_hold? }
+
+    scope :active_on_hold, -> { on_hold.where('expired_at IS NULL OR expired_at > ?', Time.current) }
+    scope :active, -> { where('expired_at IS NULL OR expired_at > ?', Time.current) }
+
+    def expired?
+      expired_at.present? && expired_at <= Time.current
+    end
+
+    def active_on_hold?
+      on_hold? && !expired?
+    end
+  end
+end