spree_cm_commissioner 2.0.3.pre.pre4 → 2.0.3.pre.pre5

data/app/models/spree_cm_commissioner/variant_decorator.rb

@@ -1,6 +1,7 @@
 module SpreeCmCommissioner
   module VariantDecorator
-    def self.prepended(base)
+    def self.prepended(base) # rubocop:disable Metrics/AbcSize
+      base.include SpreeCmCommissioner::ProductType
       base.include SpreeCmCommissioner::ProductDelegation
       base.include SpreeCmCommissioner::VariantOptionsConcern
       base.include SpreeCmCommissioner::KycBitwise
@@ -20,24 +21,21 @@ module SpreeCmCommissioner
       base.has_many :video_on_demands, class_name: 'SpreeCmCommissioner::VideoOnDemand', dependent: :destroy
       base.has_many :complete_line_items, -> { complete }, class_name: 'Spree::LineItem'
 
+      base.has_many :variant_blocks, class_name: 'SpreeCmCommissioner::VariantBlock', dependent: :destroy
+      base.has_many :blocks, class_name: 'SpreeCmCommissioner::Block', through: :variant_blocks
+
       base.has_many :variant_guest_card_class, class_name: 'SpreeCmCommissioner::VariantGuestCardClass'
       base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variant_guest_card_class
 
+      base.has_many :inventory_items, class_name: 'SpreeCmCommissioner::InventoryItem'
+
       base.scope :subscribable, -> { active.joins(:product).where(product: { subscribable: true, status: :active }) }
-      base.has_one :trip,
-                   class_name: 'SpreeCmCommissioner::Trip'
-      base.has_many :trip_stops, class_name: 'SpreeCmCommissioner::TripStop', dependent: :destroy, foreign_key: :trip_id
-      base.accepts_nested_attributes_for :option_values
-      base.after_commit :sync_trip, if: :transit?
-      base.accepts_nested_attributes_for :trip_stops, allow_destroy: true
-      base.after_commit :create_trip_stops, if: :transit?
-    end
+      base.scope :with_permanent_stock, -> { where(product_type: base::PERMANENT_STOCK_PRODUCT_TYPES) }
+      base.scope :with_non_permanent_stock, -> { where.not(product_type: base::PERMANENT_STOCK_PRODUCT_TYPES) }
 
-    def create_trip_stops
-      return if is_master?
+      base.accepts_nested_attributes_for :option_values
 
-      trip_stops.find_or_create_by(stop_type: :boarding, stop_id: options.origin)
-      trip_stops.find_or_create_by(stop_type: :drop_off, stop_id: options.destination)
+      base.before_save -> { self.product_type = product.product_type }, if: -> { product_type.nil? }
     end
 
     def delivery_required?
@@ -53,8 +51,20 @@ module SpreeCmCommissioner
       super || product.discontinued?
     end
 
-    def permanent_stock?
-      accommodation?
+    def default_inventory_item_exist?
+      inventory_items.exists?(inventory_date: nil)
+    end
+
+    def create_default_non_permanent_inventory_item!(quantity_available: nil, max_capacity: nil)
+      return if product_type.blank? # handle in case product not exist for variant.
+      return unless should_track_inventory?
+      return if default_inventory_item_exist?
+
+      inventory_items.create!(
+        product_type: product_type,
+        quantity_available: [0, quantity_available || total_on_hand].max,
+        max_capacity: [0, max_capacity || total_on_hand].max
+      )
     end
 
     # override
@@ -72,30 +82,26 @@ module SpreeCmCommissioner
       "#{display_sku} - #{display_price}"
     end
 
-    def transit?
-      product.product_type == 'transit'
-    end
-
     # override
-    def in_stock?
-      available_quantity.positive?
+    def in_stock?(options = {})
+      SpreeCmCommissioner::Stock::AvailabilityChecker.new(self, options).can_supply?
     end
 
-    private
+    def price_for_date(currency:, date:)
+      currency = currency.upcase
 
-    def total_purchases
-      Spree::LineItem.complete.where(variant_id: id).sum(:quantity).to_i
+      prices.joins(:inventory_item)
+            .find_by(
+              currency: currency,
+              inventory_item: { inventory_date: date }
+            )
     end
 
