spree_cm_commissioner 1.18.2.pre.pre1 → 2.0.0.pre.pre

data/lib/spree_cm_commissioner/cached_inventory_item.rb

@@ -0,0 +1,23 @@
+module SpreeCmCommissioner
+  class CachedInventoryItem
+    attr_reader :inventory_key, :active, :quantity_available, :inventory_item_id, :variant_id
+
+    def initialize(inventory_key:, active:, quantity_available:, inventory_item_id:, variant_id:)
+      @inventory_key = inventory_key
+      @active = active
+      @quantity_available = quantity_available
+      @inventory_item_id = inventory_item_id
+      @variant_id = variant_id
+    end
+
+    def active?
+      active
+    end
+
+    def to_h
+      instance_variables.each_with_object({}) do |var, hash|
+        hash[var.to_s.delete('@').to_sym] = instance_variable_get(var)
+      end
+    end
+  end
+end

data/lib/spree_cm_commissioner/calendar_event.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   class CalendarEvent
     attr_reader :from_date, :to_date, :title, :options
 
-    def initialize(from_date:, to_date:, title:, options:)
+    def initialize(from_date:, to_date:, title: nil, options: nil)
       @from_date = from_date
       @to_date = to_date
       @title = title
@@ -23,5 +23,15 @@ module SpreeCmCommissioner
         )
       end
     end
+
+    def self.from_inventory_items(inventory_items)
+      inventory_items.map do |item|
+        CalendarEvent.new(
+          from_date: item.inventory_date,
+          to_date: item.inventory_date,
+          options: { inventory_item: item }
+        )
+      end
+    end
   end
 end

data/lib/spree_cm_commissioner/test_helper/factories/block_factory.rb

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :cm_block, class: SpreeCmCommissioner::Block do
+    association :seat_section, factory: :cm_seat_section
+
+    label { "A1" }
+    row_index { 1 }
+    column_index { 1 }
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/guest_factory.rb

@@ -1,4 +1,5 @@
 FactoryBot.define do
+  # use cm_guest instead for consistency
   factory :guest, class: SpreeCmCommissioner::Guest do
     line_item { |a| a.association(:line_item) }
     first_name { FFaker::Name.name }
@@ -7,4 +8,13 @@ FactoryBot.define do
     dob { '1986-03-28' }
     token { SecureRandom.hex(32) }
   end
+
+  factory :cm_guest, class: SpreeCmCommissioner::Guest do
+    line_item { |a| a.association(:line_item) }
+    first_name { FFaker::Name.name }
+    last_name { FFaker::Name.name }
+    gender { 1 }
+    dob { '1986-03-28' }
+    token { SecureRandom.hex(32) }
+  end
 end

data/lib/spree_cm_commissioner/test_helper/factories/homepage_section_relatable_factory.rb

@@ -17,7 +17,7 @@ FactoryBot.define do
     end
 
     factory :cm_product_homepage_section_relatable do
-      relatable { create(:product) }
+      relatable { create(:cm_product) }
     end
 
     factory :cm_taxon_homepage_section_relatable do

data/lib/spree_cm_commissioner/test_helper/factories/inventory_item_factory.rb

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :cm_inventory_item, class: SpreeCmCommissioner::InventoryItem do
+    variant { create(:cm_variant) }
+    max_capacity { 10 }
+    quantity_available { 10 }
+    product_type { 'accommodation' }
+    inventory_date { Date.today }
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/line_item_factory.rb

@@ -16,7 +16,7 @@ FactoryBot.define do
     variant { product.master }
 
     factory :cm_need_confirmation_line_item do
-      product { create(:product, need_confirmation: true) }
+      product { create(:cm_product, need_confirmation: true) }
     end
 
     factory :cm_kyc_line_item do

data/lib/spree_cm_commissioner/test_helper/factories/option_type_factory.rb

@@ -9,6 +9,12 @@ FactoryBot.define do
       presentation { 'location' }
     end
 
+    trait :vehicle do
+      attr_type { :string }
+      name { 'vehicle' }
+      presentation { 'vehicle' }
+    end
+
     trait :start_date do
       attr_type { :date }
       name { 'start-date' }
@@ -147,36 +153,6 @@ FactoryBot.define do
       presentation { 'seat-number-positions' }
     end
 
