spree_cm_commissioner 1.21.0 → 2.0.0.pre.pre

data/app/models/spree_cm_commissioner/user_identity_provider.rb

@@ -3,17 +3,15 @@ module SpreeCmCommissioner
     enum identity_type: { :google => 0, :apple => 1, :facebook => 2, :telegram => 3, :vattanac_bank => 4 }
 
     belongs_to :user, class_name: Spree.user_class.to_s, optional: false
-    has_one :tenant, through: :user
-
-    has_many :user_identity_provider_telegram_bots
-    has_many :telegram_bots, through: :user_identity_provider_telegram_bots
 
     validates :sub, presence: true
+    validates :sub, uniqueness: { scope: :identity_type }
+
     validates :identity_type, presence: true
     validates :identity_type, uniqueness: { scope: :user_id }
 
-    # custom validation to ensure that the sub is unique per identity_type and spree_users.tenant
-    validate :unique_sub_per_identity_type_and_tenant
+    has_many :user_identity_provider_telegram_bots
+    has_many :telegram_bots, through: :user_identity_provider_telegram_bots
 
     # sub is a telegram uid, which telegram considered a chatID if
     # user have /started with bot.
@@ -22,25 +20,5 @@ module SpreeCmCommissioner
 
       nil
     end
-
-    private
-
-    def unique_sub_per_identity_type_and_tenant
-      return if user.nil? || sub.blank? || identity_type.blank?
-
-      tenant_id = user.tenant_id
-
-      # Check for duplicates in the same tenant
-      scope = self.class
-                  .joins(:user)
-                  .where(sub: sub, identity_type: identity_type)
-                  .where(spree_users: { tenant_id: tenant_id })
-
-      scope = scope.where.not(id: id) if persisted?
-
-      return unless scope.exists?
-
-      errors.add(:sub, 'must be unique per identity_type and tenant')
-    end
   end
 end

data/app/models/spree_cm_commissioner/user_taxon.rb

@@ -2,6 +2,5 @@ module SpreeCmCommissioner
   class UserTaxon < Base
     belongs_to :user, class_name: Spree.user_class.to_s, optional: false
     belongs_to :taxon, class_name: 'Spree::Taxon', optional: false
-    has_many :invite_user_taxons, class_name: 'SpreeCmCommissioner::InviteUserTaxon', dependent: :destroy
   end
 end

data/app/models/spree_cm_commissioner/variant_block.rb

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  class VariantBlock < Base
+    belongs_to :variant, class_name: 'Spree::Variant', optional: false
+    belongs_to :trip, class_name: 'SpreeCmCommissioner::Trip', optional: false
+    belongs_to :block, class_name: 'SpreeCmCommissioner::Block', optional: false
+
+    validates :block_id, uniqueness: { scope: %i[variant_id trip_id] }
+  end
+end

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,25 @@ 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
 
       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 +124,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
+  class Vehicle < Base
     include SpreeCmCommissioner::RouteType
 
-    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'
 
-    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
 
     validates :code, uniqueness: { scope: :vendor_id }, presence: true
-    validates :license_plate, uniqueness: {}, allow_blank: true
-
-    def create_vehicle_option_value
-      SpreeCmCommissioner::VehicleOptionValueCreator.call(self)
-    end
+    validates :license_plate, uniqueness: true, allow_blank: true
 
     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,12 +36,13 @@ 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, -> { branches }, class_name: 'SpreeCmCommissioner::VendorPlace'
+      base.has_many :stops, -> { stops }, class_name: 'SpreeCmCommissioner::VendorPlace'
+      base.has_many :locations, -> { locations }, 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'
@@ -78,16 +79,12 @@ module SpreeCmCommissioner
       base.has_many :invoices, class_name: 'SpreeCmCommissioner::Invoice', dependent: :destroy
       base.has_many :subscriptions, through: :customers, class_name: 'SpreeCmCommissioner::Subscription'
       base.has_many :subscription_orders, through: :subscriptions, class_name: 'Spree::Order', source: :orders
-      base.has_many :promotion_categories, class_name: 'Spree::PromotionCategory', foreign_key: :vendor_id, dependent: :destroy
 
       base.has_many :homepage_section_relatables,
                     class_name: 'SpreeCmCommissioner::HomepageSectionRelatable',
                     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.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

@@ -7,13 +7,14 @@ module SpreeCmCommissioner
     belongs_to :place, class_name: 'SpreeCmCommissioner::Place', optional: false
 
     validates :place_type, presence: true
-    validates :place_id, uniqueness: { scope: %i[vendor_id place_type] }
+    validates :position, presence: true, numericality: { only_integer: true, greater_than: 0 }
 
-    accepts_nested_attributes_for :place, allow_destroy: true
+    # include place when using these delegate to avoid N+1
+    def display_name
+      place&.name
+    end
 