-    def available_quantity
-      stock_count = stock_items.sum(&:count_on_hand)
-      return stock_count if delivery_required?
-
-      stock_count - total_purchases
-    end
+    private
 
     def update_vendor_price
-      return unless vendor.present? && product&.product_type == vendor&.primary_product_type
+      return unless vendor.present? && product_type == vendor&.primary_product_type
+      return if price.blank?
 
       vendor.update(min_price: price) if vendor.min_price.nil? || price < vendor.min_price
       vendor.update(max_price: price) if vendor.max_price.nil? || price > vendor.max_price
@@ -119,22 +125,6 @@ module SpreeCmCommissioner
         end
       end
     end
-
-    def sync_trip
-      return unless product.product_type == 'transit'
-
-      trip = SpreeCmCommissioner::Trip.find_or_initialize_by(variant_id: id)
-
-      trip.assign_attributes(
-        product_id: product_id,
-        origin_id: options.origin,
-        destination_id: options.destination,
-        departure_time: options.departure_time,
-        duration: options.total_duration_in_seconds,
-        vehicle_id: options.vehicle
-      )
-      trip.save
-    end
   end
 end
 

data/app/models/spree_cm_commissioner/variant_options.rb

@@ -143,28 +143,5 @@ module SpreeCmCommissioner
     def number_of_guests
       number_of_adults + number_of_kids
     end
-
-    def origin
-      @origin ||= option_value_name_for(option_type_name: 'origin')&.to_i
-    end
-
-    def destination
-      @destination ||= option_value_name_for(option_type_name: 'destination')&.to_i
-    end
-
-    def vehicle
-      @vehicle ||= option_value_name_for(option_type_name: 'vehicle')&.to_i
-    end
-
-    def allow_seat_selection
-      @allow_seat_selection ||= option_value_name_for(option_type_name: 'allow-seat-selection')&.to_i
-    end
-
-    def departure_time
-      @departure_time ||= begin
-        time = option_value_name_for(option_type_name: 'departure-time')
-        Time.zone.parse(time) if time.present?
-      end
-    end
   end
 end

data/app/models/spree_cm_commissioner/vehicle.rb

@@ -1,29 +1,24 @@
-require_dependency 'spree_cm_commissioner'
-
 module SpreeCmCommissioner
-  class Vehicle < SpreeCmCommissioner::Base
-    include SpreeCmCommissioner::RouteType
+  class Vehicle < Base
+    include SpreeCmCommissioner::VehicleType
 
-    belongs_to :vehicle_type, class_name: 'SpreeCmCommissioner::VehicleType'
-    has_one :primary_photo, -> { order(position: :asc) }, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
     belongs_to :vendor, class_name: 'Spree::Vendor'
 
-    after_commit :create_vehicle_option_value
+    has_one :primary_photo, -> { order(position: :asc) }, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
+    has_one :seat_layout, as: :layoutable, class_name: 'SpreeCmCommissioner::SeatLayout', dependent: :destroy
 
-    has_many :vehicle_photo, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
-    has_many :vehicle_seats, class_name: 'SpreeCmCommissioner::VehicleSeat', through: :vehicle_type
+    has_many :vehicle_photos, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
 
     has_many :vehicle_option_types, class_name: 'SpreeCmCommissioner::VehicleOptionType', dependent: :destroy
     has_many :option_value_vehicles, class_name: 'SpreeCmCommissioner::OptionValueVehicle', dependent: :destroy
-
+    has_many :option_values, through: :option_value_vehicles, class_name: 'Spree::OptionValue'
     validates :code, uniqueness: { scope: :vendor_id }, presence: true
-    validates :license_plate, uniqueness: {}, allow_blank: true
+    validates :license_plate, uniqueness: true, allow_blank: true
 
-    def create_vehicle_option_value
-      SpreeCmCommissioner::VehicleOptionValueCreator.call(self)
-    end
+    self.whitelisted_ransackable_attributes = %w[license_plate code vehicle_type]
 
-    self.whitelisted_ransackable_attributes = %w[license_plate code]
-    self.whitelisted_ransackable_associations = %w[vehicle_type]
+    def display_name
+      "#{code} (#{license_plate})"
+    end
   end
 end

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -36,21 +36,17 @@ module SpreeCmCommissioner
       base.has_many :vendor_kind_option_values,
                     through: :option_value_vendors, source: :option_value
 