-    trait :origin do
-      attr_type { :origin }
-      name { 'origin' }
-      presentation { 'origin' }
-    end
-
-    trait :destination do
-      attr_type { :destination }
-      name { 'destination' }
-      presentation { 'destination' }
-    end
-
-    trait :departure_time do
-      attr_type { :time }
-      name { 'departure-time' }
-      presentation { 'departure-time' }
-    end
-
-    trait :vehicle do
-      attr_type { :vehicle_id }
-      name { 'vehicle' }
-      presentation { 'vehicle' }
-    end
-
-    trait :allow_seat_selection do
-      attr_type { :boolean }
-      name { 'allow-seat-selection' }
-      presentation { 'allow-seat-selection' }
-    end
-
     initialize_with { Spree::OptionType.where(name: name).first_or_initialize }
   end
 end

data/lib/spree_cm_commissioner/test_helper/factories/order_factory.rb

@@ -1,38 +1,2 @@
 FactoryBot.define do
-  factory :transit_order, class: Spree::Order do
-    bill_address
-    ship_address
-    state {'complete'}
-    payment_state {'paid'}
-
-    transient do
-      line_items_count       { 1 }
-      shipment_cost          { 100 }
-      shipping_method_filter { Spree::ShippingMethod::DISPLAY_ON_FRONT_END }
-      seats {}
-      variant {}
-      quantity {}
-      date { Date.today }
-      selected_seats {[]}
-      line_item_seats_attributes{[]}
-    end
-
-    after(:create) do |order, evaluator|
-      if evaluator.quantity.nil? && evaluator.seats.present?
-        @line_item_seats_attributes =  evaluator.seats.map do |seat|
-          {seat_id: seat.id, date: evaluator.date, variant_id: evaluator.variant.id}
-        end
-        create(:line_item, order: order, variant: evaluator.variant, date: evaluator.date, line_item_seats_attributes: @line_item_seats_attributes)
-        order.line_items.reload
-      else
-        create(:line_item, order: order, variant: evaluator.variant, date: evaluator.date, quantity: evaluator.quantity)
-      end
-
-      stock_location = order.line_items&.first&.variant&.stock_items&.first&.stock_location || create(:stock_location)
-      create(:shipment, order: order, cost: evaluator.shipment_cost, stock_location: stock_location)
-      order.shipments.reload
-
-      order.update_with_updater!
-    end
-  end
 end

data/lib/spree_cm_commissioner/test_helper/factories/product_factory.rb

@@ -1,6 +1,19 @@
 FactoryBot.define do
-  factory :cm_product, parent: :base_product do
+  factory :cm_product_in_stock, parent: :product_in_stock do
+    product_type { :ecommerce }
+  end
+
+  factory :cm_product_with_option_types, parent: :product_with_option_types do
+    product_type { :ecommerce }
+  end
+
+  factory :cm_base_product, parent: :base_product do
+    product_type { :ecommerce }
+  end
+
+  factory :cm_product, parent: :product do
     vendor { Spree::Vendor.first || create(:cm_vendor) }
+    product_type { :ecommerce }
 
     before(:create) do |product|
       create(:stock_location) unless Spree::StockLocation.any?
@@ -33,35 +46,6 @@ FactoryBot.define do
       end
     end
 