-    scope :branches,  -> { where(place_type: :branch) }
-    scope :stops,     -> { where(place_type: :stop) }
-    scope :locations, -> { where(place_type: :location) }
+    accepts_nested_attributes_for :place, allow_destroy: true
 
     def selected
       vendor.selected_place_references.include?(place&.reference)

data/app/models/spree_cm_commissioner/vendor_stop.rb

@@ -1,6 +1,5 @@
-require_dependency 'spree_cm_commissioner'
 module SpreeCmCommissioner
-  class VendorStop < ApplicationRecord
+  class VendorStop < Base
     belongs_to :vendor, class_name: 'Spree::Vendor'
     belongs_to :stop, class_name: 'SpreeCmCommissioner::Place'
 

data/app/overrides/spree/admin/variants/_form/kyc_field.html.erb.deface

@@ -2,13 +2,13 @@
 
 <p>Guest Information Fields</p>
 <div class="form-check mb-3">
-  <%= f.check_box :use_product_kyc, id: "toggleGuestInfo", class: 'form-check-input mr-2', checked: @variant.kyc.nil? %>
+  <%= f.check_box :use_product_kyc, id: "toggleGuestInfo", class: 'form-check-input mr-2', checked: (@variant.kyc == @product.kyc) %>
   <label for="toggleGuestInfo" class="form-check-label">
     Use Product Guest Information
   </label>
 </div>
 
-<div id="guestInfoForm" <% if @variant.kyc.nil? %>style="display: none;"<% end %>">
+<div id="guestInfoForm" <% if @variant.kyc == @product.kyc %>style="display: none;"<% end %>">
   <small class="form-text text-muted mb-4">
     <%= raw I18n.t('kyc.variant_note') %>
   </small>

data/app/queries/spree_cm_commissioner/guest_searcher_query.rb

@@ -8,36 +8,20 @@ module SpreeCmCommissioner
 
     def event_id = params[:event_id]
 
-    def call # rubocop:disable Metrics/PerceivedComplexity
+    def call
       return SpreeCmCommissioner::Guest.none if event_id.blank?
 
-      if params[:qr_data].present? && order_qr_data?
-        search_by_order_qr
-      elsif params[:qr_data].present? && line_item_qr_data?
-        search_by_line_item_qr
-      elsif params[:qr_data].present? && guest_qr_data?
+      if params[:qr_data].present?
         search_by_guest_qr
       elsif params[:term].present?
         search_by_term
-      elsif params[:ids].present?
-        SpreeCmCommissioner::Guest.complete_or_canceled.where(event_id: event_id, id: params[:ids])
       else
-        SpreeCmCommissioner::Guest.complete_or_canceled.where(event_id: event_id)
+        SpreeCmCommissioner::Guest.none
       end
     end
 
     private
 
-    def search_by_order_qr
-      order = Spree::Order.complete_or_canceled.search_by_qr_data!(params[:qr_data])
-      order.guests.where(event_id: event_id)
-    end
-
-    def search_by_line_item_qr
-      line_item = Spree::LineItem.complete_or_canceled.search_by_qr_data!(params[:qr_data])
-      line_item.guests.where(event_id: event_id)
-    end
-
     def search_by_guest_qr
       SpreeCmCommissioner::Guest.complete_or_canceled.where(
         token: params[:qr_data],
@@ -45,32 +29,6 @@ module SpreeCmCommissioner
       )
     end
 
-    def order_qr_data?
-      matches = construct_matches
-      matches&.size == 2
-    end
-
-    def line_item_qr_data?
-      matches = construct_matches
-      matches&.size == 3
-    end
-
-    def guest_qr_data?
-      matches = construct_matches
-      matches.nil?
-    end
-
-    def construct_matches
-      qr_data = params[:qr_data]
-      return nil unless qr_data
-
-      if qr_data =~ /-L\d+$/
-        qr_data.match(/(R\d+)-([A-Za-z0-9_\-]+)-(L\d+)/)&.captures
-      else
-        qr_data.match(/(R\d+)-([A-Za-z0-9_\-]+)/)&.captures
-      end
-    end
-
     def search_by_term
       terms = params[:term].split.map { |term| "%#{term.downcase}%" }
 

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -2,18 +2,18 @@ module SpreeCmCommissioner
   class TripQuery
     include SpreeCmCommissioner::Transit::TripHelper
 
-    attr_reader :origin_id, :destination_id, :travel_date, :params
+    attr_reader :origin_id, :destination_id, :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
+      @date = Time.zone.now if date.to_date == Time.zone.now.to_date
       @params = params
     end
 
     def call
-      return [] if travel_date.to_date < Date.current
+      return [] if date.to_date < Date.current
 
       direct_results = direct_trips.map { |trip| SpreeCmCommissioner::TripQueryResult.new([trip]) }
       connected_results = connected_trips || []