-      base.has_many :branches, lambda {
-                                 where(cm_vendor_places: { place_type: 0 })
-                               }, through: :vendor_places, class_name: 'SpreeCmCommissioner::VendorPlace'
-      base.has_many :stops, -> { where(cm_vendor_places: { place_type: 1 }) }, through: :vendor_places, class_name: 'SpreeCmCommissioner::VendorPlace'
-      base.has_many :locations, -> { where(cm_vendor_places: { place_type: 2 }) },
-                    through: :vendor_places, class_name: 'SpreeCmCommissioner::VendorPlace'
+      base.has_many :branches, -> { branch }, class_name: 'SpreeCmCommissioner::VendorPlace'
+      base.has_many :stops, -> { stop }, class_name: 'SpreeCmCommissioner::VendorPlace'
+      base.has_many :locations, -> { location }, class_name: 'SpreeCmCommissioner::VendorPlace'
+
+      base.has_many :branch_places, through: :branches, class_name: 'SpreeCmCommissioner::Place', source: :place
+      base.has_many :stop_places, through: :stops, class_name: 'SpreeCmCommissioner::Place', source: :place
+      base.has_many :location_places, through: :locations, class_name: 'SpreeCmCommissioner::Place', source: :place
 
       base.has_many :places,
                     through: :nearby_places, source: :place, class_name: 'SpreeCmCommissioner::Place'
 
-      base.has_many :vendor_stops, class_name: 'SpreeCmCommissioner::VendorStop', dependent: :destroy
-      base.has_many :boarding_points, -> { where(cm_vendor_stops: { stop_type: 0 }) },
-                    through: :vendor_stops, source: :stop, class_name: 'SpreeCmCommissioner::Place'
-      base.has_many :drop_off_points, -> { where(cm_vendor_stops: { stop_type: 1 }) },
-                    through: :vendor_stops, source: :stop, class_name: 'SpreeCmCommissioner::Place'
       base.has_many :dynamic_fields, class_name: 'SpreeCmCommissioner::DynamicField', foreign_key: :vendor_id, dependent: :destroy
 
       base.has_one  :logo, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::VendorLogo'
@@ -81,12 +77,13 @@ module SpreeCmCommissioner
       base.has_many :promotion_categories, class_name: 'Spree::PromotionCategory', foreign_key: :vendor_id, dependent: :destroy
 
       base.has_many :homepage_section_relatables,
+                    as: :relatable,
                     class_name: 'SpreeCmCommissioner::HomepageSectionRelatable',
-                    dependent: :destroy, inverse_of: :relatable
+                    dependent: :destroy,
+                    inverse_of: :relatable
 
-      base.has_many :vehicle_types, class_name: 'SpreeCmCommissioner::VehicleType', dependent: :destroy
       base.has_many :vehicles, class_name: 'SpreeCmCommissioner::Vehicle', dependent: :destroy
