spree_cm_commissioner 2.0.3.pre.pre6 → 2.0.3.pre.pre.pre7

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

@@ -1,60 +1,38 @@
 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)
-      variant.stock_items.update_all(backorderable: evaluator.backorderable)
-
-      # 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 :cm_variant, parent: :cm_base_variant do
-    product { create(:cm_product) }
+  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
+    end
+  end
 
+  factory :trip, class: Spree::Variant do
+    permanent_stock { 5 }
     transient do
-      number_of_adults { nil }
-      number_of_kids { nil }
-      delivery_required { nil }
+      departure_time { "10:00" }
+      duration { "1" }
+      route { }
     end
+    before(:create) do |trip, evaluator|
+      trip.product = evaluator.route
 
-    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
+      trip.option_values = [evaluator.departure_time, evaluator.duration]
 
-      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
+    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)
     end
   end
 end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :cm_vehicle, class: SpreeCmCommissioner::Vehicle do
+  factory :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/vehicle_option_type_factory.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :vehicle_option_type, class: Spree::OptionType do
+    name { 'vehicle_option_type' }
+    attr_type { 'vehicle' }
+    kind {'variant'}
+    presentation { '' }
+  end
+end

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

@@ -0,0 +1,96 @@
+FactoryBot.define do
+  factory :vehicle_type, class: SpreeCmCommissioner::VehicleType do
+    name { FFaker::Name.name }
+    route_type {"automobile"}
+    status {"active"}
+  end
+
+  trait :with_layers do
+    transient do
+      layers {[
+        {row: 1, column: 1, empty: [[]], label: 'F', layer_name: "First Layer"},
+        {row: 1, column: 1, empty: [[]], label: 'S', layer_name: "Second Layer"}
+      ]}
+    end
+    after(:create) do |vehicle_type, evaluator|
+      layers = evaluator.layers || [{}]
+      layers.each_with_index do |layer, index|
+
+        row = layer[:row]
+        column = layer[:column]
+        empty_seats = layer[:empty] || []
+        label_counter = 1
+        layer_name = layer[:layer_name]
+        row.times do |r|
+          column.times do |c|
+            label = "#{layer[:label]}#{label_counter}"
+            seat_type = 0
+            if empty_seats.include?([r, c])
+              seat_type = 1
+              label = "NA"
+              label_counter -= 1
+            end
+            if (r == 0 && c == 0 && index == 0)
+              seat_type = 3
+              label = "NA"
+              label_counter -= 1
+            end
+            seat = {
+              "row": r + 1,
+              "column": c + 1,
+              "label": label,
+              "layer": layer_name,
+              "seat_type": seat_type,
+              "vehicle_type_id": vehicle_type.id
+            }
+
+            label_counter += 1
+            SpreeCmCommissioner::VehicleSeat.create(seat)
+          end
+        end
+        vehicle_type.reload
+      end
+    end
+  end
+
+  trait :with_seats do
+    transient do
+      row { 1 }
+      column { 1 }
+      empty { [[]] }
+    end
+
+    after(:create) do |vehicle_type, evaluator|
+      label_counter = 1
+      empty_seats = evaluator.empty || []
+      evaluator.row.times do |r|
+        evaluator.column.times do |c|
+          seat_type = 0
+          label = "F#{label_counter}"
+          if empty_seats.include?([r, c])
+            seat_type = 1
+            label = "NA"
+            label_counter -= 1
+          end
+          if (r == 0 && c == 0)
+            seat_type = 3
+            label = "NA"
+            label_counter -= 1
+          end
+          seat = {
+            "row": r + 1,
+            "column": c + 1,
+            "label": label,
+            "layer": "First Layer",
+            "seat_type": seat_type,
+            "vehicle_type_id": vehicle_type.id
+          }
+
+          label_counter += 1
+          SpreeCmCommissioner::VehicleSeat.create(seat)
+        end
+      end
+      vehicle_type.reload
+    end
+  end
+end

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

@@ -1,9 +1,4 @@
 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 }
@@ -35,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(:cm_product, vendor: vendor, product_type: vendor.primary_product_type)
+          product = create(: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,19 +1,7 @@
 FactoryBot.define do
-  factory :cm_location_vendor_place, class: SpreeCmCommissioner::VendorPlace do
+  factory :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/trip_query_result.rb

@@ -7,58 +7,8 @@ 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,10 +1,9 @@
 module SpreeCmCommissioner
   class TripResult
-    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
+    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
 
     def initialize(options = {})
       options.each do |key, value|
@@ -12,29 +11,21 @@ module SpreeCmCommissioner
       end
     end
 
-    def total_sold
-      return if max_capacity.nil? || quantity_available.nil?
-
-      max_capacity - quantity_available
+    def remaining_seats
+      total_seats - total_sold
     end
 
-    def amenity_ids
-      amenities&.map(&:id) || []
+    def arrival_time
+      (departure_time.to_time + duration.to_i.seconds).strftime('%H:%M')
     end
 
     def duration_in_hms
-      return { hours: 0, minutes: 0, seconds: 0 } if duration.nil?
+      return 0 if duration.nil?
 
       hours = duration / 3600
       minutes = (duration % 3600) / 60
       seconds = duration % 60
-      { hours: hours, minutes: minutes, seconds: seconds }
-    end
-
-    def arrival_time
-      return nil if departure_time.nil? || duration.nil?
-
-      departure_time + duration.seconds
+      "#{hours}h #{minutes}m #{seconds}s"
     end
   end
 end

data/lib/spree_cm_commissioner/trip_seat_layout_result.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  class TripSeatLayoutResult
+    attr_accessor :trip_id, :total_sold, :total_seats, :remaining_seats, :layout, :allow_seat_selection
+
+    def initialize(options = {})
+      options.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
+    end
+  end
+end

data/lib/spree_cm_commissioner/version.rb

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

data/lib/spree_cm_commissioner.rb

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

@@ -54,13 +54,6 @@ 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'