@@ -35,18 +35,18 @@ module SpreeCmCommissioner
                         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 spree_products AS routes ON routes.id = spree_variants.product_id')
+               .joins('INNER JOIN cm_trips AS trips ON trips.product_id = routes.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')
+                            date.strftime('%H:%M:%S'),
+                            date.end_of_day.strftime('%H:%M:%S')
                            )
-
       result.map do |trip|
         trip_result_options = {
           trip_id: trip[:variant_id],
@@ -70,20 +70,18 @@ module SpreeCmCommissioner
     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'
+                INNER JOIN cm_trips trip1 ON trip1.id = cm_trip_connections.from_trip_id
+                INNER JOIN cm_trips trip2 ON trip2.id = cm_trip_connections.to_trip_id
+                INNER JOIN spree_products AS routes1 ON routes1.id = trip1.product_id
+                INNER JOIN spree_products AS routes2 ON routes2.id = trip2.product_id
+                INNER JOIN cm_trip_stops trip1_origin ON trip1_origin.trip_id = trip1.id AND trip1_origin.stop_type = 0
+                INNER JOIN cm_trip_stops trip2_origin ON trip2_origin.trip_id = trip2.id AND trip2_origin.stop_type = 0
+                INNER JOIN cm_trip_stops trip2_destination ON trip2_destination.trip_id = trip2.id AND trip2_destination.stop_type = 1
+                INNER JOIN spree_vendors AS vendor1 ON vendor1.id = routes1.vendor_id
+                INNER JOIN spree_vendors AS vendor2 ON vendor2.id = routes2.vendor_id'
                      )
                .select('cm_trip_connections.id AS id,
-                        trip1.variant_id AS trip1_id,
+                        trip1.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,
@@ -92,7 +90,7 @@ module SpreeCmCommissioner
                         routes1.name AS route1_name,
                         trip1.vehicle_id AS trip1_vehicle,
                         vendor1.name AS trip1_vendor_name,
-                        trip2.variant_id AS trip2_id,
+                        trip2.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,
@@ -106,10 +104,9 @@ module SpreeCmCommissioner
                         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')
+      result = result.where('trip1.departure_time > ? AND trip1.departure_time <= ?', date.strftime('%H:%M:%S'),
+                            date.end_of_day.strftime('%H:%M:%S')
       ).uniq
-
       return [] if result.blank?
 
       build_trip_query_result(result)

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/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/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,

data/app/serializers/spree/v2/tenant/user_serializer.rb

@@ -11,7 +11,6 @@ module Spree
         has_one :profile, serializer: Spree::V2::Tenant::AssetSerializer
         has_many :device_tokens, serializer: Spree::V2::Tenant::UserDeviceTokenSerializer
         has_many :spree_roles, serializer: Spree::V2::Tenant::RoleSerializer
-        has_many :user_identity_providers, serializer: Spree::V2::Tenant::UserIdentityProviderSerializer
 
         attribute :store_credits, &:total_available_store_credit
 

data/app/serializers/spree_cm_commissioner/v2/operator/dashboard_crew_event_serializer.rb

@@ -2,10 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Operator
       class DashboardCrewEventSerializer < BaseSerializer
-        attributes :id, :name, :permalink,
-                   :from_date, :to_date,
-                   :check_in_flows,
-                   :updated_at
+        attributes :id, :name, :permalink, :from_date, :to_date, :updated_at
 
         has_many :children_classifications, serializer: :classification
         has_one :category_icon, serializer: SpreeCmCommissioner::V2::Storefront::AssetSerializer

data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_option_serializer.rb

@@ -2,7 +2,9 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldOptionSerializer < BaseSerializer
-        attributes :id, :value, :dynamic_field_id, :status, :created_at, :updated_at, :position
+        set_type :dynamic_field_option
+
+        attributes :id, :value, :dynamic_field_id, :created_at, :updated_at
       end
     end
   end

data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_serializer.rb

@@ -2,7 +2,9 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldSerializer < BaseSerializer
-        attributes :id, :label, :data_type, :vendor_id, :multiple_select, :created_at, :updated_at, :position
+        set_type :dynamic_field
+
+        attributes :id, :label, :data_type, :vendor_id, :created_at, :updated_at
 
         has_many :dynamic_field_options, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end

data/app/serializers/spree_cm_commissioner/v2/storefront/guest_dynamic_field_serializer.rb

@@ -4,10 +4,9 @@ module SpreeCmCommissioner
       class GuestDynamicFieldSerializer < BaseSerializer
         set_type :guest_dynamic_field
 
-        attributes :id, :value, :guest_id, :dynamic_field_id, :dynamic_field_option_id, :created_at, :updated_at
+        attributes :id, :value, :guest_id, :dynamic_field_id, :created_at, :updated_at
 
         belongs_to :dynamic_field, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldSerializer
-        belongs_to :dynamic_field_option, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end
     end
   end