-      # base.has_many :vehicles, through: :vehicle_types, class_name: 'SpreeCmCommissioner::Vehicle', dependent: :destroy
+      base.has_many :trips, class_name: 'SpreeCmCommissioner::Trip', dependent: :destroy
 
       base.validates :account_name, :account_number, presence: true, if: lambda {
                                                                            payment_qrcode.present? && Spree::Store.default.code.include?('billing')

data/app/models/spree_cm_commissioner/vendor_place.rb

@@ -5,15 +5,25 @@ module SpreeCmCommissioner
 
     belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
     belongs_to :place, class_name: 'SpreeCmCommissioner::Place', optional: false
+    belongs_to :location, class_name: 'SpreeCmCommissioner::VendorPlace', optional: true
+
+    has_many :branches, -> { branch }, class_name: 'SpreeCmCommissioner::VendorPlace', foreign_key: :location_id, dependent: :restrict_with_error
+    has_many :stops, -> { stop }, class_name: 'SpreeCmCommissioner::VendorPlace', foreign_key: :location_id, dependent: :restrict_with_error
 
     validates :place_type, presence: true
     validates :place_id, uniqueness: { scope: %i[vendor_id place_type] }
+    validates :location, presence: true, if: -> { branch? || stop? }
 
     accepts_nested_attributes_for :place, allow_destroy: true
 
-    scope :branches,  -> { where(place_type: :branch) }
-    scope :stops,     -> { where(place_type: :stop) }
-    scope :locations, -> { where(place_type: :location) }
+    # include place when using these delegate to avoid N+1
+    def display_name
+      place&.name
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      ['place']
+    end
 
     def selected
       vendor.selected_place_references.include?(place&.reference)

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -1,155 +1,134 @@
 module SpreeCmCommissioner
   class TripQuery
-    include SpreeCmCommissioner::Transit::TripHelper
+    attr_reader :origin_id, :destination_id, :date
 
-    attr_reader :origin_id, :destination_id, :travel_date, :params
-
-    def initialize(origin_id:, destination_id:, travel_date:, params: {})
+    def initialize(origin_id:, destination_id:, date:, params: {})
       @origin_id = origin_id
       @destination_id = destination_id
-      @travel_date = travel_date
-      @travel_date = Time.zone.now if travel_date.to_date == Time.zone.now.to_date
+      @date = date.to_date == Time.zone.now.to_date ? Time.zone.now : Time.zone.parse(date.to_s)
       @params = params
+      @page = (params[:page] || 1).to_i
+      @per_page = (params[:per_page] || 25).to_i
     end
 
     def call
-      return [] if travel_date.to_date < Date.current
+      return Kaminari.paginate_array([]) if date.to_date < Date.current
+
+      paginated_relation = direct_trips
+      return Kaminari.paginate_array([]) if paginated_relation.empty?
+
+      results_array = paginated_relation.map do |trip|
+        result = build_trip_result(trip)
+        SpreeCmCommissioner::TripQueryResult.new([result])
+      end
 
-      direct_results = direct_trips.map { |trip| SpreeCmCommissioner::TripQueryResult.new([trip]) }
-      connected_results = connected_trips || []
-      direct_results + connected_results
+      Kaminari.paginate_array(
+        results_array,
+        total_count: paginated_relation.total_count,
+        limit: @per_page,
+        offset: paginated_relation.offset_value
+      )
     end
 
     def direct_trips
-      result = Spree::Variant
-               .select('spree_variants.id AS variant_id,
-                        vendors.id AS vendor_id,
-                        vendors.name AS vendor_name,
-                        routes.name AS route_name,
-                        routes.short_name AS short_name,
-                        boarding.stop_id AS origin_id,
-                        drop_off.stop_id AS destination_id,
-                        boarding.stop_name AS origin,
-                        drop_off.stop_name AS destination,
-                        trips.departure_time AS departure_time,
-                        trips.duration AS duration,
-                        trips.vehicle_id AS vehicle_id'
-                      )
-               .joins('INNER JOIN cm_trips AS trips ON trips.variant_id = spree_variants.id')
-               .joins('INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = spree_variants.id AND boarding.stop_type = 0')
-               .joins('INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = spree_variants.id AND drop_off.stop_type = 1')
-               .joins('INNER JOIN spree_vendors AS vendors ON vendors.id = spree_variants.vendor_id')
-               .joins('INNER JOIN spree_products AS routes ON routes.id = spree_variants.product_id')
-      result = result.where(vendors: { id: params[:vendor_id] }) if params[:vendor_id].present?
-      result = result.where('boarding.stop_id = ? AND drop_off.stop_id = ?', origin_id, destination_id)
-                     .where('trips.departure_time > ? AND trips.departure_time <= ?',
-                            travel_date.strftime('%H:%M:%S'),
-                            travel_date.end_of_day.strftime('%H:%M:%S')
-                           )
+      @inventory_sql ||= product_inventory_totals
+      result = SpreeCmCommissioner::Trip
+               .select(<<~SQL.squish)
+                 cm_trips.*,
+                 boarding.departure_time AS boarding_departure_time,
+                 boarding.stop_place_id AS boarding_stop_id, boarding.stop_name AS boarding_stop_name,
+                 drop_off.stop_name AS drop_off_stop_name, drop_off.stop_place_id AS drop_off_stop_id,
+                 drop_off.arrival_time AS drop_off_arrival_time,
+                 COALESCE(iv.quantity_available, 0) AS quantity_available,
+                 COALESCE(iv.max_capacity, 0) AS max_capacity,
+                 origin_places.name AS origin_place_name, dest_places.name AS destination_place_name,
+                 prices.amount AS amount, prices.compare_at_amount AS compare_at_amount,
+                 prices.currency AS currency
+               SQL
+               .includes(vendor: :logo, vehicle: :option_values)
+               .joins(<<~SQL.squish)
+                 INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = cm_trips.id AND boarding.stop_type = 0
+                 INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = cm_trips.id AND drop_off.stop_type = 1
+                 INNER JOIN cm_places AS origin_places ON origin_places.id = cm_trips.origin_place_id
+                 INNER JOIN cm_places AS dest_places ON dest_places.id = cm_trips.destination_place_id
+                 INNER JOIN spree_products ON spree_products.id = cm_trips.product_id
+                 INNER JOIN spree_variants AS master ON master.product_id = spree_products.id AND master.is_master = true
+                 INNER JOIN spree_prices AS prices ON prices.variant_id = master.id AND prices.deleted_at IS NULL
+               SQL
+               .where('(boarding.location_place_id = ? OR boarding.stop_place_id = ?)
+                        AND (drop_off.location_place_id = ? OR drop_off.stop_place_id = ?)', origin_id, origin_id, destination_id, destination_id
+               )
+               .joins("LEFT JOIN (#{@inventory_sql.to_sql}) iv ON cm_trips.product_id = iv.product_id")
 
-      result.map do |trip|
-        trip_result_options = {
-          trip_id: trip[:variant_id],
-          vendor_id: trip[:vendor_id],
-          vendor_name: trip[:vendor_name],
-          route_name: trip[:route_name],
-          short_name: trip[:short_name],
-          detail: trip[:variant_id],
-          origin_id: trip[:origin_id],
-          origin: trip[:origin],
-          destination_id: trip[:destination_id],
-          destination: trip[:destination],
-          vehicle_id: trip[:vehicle_id],
-          departure_time: parse_time(trip[:departure_time]),
-          duration: trip[:duration]
-        }
-        SpreeCmCommissioner::TripResult.new(trip_result_options)
-      end
+      result = result.where(vendor_id: @params[:vendor_id]) if @params[:vendor_id].present?
+      result.page(@page).per(@per_page)
+    end
+
+    def product_inventory_totals
+      Spree::Product
+        .select(
+          'spree_products.id AS product_id,
+              SUM(cm_inventory_items.max_capacity) AS max_capacity,
+              SUM(cm_inventory_items.quantity_available) AS quantity_available'
+        )
+        .joins(variants: :inventory_items)
+        .where(cm_inventory_items: { inventory_date: date.to_date })
+        .group('spree_products.id')
     end
 
-    def connected_trips # rubocop:disable Metrics/MethodLength
-      result = SpreeCmCommissioner::TripConnection
-               .joins('
-                INNER JOIN spree_variants variant1 ON variant1.id = cm_trip_connections.from_trip_id
-                INNER JOIN spree_variants variant2 ON variant2.id = cm_trip_connections.to_trip_id
-                INNER JOIN spree_products AS routes1 ON routes1.id = variant1.product_id
-                INNER JOIN spree_products AS routes2 ON routes2.id = variant2.product_id
-                INNER JOIN cm_trips AS trip1 ON trip1.variant_id = cm_trip_connections.from_trip_id
-                INNER JOIN cm_trips AS trip2 ON trip2.variant_id = cm_trip_connections.to_trip_id
-                INNER JOIN cm_trip_stops trip1_origin ON trip1_origin.trip_id = variant1.id AND trip1_origin.stop_type = 0
-                INNER JOIN cm_trip_stops trip2_origin ON trip2_origin.trip_id = variant2.id AND trip2_origin.stop_type = 0
-                INNER JOIN cm_trip_stops trip2_destination ON trip2_destination.trip_id = variant2.id AND trip2_destination.stop_type = 1
-                INNER JOIN spree_vendors AS vendor1 ON vendor1.id = variant1.vendor_id
-                INNER JOIN spree_vendors AS vendor2 ON vendor2.id = variant2.vendor_id'
-                     )
-               .select('cm_trip_connections.id AS id,
-                        trip1.variant_id AS trip1_id,
-                        trip1.origin_id AS trip1_origin_id,
-                        trip1.destination_id AS trip1_destination_id,
-                        trip1.departure_time AS trip1_departure_time,
-                        trip1.duration AS trip1_duration,
-                        routes1.short_name AS route1_short_name,
-                        routes1.name AS route1_name,
-                        trip1.vehicle_id AS trip1_vehicle,
-                        vendor1.name AS trip1_vendor_name,
-                        trip2.variant_id AS trip2_id,
-                        trip2.origin_id AS trip2_origin_id,
-                        trip2.destination_id AS trip2_destination_id,
-                        trip2.departure_time AS trip2_departure_time,
-                        trip2.duration AS trip2_duration,
-                        trip2.vehicle_id AS trip2_vehicle,
-                        routes2.short_name AS route2_short_name,
-                        routes2.name AS route2_name,
-                        trip1_origin.stop_name AS trip1_origin,
-                        trip2_origin.stop_name AS trip2_origin,
-                        trip2_destination.stop_name AS trip2_destination,
-                        vendor2.name AS trip2_vendor_name'
-                      ).where('trip1_origin.stop_id = ? AND trip2_destination.stop_id = ?', origin_id, destination_id)
-      result = result.where('vendor1.id = ? OR vendor2.id = ?', params[:vendor_id], params[:vendor_id]) if params[:vendor_id].present?
-      result = result.where('trip1.departure_time > ? AND trip1.departure_time <= ?', travel_date.strftime('%H:%M:%S'),
-                            travel_date.end_of_day.strftime('%H:%M:%S')
-      ).uniq
+    private
 
-      return [] if result.blank?
+    def cached_inventory_sql
+      @inventory_sql ||= product_inventory_totals
+    end
 
-      build_trip_query_result(result)
+    def build_trip_result(trip)
+      vehicle = trip&.vehicle
+      vendor = trip&.vendor
+      trip_result_options = {
+        id: trip&.id,
+        departure_time: trip&.departure_time,
+        duration: trip&.duration,
+        allow_seat_selection: trip&.allow_seat_selection,
+        origin_place: {
+          id: trip&.origin_place_id,
+          name: trip&.origin_place_name
+        },
+        destination_place: {
+          id: trip&.destination_place_id,
+          name: trip&.destination_place_name
+        },
+        vehicle_id: trip&.vehicle_id,
+        vehicle: vehicle,
+        vendor_id: trip&.vendor_id,
+        vendor: vendor,
+        product_id: trip&.product_id,
+        price: trip&.amount,
+        currency: trip&.currency,
+        compare_at_amount: trip&.compare_at_amount,
+        boarding: build_boarding_info(trip),
+        drop_off: build_drop_off_info(trip),
+        quantity_available: trip&.quantity_available,
+        max_capacity: trip&.max_capacity,
+        amenities: (trip.vehicle&.option_values || [])
+      }
+      SpreeCmCommissioner::TripResult.new(trip_result_options)
     end
 
-    private
+    def build_boarding_info(trip)
+      {
+        stop_id: trip&.boarding_stop_id,
+        stop_name: trip&.boarding_stop_name,
+        departure_time: trip&.boarding_departure_time
+      }
+    end
 
-    def build_trip_query_result(connections)
-      connections.map do |trip|
-        from_trip = {
-          trip_id: trip[:trip1_id],
-          origin_id: trip[:trip1_origin_id],
-          destination_id: trip[:trip1_destination_id],
-          departure_time: parse_time(trip[:trip1_departure_time]),
-          duration: trip[:trip1_duration],
-          vendor_name: trip[:trip1_vendor_name],
-          route_name: trip[:route1_name],
-          short_name: trip[:route1_short_name],
-          vehicle_id: trip[:trip1_vehicle],
-          origin: trip[:trip1_origin],
-          destination: trip[:trip2_origin]
-        }
-        to_trip = {
-          trip_id: trip[:trip2_id],
-          origin_id: trip[:trip2_origin_id],
-          destination_id: trip[:trip2_destination_id],
-          departure_time: parse_time(trip[:trip2_departure_time]),
-          duration: trip[:trip2_duration],
-          vendor_name: trip[:trip2_vendor_name],
-          route_name: trip[:route2_name],
-          short_name: trip[:route2_short_name],
-          vehicle_id: trip[:trip2_vehicle],
-          origin: trip[:trip2_origin],
-          destination: trip[:trip2_destination]
-        }
-        data = [SpreeCmCommissioner::TripResult.new(from_trip),
-                SpreeCmCommissioner::TripResult.new(to_trip)
-                ]
-        SpreeCmCommissioner::TripQueryResult.new(data, connection_id: trip[:id])
-      end
+    def build_drop_off_info(trip)
+      {
+        stop_id: trip&.drop_off_stop_id,
+        stop_name: trip&.drop_off_stop_name,
+        arrival_time: trip&.drop_off_arrival_time
+      }
     end
   end
 end

data/app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb

@@ -3,6 +3,9 @@ module SpreeCmCommissioner
     params do
       required(:from_date).value(:date)
       required(:to_date).value(:date)
+      required(:province_id).value(:integer)
+      required(:adult).value(:integer)
+      required(:children).value(:integer)
     end
 
     rule(:from_date, :to_date) do

data/app/request_schemas/spree_cm_commissioner/application_request_schema.rb

@@ -11,7 +11,7 @@ module SpreeCmCommissioner
     end
 
     def error_message
-      errors.map(&:text).join(', ')
+      errors.map { |error| "#{error.path.join(', ')}: #{error.text}" }.to_sentence
     end
 
     private

data/app/request_schemas/spree_cm_commissioner/trip_search_request_schema.rb

@@ -0,0 +1,20 @@
+module SpreeCmCommissioner
+  class TripSearchRequestSchema < ApplicationRequestSchema
+    params do
+      required(:origin_id).value(:integer)
+      required(:destination_id).value(:integer)
+      required(:date).value(:date)
+    end
+
+    rule(:date) do
+      key.failure(:must_be_in_future) if value < Time.zone.today
+    end
+
+    rule(:origin_id, :destination_id) do
+      origin_id = values[:origin_id]
+      destination_id = values[:destination_id]
+
+      key.failure(:must_be_different) if origin_id == destination_id
+    end
+  end
+end

data/app/request_schemas/spree_cm_commissioner/variant_request_schema.rb

@@ -0,0 +1,19 @@
+module SpreeCmCommissioner
+  class VariantRequestSchema < ApplicationRequestSchema
+    params do
+      required(:from_date).value(:date)
+      required(:to_date).value(:date)
+      required(:adult).value(:integer)
+      required(:children).value(:integer)
+    end
+
+    rule(:from_date, :to_date) do
+      from_date = values[:from_date]
+      to_date   = values[:to_date]
+
+      key.failure(:must_be_in_future) if from_date < Time.zone.today
+      key.failure(:must_be_later_than_start_date) if from_date > to_date
+      key.failure(:stay_is_too_long) if (to_date - from_date).to_i > ENV.fetch('ACCOMMODATION_MAX_STAY_DAYS', 10).to_i
+    end
+  end
+end

data/app/serializers/spree/v2/storefront/accommodation_serializer.rb

@@ -9,10 +9,12 @@ module Spree
 
         attributes :total_inventory, :service_availabilities
 
+        # Deprecated
         attribute :total_booking do |vendor|
           vendor.respond_to?(:total_booking) ? vendor.total_booking : 0
         end
 
+        # Deprecated
         attribute :remaining do |vendor|
           vendor.respond_to?(:remaining) ? vendor.remaining : vendor.total_inventory
         end

data/app/serializers/spree/v2/storefront/amenity_serializer.rb

@@ -0,0 +1,15 @@
+module Spree
+  module V2
+    module Storefront
+      class AmenitySerializer < BaseSerializer
+        set_type :amenity
+        attributes :name, :presentation
+        attribute :display_icon do |option_value|
+          ActionController::Base.helpers.image_url(option_value.display_icon)
+        rescue StandardError
+          nil
+        end
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/storefront/line_item_serializer_decorator.rb

@@ -4,6 +4,7 @@ module Spree
       module LineItemSerializerDecorator
         def self.prepended(base)
           base.attributes :from_date, :to_date, :need_confirmation, :product_type, :event_status, :amount, :display_amount,
+                          :checkin_date, :checkout_date,
                           :number, :qr_data,
                           :kyc, :kyc_fields, :remaining_total_guests, :number_of_guests,
                           :completion_steps, :available_social_contact_platforms, :allow_anonymous_booking, :discontinue_on,