-    factory :route do
-      route_type {:automobile}
-      product_type { :transit }
-      before(:create) do |route, evaluator|
-        create(:stock_location) unless Spree::StockLocation.any?
-        if route.stores.empty?
-          default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
-          store = default_store || create(:store)
-
-          route.stores << [store]
-        end
-      end
-      after(:create) do |route, evaluator|
-        trip = route.master
-        trip.permanent_stock = 10
-        trip.stock_items = [create(:stock_item, variant: trip, stock_location: route.vendor.stock_locations.first)]
-        trip.stock_items.first.adjust_count_on_hand(10)
-
-        # option types
-        route.option_types << create(:cm_option_type, :origin)
-        route.option_types << create(:cm_option_type, :destination)
-        route.option_types << create(:cm_option_type, :departure_time)
-        route.option_types << create(:cm_option_type, :duration_in_hours)
-        route.option_types << create(:cm_option_type, :duration_in_minutes)
-        route.option_types << create(:cm_option_type, :allow_seat_selection)
-        route.option_types << create(:cm_option_type, :vehicle)
-      end
-    end
-
     factory :cm_subscribable_product do
       option_types { [
         create(:cm_option_type, :month),
@@ -85,7 +69,7 @@ FactoryBot.define do
         option_value2 = create(:cm_option_value, presentation: "#{evaluator.due_date} Days", name: evaluator.due_date.to_s, option_type: product.option_types[1])
         option_value3 = create(:cm_option_value, presentation: "#{evaluator.payment_option}", name: evaluator.payment_option.to_s, option_type: product.option_types[2])
 
-        variant = create(:variant, price: product.price, product: product)
+        variant = create(:cm_variant, price: product.price, product: product)
         variant.option_values = [option_value1, option_value2, option_value3]
         variant.save!
 
@@ -103,7 +87,7 @@ FactoryBot.define do
       end
 
       after(:create) do |product, evaluator|
-        variant = create(:variant, price: product.price, product: product)
+        variant = create(:cm_variant, price: product.price, product: product)
         variant.save!
 
         variant.stock_items.first.adjust_count_on_hand(evaluator.total_inventory)
@@ -136,12 +120,12 @@ FactoryBot.define do
           create(:cm_option_value, presentation: 'Yes', name: '1', option_type: product.option_types.find_by(name: 'bib-pre-generation-on-create'))
         end
 
-        variant1 = create(:variant, price: product.price, product: product)
+        variant1 = create(:cm_variant, price: product.price, product: product)
         variant1.option_values = [option_value1]
         variant1.option_values << bib_pre_generation_option_value if evaluator.bib_pre_generation_on_create
         variant1.save!
 
-        variant2 = create(:variant, price: product.price, product: product)
+        variant2 = create(:cm_variant, price: product.price, product: product)
         variant2.option_values = [option_value2]
         variant2.option_values << bib_pre_generation_option_value if evaluator.bib_pre_generation_on_create
         variant2.save!

data/lib/spree_cm_commissioner/test_helper/factories/reserved_block_factory.rb

@@ -0,0 +1,27 @@
+FactoryBot.define do
+  factory :cm_reserved_block, class: SpreeCmCommissioner::ReservedBlock do
+    association :inventory_item, factory: :cm_inventory_item
+    association :block, factory: :cm_block
+    association :guest, factory: :guest
+    association :updated_by, factory: :user
+
+    status { :on_hold }  # or :reserved, :canceled based on enum
+    inventory_date { Time.current }
+    expired_at { 10.minutes.from_now }
+
+    trait :reserved do
+      status { :reserved }
+      expired_at { nil }
+    end
+
+    trait :on_hold do
+      status { :on_hold }
+      expired_at { 8.minutes.from_now }
+    end
+
+    trait :canceled do
+      status { :canceled }
+      expired_at { nil }
+    end
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/seat_layout_factory.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :cm_seat_layout, class: SpreeCmCommissioner::SeatLayout do
+    name { "VIP Layout" }
+    layout_type { :grid }
+    status { :active }
+    association :layoutable, factory: :cm_vehicle
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/seat_section_factory.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :cm_seat_section, class: SpreeCmCommissioner::SeatSection do
+    association :seat_layout, factory: :cm_seat_layout
+    name { "Front Section" }
+    row { 10 }
+    column { 10 }
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/stock_location_factory.rb

@@ -24,8 +24,8 @@ FactoryBot.define do
         # variant will add itself to all stock_locations in an after_create
         # creating a product will automatically create a master variant
         store = Spree::Store.first || create(:store)
-        product_1 = create(:product, stores: [store])
-        product_2 = create(:product, stores: [store])
+        product_1 = create(:cm_product, stores: [store])
+        product_2 = create(:cm_product, stores: [store])
 
         stock_location.stock_items.where(variant_id: product_1.master.id).first.adjust_count_on_hand(10)
         stock_location.stock_items.where(variant_id: product_2.master.id).first.adjust_count_on_hand(20)

data/lib/spree_cm_commissioner/test_helper/factories/trip_connection_factory.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :cm_trip_connection, class: SpreeCmCommissioner::TripConnection do
+    from_trip_id { create(:cm_trip) }
+    to_trip_id { create(:cm_trip) }
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/trip_factory.rb

@@ -1,6 +1,13 @@
 FactoryBot.define do
-  factory :trip_connection, class: 'SpreeCmCommissioner::TripConnection' do
-    association :from_trip, factory: :variant
-    association :to_trip, factory: :variant
+  factory :cm_trip, class: SpreeCmCommissioner::Trip do
+    departure_time { Time.zone.now.change(hour: 8, min: 0) } # example 8:00 AM
+    duration { 3600 } # 1 hour in seconds
+    allow_seat_selection { true }
+
+    product { create(:cm_product, product_type: :transit) }
+
+    association :vehicle, factory: :cm_vehicle
+    association :origin, factory: :cm_place
+    association :destination, factory: :cm_place
   end
 end

data/lib/spree_cm_commissioner/test_helper/factories/variant_block_factory.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :cm_variant_block, class: SpreeCmCommissioner::VariantBlock do
+    association :variant, factory: :cm_variant
+    association :trip, factory: :cm_trip
+    association :block, factory: :cm_block
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/variant_factory.rb

@@ -1,38 +1,60 @@
 FactoryBot.define do
   factory :cm_base_variant, parent: :base_variant do
+    is_master { false }
+    product { create(:cm_product) }
+
     transient do
       total_inventory { 10 }
+      backorderable { false }
+      pregenerate_inventory_items { true }
+      pre_inventory_days { nil } # optional for permanent only
     end
 
     after :create do |variant, evaluator|
       variant.stock_items.first.adjust_count_on_hand(evaluator.total_inventory)
-    end
-  end
+      variant.stock_items.update_all(backorderable: evaluator.backorderable)
 
-  factory :cm_variant, parent: :variant do
-    product do
-      stock_locations = [create(:stock_location)]
-      product = create(:product, vendor: create(:active_vendor, stock_locations: stock_locations))
-      product
+      # stock_items is created then enqueue create inventory items job
+      # but we want to create inventory items directly in this factory without waiting for job
+      if evaluator.pregenerate_inventory_items
+        if variant.permanent_stock?
+          SpreeCmCommissioner::Stock::PermanentInventoryItemsGenerator.call(variant_ids: [variant.id], pre_inventory_days: evaluator.pre_inventory_days || 3)
+        else
+          variant.create_default_non_permanent_inventory_item! unless variant.default_inventory_item_exist?
+        end
+      end
     end
   end
 
-  factory :trip, class: Spree::Variant do
-    permanent_stock { 5 }
+  factory :cm_variant, parent: :cm_base_variant do
+    product { create(:cm_product) }
+
     transient do
-      departure_time { "10:00" }
-      duration { "1" }
-      route { }
+      number_of_adults { nil }
+      number_of_kids { nil }
+      delivery_required { nil }
     end
-    before(:create) do |trip, evaluator|
-      trip.product = evaluator.route
 
-      trip.option_values = [evaluator.departure_time, evaluator.duration]
+    after(:create) do |variant, evaluator|
+      if evaluator.number_of_adults.present?
+        number_of_adults = create(:cm_option_type, :number_of_adults)
+        variant.product.option_types << number_of_adults
+        variant.option_values << create(:cm_option_value, presentation: evaluator.number_of_adults, name: evaluator.number_of_adults, option_type: number_of_adults)
+      end
 
-    end
-    after(:create) do |trip, evaluator|
-      trip.stock_items = [create(:stock_item, variant: trip, stock_location: evaluator.product.vendor.stock_locations.first)]
-      trip.stock_items.first.adjust_count_on_hand(10)
+      if evaluator.number_of_kids.present?
+        number_of_kids = create(:cm_option_type, :number_of_kids)
+        variant.product.option_types << number_of_kids
+        variant.option_values << create(:cm_option_value, presentation: evaluator.number_of_kids, name: evaluator.number_of_kids, option_type: number_of_kids)
+      end
+
+      if evaluator.delivery_required == true
+        delivery_option = create(:cm_option_type, :delivery_option)
+        variant.product.option_types << delivery_option
+        variant.option_values << create(:cm_option_value, presentation: 'Delivery', name: 'delivery', option_type: delivery_option)
+      end
+
+      variant.save!
     end
   end
 end

data/lib/spree_cm_commissioner/test_helper/factories/vehicle_factory.rb

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :vehicle, class: SpreeCmCommissioner::Vehicle do
+  factory :cm_vehicle, class: SpreeCmCommissioner::Vehicle do
     sequence(:code) { |n| "vehicle_#{n}" }
     sequence(:license_plate) { |n| "2KH-#{'%04d' % (n % 10000)}" }
   end

data/lib/spree_cm_commissioner/test_helper/factories/vendor_factory.rb

@@ -30,7 +30,7 @@ FactoryBot.define do
         if vendor.primary_product_type == :accommodation
           product = create(:cm_accommodation_product, vendor: vendor, total_inventory: evaluator.total_inventory)
         else
-          product = create(:product, vendor: vendor, product_type: vendor.primary_product_type)
+          product = create(:cm_product, vendor: vendor, product_type: vendor.primary_product_type)
           product.master.stock_items.first.adjust_count_on_hand(evaluator.total_inventory)
         end
 

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.18.2-pre1'.freeze
+  VERSION = '2.0.0-pre'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -19,7 +19,7 @@ require 'spree_cm_commissioner/order_jwt_token'
 require 'spree_cm_commissioner/user_session_jwt_token'
 require 'spree_cm_commissioner/trip_result'
 require 'spree_cm_commissioner/trip_query_result'
-require 'spree_cm_commissioner/trip_seat_layout_result'
+require 'spree_cm_commissioner/cached_inventory_item'
 
 require 'activerecord_multi_tenant'
 require 'google/cloud/recaptcha_enterprise'
@@ -43,5 +43,39 @@ require 'rqrcode'
 require 'premailer/rails'
 require 'cm_app_logger'
 require 'counter_culture'
+require 'paper_trail'
 
 require 'byebug' if Rails.env.development? || Rails.env.test?
+
+module SpreeCmCommissioner
+  class << self
+    # Allows overriding the default Redis connection pool with a custom one
+    attr_writer :redis_pool
+
+    def redis_pool
+      @redis_pool ||= default_redis_pool
+    end
+
+    # Resets the Redis pool, useful for testing or reinitialization
+    def reset_redis_pool
+      @redis_pool = nil
+    end
+
+    private
+
+    def default_redis_pool
+      pool_size = ENV.fetch('REDIS_POOL_SIZE', '5').to_i
+      timeout = ENV.fetch('REDIS_TIMEOUT', '5').to_i
+      redis_url = ENV.fetch('REDIS_URL', 'redis://localhost:6379/12')
+
+      ConnectionPool.new(size: pool_size, timeout: timeout) do
+        Redis.new(url: redis_url, timeout: timeout)
+      end
+    end
+  end
+
+  # Provides a configuration block for customizing SpreeCmCommissioner settings
+  def self.configure
+    yield self
+  end
+end

data/lib/tasks/create_default_non_permanent_inventory_items.rake

@@ -0,0 +1,16 @@
+# recommend to be used in schedule.yml & manually access in /sidekiq/cron
+namespace :spree_cm_commissioner do
+  desc 'Create default inventory items for non-permanent stock products'
+  task create_default_non_permanent_inventory_items: :environment do
+    Spree::Variant.active.with_non_permanent_stock.find_each do |variant|
+      total_purchases = variant.complete_line_items.sum(:quantity).to_i || 0
+      max_capacity = variant.total_on_hand || 0
+      quantity_available = [max_capacity - total_purchases, 0].max
+
+      variant.create_default_non_permanent_inventory_item!(
+        max_capacity: max_capacity,
+        quantity_available: quantity_available
+      )
+    end
+  end
+end

data/lib/tasks/ensure_correct_product_type.rake

@@ -0,0 +1,7 @@
+# recommend to be used in schedule.yml & manually access in /sidekiq/cron
+namespace :spree_cm_commissioner do
+  desc 'Ensure product_type in variants, line_items, inventory_items are correct with product'
+  task ensure_correct_product_type: :environment do
+    SpreeCmCommissioner::EnsureCorrectProductTypeJob.perform_now
+  end
+end

data/lib/tasks/generate_inventory_items.rake

@@ -0,0 +1,7 @@
+# recommend to be used in schedule.yml & schedule run it everyday
+namespace :spree_cm_commissioner do
+  desc 'Generate inventory items for permanent_stock variants.'
+  task generate_inventory_items: :environment do
+    SpreeCmCommissioner::Stock::PermanentInventoryItemsGeneratorJob.perform_now
+  end
+end

data/spree_cm_commissioner.gemspec

@@ -54,6 +54,13 @@ Gem::Specification.new do |s|
   s.add_dependency "rqrcode", "~> 2.0"
   s.add_dependency "premailer-rails"
   s.add_dependency 'counter_culture', '~> 3.2'
+  s.add_dependency 'paper_trail', '~> 16.0'
+
+  # Redis
+  s.add_dependency 'redis'
+  s.add_dependency 'redis-rails'
+  s.add_dependency 'connection_pool'
+
   s.add_development_dependency 'pg'
   s.add_development_dependency 'spree_dev_tools'
   s.add_dependency 'blazer', '~> 3.0.4'