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

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

@@ -1,4 +1,9 @@
 FactoryBot.define do
+  factory :cm_transit_vendor, parent: :vendor do
+    state { :active }
+    primary_product_type { :transit }
+  end
+
   factory :cm_vendor, parent: :vendor do
     state { :active }
     default_state_id { Spree::State.first&.id }
@@ -30,7 +35,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/test_helper/factories/vendor_place_factory.rb

@@ -1,7 +1,19 @@
 FactoryBot.define do
-  factory :vendor_place, class: SpreeCmCommissioner::VendorPlace do
+  factory :cm_location_vendor_place, class: SpreeCmCommissioner::VendorPlace do
     association :vendor, factory: :vendor
     association :place, factory: :cm_place
+
+    distance  { FFaker::Number.decimal }
+    position  { FFaker::Number.number }
+
+    place_type { :location }
+  end
+
+  factory :cm_vendor_place, class: SpreeCmCommissioner::VendorPlace do
+    association :vendor, factory: :vendor
+    association :place, factory: :cm_place
+    association :location, factory: :cm_location_vendor_place
+
     distance  { FFaker::Number.decimal }
     position  { FFaker::Number.number }
     place_type { :branch }

data/lib/spree_cm_commissioner/transit/leg.rb

@@ -0,0 +1,37 @@
+module SpreeCmCommissioner::Transit
+  class Leg
+    attr_accessor :direction, :trip_id, :boarding_trip_stop_id, :drop_off_trip_stop_id, :seat_selections
+
+    def initialize(options = {})
+      @direction = options[:direction]
+      @trip_id = options[:trip_id]
+      @boarding_trip_stop_id = options[:boarding_trip_stop_id]
+      @drop_off_trip_stop_id = options[:drop_off_trip_stop_id]
+      @seat_selections = options[:seat_selections] || []
+    end
+
+    def self.from_hash(hash)
+      new(
+        direction: hash[:direction], # outbound / inbound
+        trip_id: hash[:trip_id],
+        boarding_trip_stop_id: hash[:boarding_trip_stop_id],
+        drop_off_trip_stop_id: hash[:drop_off_trip_stop_id],
+        seat_selections: (hash[:seat_selections] || []).map { |seat_selection| SeatSelection.from_hash(seat_selection) }
+      )
+    end
+
+    def quantity
+      @seat_selections.sum(&:quantity).to_i
+    end
+
+    def to_h
+      {
+        direction: @direction,
+        trip_id: @trip_id,
+        boarding_trip_stop_id: @boarding_trip_stop_id,
+        drop_off_trip_stop_id: @drop_off_trip_stop_id,
+        seat_selections: @seat_selections.map(&:to_h)
+      }
+    end
+  end
+end

data/lib/spree_cm_commissioner/transit/seat_selection.rb

@@ -0,0 +1,27 @@
+module SpreeCmCommissioner::Transit
+  class SeatSelection
+    attr_accessor :variant_id, :quantity, :block_ids
+
+    def initialize(options = {})
+      @variant_id = options[:variant_id]
+      @quantity = options[:quantity]&.to_i
+      @block_ids = options[:block_ids] || []
+    end
+
+    def self.from_hash(hash)
+      new(
+        variant_id: hash[:variant_id],
+        quantity: hash[:quantity],
+        block_ids: hash[:block_ids] || [] # empty when no seat selection.
+      )
+    end
+
+    def to_h
+      {
+        variant_id: @variant_id,
+        quantity: @quantity,
+        block_ids: @block_ids
+      }
+    end
+  end
+end

data/lib/spree_cm_commissioner/trip_query_result.rb

@@ -7,8 +7,58 @@ module SpreeCmCommissioner
       @connection_id = connection_id
     end
 
+    def id
+      @trips.map(&:id).join('-')
+    end
+
+    def trip_ids
+      @trips.map(&:id)
+    end
+
     def direct?
       @trips.size == 1
     end
+
+    def quantity_available
+      @trips.map(&:quantity_available).compact.min
+    end
+
+    def max_capacity
+      @trips.map(&:max_capacity).compact.min
+    end
+
+    def total_price
+      @trips.map(&:price).compact.sum
+    end
+
+    def total_duration
+      @trips.map(&:duration).compact.sum
+    end
+
+    def total_duration_in_hms
+      total_seconds = total_duration || 0
+      return { hours: 0, minutes: 0, seconds: 0 } if total_seconds.nil? || total_seconds <= 0
+
+      hours = total_seconds / 3600
+      minutes = (total_seconds % 3600) / 60
+      seconds = total_seconds % 60
+      { hours: hours, minutes: minutes, seconds: seconds }
+    end
+
+    def departure_time
+      @trips.first.departure_time
+    end
+
+    def arrival_time
+      @trips.last.arrival_time
+    end
+
+    def vendors
+      @trips.map(&:vendor).uniq
+    end
+
+    def vehicle_types
+      @trips.map(&:vehicle).map(&:vehicle_type).uniq
+    end
   end
 end

data/lib/spree_cm_commissioner/trip_result.rb

@@ -1,9 +1,10 @@
 module SpreeCmCommissioner
   class TripResult
-    attr_accessor :trip_id, :vendor_id, :vendor_name, :short_name, :route_name,
-                  :origin_id, :origin, :destination_id, :destination,
-                  :total_sold, :total_seats,
-                  :duration, :vehicle_id, :departure_time
+    attr_accessor :id, :origin_place, :destination_place, :allow_seat_selection,
+                  :departure_time, :duration, :route_type,
+                  :vehicle_id, :vehicle, :vendor_id, :vendor,
+                  :quantity_available, :max_capacity, :boarding, :drop_off,
+                  :product_id, :amenities, :price, :compare_at_amount, :currency
 
     def initialize(options = {})
       options.each do |key, value|
@@ -11,21 +12,29 @@ module SpreeCmCommissioner
       end
     end
 
-    def remaining_seats
-      total_seats - total_sold
+    def total_sold
+      return if max_capacity.nil? || quantity_available.nil?
+
+      max_capacity - quantity_available
     end
 
-    def arrival_time
-      (departure_time.to_time + duration.to_i.seconds).strftime('%H:%M')
+    def amenity_ids
+      amenities&.map(&:id) || []
     end
 
     def duration_in_hms
-      return 0 if duration.nil?
+      return { hours: 0, minutes: 0, seconds: 0 } if duration.nil?
 
       hours = duration / 3600
       minutes = (duration % 3600) / 60
       seconds = duration % 60
-      "#{hours}h #{minutes}m #{seconds}s"
+      { hours: hours, minutes: minutes, seconds: seconds }
+    end
+
+    def arrival_time
+      return nil if departure_time.nil? || duration.nil?
+
+      departure_time + duration.seconds
     end
   end
 end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.0.3.pre-pre7'.freeze
+  VERSION = '2.1.0-pre1'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -19,7 +19,9 @@ 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 'spree_cm_commissioner/transit/leg'
+require 'spree_cm_commissioner/transit/seat_selection'
 
 require 'activerecord_multi_tenant'
 require 'google/cloud/recaptcha_enterprise'
@@ -43,5 +45,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'