spree_cm_commissioner 2.5.1.pre.pre2 → 2.5.1.pre.pre3

data/app/models/concerns/spree_cm_commissioner/route_trip_count_callbacks.rb

@@ -0,0 +1,48 @@
+module SpreeCmCommissioner
+  module RouteTripCountCallbacks
+    extend ActiveSupport::Concern
+
+    included do
+      after_create :increase_trip_count
+      before_destroy :decrease_trip_count
+
+      # When route context may change, enqueue an async job after commit that
+      # reads the previous values from `previous_changes` to decrement counts
+      # on the old route/vendor. This avoids keeping in-memory state and keeps
+      # the Trip update fast.
+      after_commit :enqueue_decrement_previous_route_trip_counts, on: :update
+
+      after_commit :increment_new_route_trip_counts, on: :update, if: :changed_route_context?
+    end
+
+    private
+
+    def decrease_trip_count
+      SpreeCmCommissioner::Transit::RouteTripCountDecrementerJob.perform_now(trip_id: id)
+    end
+
+    def increase_trip_count
+      SpreeCmCommissioner::Transit::RouteTripCountIncrementerJob.perform_later(trip_id: id)
+    end
+
+    # Read previous_changes to find prior route context and enqueue the job.
+    def enqueue_decrement_previous_route_trip_counts
+      prev_route_id = previous_changes['route_id']&.first
+      prev_origin_id = previous_changes['origin_place_id']&.first
+      prev_destination_id = previous_changes['destination_place_id']&.first
+
+      return unless prev_route_id.present? && prev_origin_id.present? && prev_destination_id.present?
+
+      SpreeCmCommissioner::Transit::RoutePreviousTripCountDecrementerJob.perform_later(
+        previous_route_id: prev_route_id
+      )
+    end
+
+    # Safely increment the trip_count for the trip's (new) route after update.
+    def increment_new_route_trip_counts
+      return if origin_place_id.blank? || destination_place_id.blank? || route_id.blank?
+
+      SpreeCmCommissioner::Transit::RouteTripCountIncrementerJob.perform_later(trip_id: id)
+    end
+  end
+end

data/app/models/concerns/spree_cm_commissioner/user_identity.rb

@@ -51,12 +51,6 @@ module SpreeCmCommissioner
       end
     end
 
-    # override:spree_auth_devise:app/models/spree/user.rb
-    def set_login
-      self.login ||= phone_number if phone_number
-      self.login ||= email if email
-    end
-
     # override:devise:lib/devise/models/validatable.rb
     def email_required?
       require_login_identity_all_blank_for(:email)

data/app/models/concerns/spree_cm_commissioner/variant_options_concern.rb

@@ -85,6 +85,10 @@ module SpreeCmCommissioner
       options.end_time
     end
 
+    def bib_required?
+      bib_prefix.present?
+    end
+
     def post_paid?
       options.payment_option == 'post-paid'
     end

data/app/models/spree_cm_commissioner/guest.rb

@@ -62,7 +62,7 @@ module SpreeCmCommissioner
     before_validation :assign_seat_number_with_block, if: -> { will_save_change_to_block_id? }
 
     before_save :preload_eligible_check_in_session_ids, if: -> { new_record? }
-    before_create :generate_bib, if: -> { line_item.reload && variant.bib_pre_generation_on_create? }
+    before_create :generate_bib_if_needed, if: -> { line_item.reload && variant.bib_pre_generation_on_create? }
     after_create :preload_order_block_ids, if: -> { block_id.present? }
     after_update :preload_order_block_ids, if: :saved_change_to_block_id?
     before_destroy :cancel_reserved_block!, if: -> { reserved_block.present? }
@@ -241,14 +241,14 @@ module SpreeCmCommissioner
     end
 
     def bib_required?
-      line_item.variant.bib_prefix.present?
+      line_item.variant.bib_required?
     end
 
     def bib_display_prefix?
       line_item.variant.bib_display_prefix?
     end
 
-    def generate_bib
+    def generate_bib_if_needed
       return if bib_prefix.present?
       return unless bib_required?
       return if event_id.blank?
@@ -264,7 +264,7 @@ module SpreeCmCommissioner
     end
 
     def generate_bib!
-      generate_bib
+      generate_bib_if_needed
       save!
     end
 

data/app/models/spree_cm_commissioner/place.rb

@@ -21,12 +21,15 @@ module SpreeCmCommissioner
     has_many :taxon_places, class_name: 'SpreeCmCommissioner::TaxonPlace', dependent: :destroy
     has_many :taxons, through: :taxon_places
 
-    has_many :route_metrics_as_origin, class_name: 'SpreeCmCommissioner::RouteMetric', foreign_key: :origin_place_id
-    has_many :route_metrics_as_destination, class_name: 'SpreeCmCommissioner::RouteMetric', foreign_key: :destination_place_id
+    has_many :routes_as_origin, class_name: 'SpreeCmCommissioner::Route', foreign_key: :origin_place_id
+    has_many :routes_as_destination, class_name: 'SpreeCmCommissioner::Route', foreign_key: :destination_place_id
 
-    # Scopes for route metric filtering
-    scope :with_route_metrics_as_origin, -> { joins(:route_metrics_as_origin).distinct }
-    scope :with_route_metrics_as_destination, -> { joins(:route_metrics_as_destination).distinct }
+    has_many :trips_as_origin, through: :routes_as_origin, source: :trips
+    has_many :trips_as_destination, through: :routes_as_destination, source: :trips
+
+    # Scopes for route-based filtering
+    scope :with_routes_as_origin, -> { joins(:routes_as_origin).distinct }
+    scope :with_routes_as_destination, -> { joins(:routes_as_destination).distinct }
 
     def self.ransackable_attributes(auth_object = nil)
       super & %w[name code]

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -48,7 +48,6 @@ module SpreeCmCommissioner
       base.accepts_nested_attributes_for :product_places, allow_destroy: true
 
       base.has_one :trip, class_name: 'SpreeCmCommissioner::Trip', dependent: :destroy
-      base.has_one :service_calendar, as: :calendarable, class_name: 'SpreeCmCommissioner::ServiceCalendar', dependent: :destroy
 
       base.belongs_to :event, class_name: 'Spree::Taxon', optional: true
 

data/app/models/spree_cm_commissioner/route.rb

@@ -1,53 +1,12 @@
 module SpreeCmCommissioner
   class Route < Base
-    include SpreeCmCommissioner::RouteType
-
-    belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
-    belongs_to :tenant, class_name: 'SpreeCmCommissioner::Tenant', optional: true
-
-    belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place', optional: false
-    belongs_to :destination_place, class_name: 'SpreeCmCommissioner::Place', optional: false
-
-    has_one :primary_photo, -> { order(position: :asc) },
-            class_name: 'SpreeCmCommissioner::RoutePhoto',
-            as: :viewable,
-            dependent: :destroy
-    has_many :route_photos, class_name: 'SpreeCmCommissioner::RoutePhoto', as: :viewable, dependent: :destroy
-
+    has_many :vendor_routes, class_name: 'SpreeCmCommissioner::VendorRoute', dependent: :destroy
+    has_many :vendors, through: :vendor_routes
     has_many :trips, inverse_of: :route
 
-    validates :route_name, presence: true
-
-    validate :validate_route_stops
-
-    delegate :multi_leg?, to: :route_stops
-
-    def self.ransackable_attributes(_auth_object = nil)
-      %w[route_type short_name route_name]
-    end
-
-    def route_stops
-      Transit::RouteStopCollection.from_hash(read_attribute(:route_stops))
-    end
-
-    def route_stops=(value)
-      if value.is_a?(Transit::RouteStopCollection)
-        @route_stops = value
-        self[:route_stops] = value.to_h
-      elsif value.is_a?(Array)
-        @route_stops = Transit::RouteStopCollection.from_hash(value)
-        self[:route_stops] = @route_stops.to_h
-      else
-        raise ArgumentError, 'route_stops must be an Array or RouteStopCollection'
-      end
-    end
-
-    private
-
-    def validate_route_stops
-      return if route_stops.valid?
+    belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place'
+    belongs_to :destination_place, class_name: 'SpreeCmCommissioner::Place'
 
-      route_stops.errors.each { |error| errors.add(:route_stops, error) }
-    end
+    validates :origin_place_id, uniqueness: { scope: :destination_place_id }
   end
 end

data/app/models/spree_cm_commissioner/trip.rb

@@ -2,6 +2,7 @@ module SpreeCmCommissioner
   class Trip < Base
     include SpreeCmCommissioner::StoreMetadata
     include SpreeCmCommissioner::RouteType
+    include SpreeCmCommissioner::RouteTripCountCallbacks
 
     attr_accessor :hours, :minutes, :seconds
 
@@ -14,9 +15,7 @@ module SpreeCmCommissioner
 
     # before create, duplicate seat layout from vehicle_type if present
     before_validation :duplicate_seat_layout_from_vehicle, if: -> { seat_layout.nil? && vehicle_type&.seat_layout.present? }
-
-    after_create :increment_route_metric_trip_count
-    before_destroy :decrement_route_metric_trip_count
+    before_validation :assign_route_and_vendor_route, if: :changed_route_attributes?
 
     belongs_to :vendor, class_name: 'Spree::Vendor', inverse_of: :trips, optional: false
     belongs_to :product, class_name: 'Spree::Product', inverse_of: :trip, optional: false
@@ -27,7 +26,7 @@ module SpreeCmCommissioner
 
     belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place', optional: false
     belongs_to :destination_place, class_name: 'SpreeCmCommissioner::Place', optional: false
-    belongs_to :route, class_name: 'SpreeCmCommissioner::Route', inverse_of: :trips, optional: true
+    belongs_to :route, inverse_of: :trips
 
     has_many :trip_blazer_queries, as: :queryable, class_name: 'SpreeCmCommissioner::BlazerQueryable'
     has_many :blazer_queries, through: :trip_blazer_queries, source: :blazer_query, class_name: 'Blazer::Query'
@@ -49,6 +48,10 @@ module SpreeCmCommissioner
     self.whitelisted_ransackable_associations = %w[product vehicle vehicle_type]
     self.whitelisted_ransackable_attributes = %w[origin_place_id destination_place_id]
 
+    def changed_route_attributes?
+      origin_place_id_changed? || destination_place_id_changed? || vendor_id_changed?
+    end
+
     def convert_duration_to_seconds
       return if hours.blank? && minutes.blank? && seconds.blank?
 
@@ -101,12 +104,34 @@ module SpreeCmCommissioner
                 )
     end
 
-    def increment_route_metric_trip_count
-      SpreeCmCommissioner::RouteMetrics::IncreaseTripCountJob.perform_later(trip_id: id)
+    # Check if any of the route context attributes are changing
+    def will_route_context_change?
+      # Returns true if any of the route context attributes will change on save.
+      will_save_change_to_route_id? ||
+        will_save_change_to_origin_place_id? ||
+        will_save_change_to_destination_place_id? ||
+        will_save_change_to_vendor_id?
+    end
+
+    def changed_route_context?
+      saved_change_to_route_id? ||
+        saved_change_to_origin_place_id? ||
+        saved_change_to_destination_place_id? ||
+        saved_change_to_vendor_id?
     end
 
-    def decrement_route_metric_trip_count
-      SpreeCmCommissioner::RouteMetrics::DecreaseTripCountJob.perform_later(trip_id: id)
+    # Find or create the Route for this trip (by origin/destination) and
+    # assign it to the trip. Also populate a default route_name from the
+    # product when the route is new/blank.
+    def assign_route_and_vendor_route
+      route = SpreeCmCommissioner::Route.find_or_create_by!(
+        origin_place_id: origin_place_id,
+        destination_place_id: destination_place_id
+      )
+      route.route_name = product.name if route.route_name.blank?
+      route.save! if route.changed?
+
+      self.route_id = route.id
     end
   end
 end

data/app/models/spree_cm_commissioner/trip_connection.rb

@@ -0,0 +1,36 @@
+module SpreeCmCommissioner
+  class TripConnection < Base
+    belongs_to :from_trip, class_name: 'SpreeCmCommissioner::Trip'
+    belongs_to :to_trip, class_name: 'SpreeCmCommissioner::Trip'
+
+    validate :both_trip_cannot_be_the_same
+    before_validation :calculate_connection_time_minutes
+    validates :from_trip_id, uniqueness: { scope: :to_trip_id }
+
+    private
+
+    def calculate_connection_time_minutes
+      return if from_trip.nil? || to_trip.nil?
+
+      arrival_seconds   = from_trip.arrival_time.seconds_since_midnight
+      departure_seconds = to_trip.departure_time.seconds_since_midnight
+
+      layover_seconds = departure_seconds - arrival_seconds
+      layover_seconds += 86_400 if layover_seconds.negative?
+
+      connection_time_in_minutes = layover_seconds / 60
+
+      if connection_time_in_minutes.between?(0, 180)
+        self.connection_time_minutes = connection_time_in_minutes.to_i
+      else
+        errors.add(:base, 'Connection time must be less than 3 hours')
+      end
+    end
+
+    def both_trip_cannot_be_the_same
+      return unless from_trip.id == to_trip.id
+
+      errors.add(:base, 'Both trip cannot be the same')
+    end
+  end
+end

data/app/models/spree_cm_commissioner/trip_stop.rb

@@ -1,39 +1,25 @@
 module SpreeCmCommissioner
   class TripStop < Base
     acts_as_list column: :sequence, scope: :trip_id
+    enum :stop_type, { boarding: 0, drop_off: 1 }
 
     belongs_to :trip, class_name: 'SpreeCmCommissioner::Trip', optional: false
     belongs_to :stop_place, class_name: 'SpreeCmCommissioner::Place', optional: false
     belongs_to :location_place, class_name: 'SpreeCmCommissioner::Place', optional: false
 
-    belongs_to :board_to_trip, class_name: 'SpreeCmCommissioner::Trip', optional: true
-
     before_validation :set_stop_name
-
     validates :stop_place_id, uniqueness: { scope: :trip_id }
-    validate :boarding_trip_requires_allow_boarding
-
-    scope :boarding, -> { where(allow_boarding: true) }
-    scope :drop_off, -> { where(allow_drop_off: true) }
 
     def set_stop_name
       self.stop_name = stop_place.name if stop_place.present?
     end
 
     def self.ransackable_attributes(_auth_object = nil)
-      %w[stop_name allow_boarding allow_drop_off]
+      %w[stop_name stop_type]
     end
 
     def self.ransackable_associations(_auth_object = nil)
       ['stop_place']
     end
-
-    private
-
-    def boarding_trip_requires_allow_boarding
-      return unless board_to_trip_id.present? && !allow_boarding?
-
-      errors.add(:board_to_trip, 'requires allow_boarding to be true')
-    end
   end
 end

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -31,6 +31,8 @@ module SpreeCmCommissioner
 
       base.has_many :wished_items, class_name: 'Spree::WishedItem', through: :wishlists
       base.has_many :promotions, through: :promotion_rules, class_name: 'Spree::Promotion'
+      base.has_many :user_places, class_name: 'SpreeCmCommissioner::UserPlace'
+      base.has_many :places, through: :user_places, class_name: 'SpreeCmCommissioner::Place'
 
       base.has_one :profile, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::UserProfile'
       base.has_one :customer, class_name: 'SpreeCmCommissioner::Customer'
@@ -43,26 +45,27 @@ module SpreeCmCommissioner
       base.scope :by_non_tenant, -> { where(tenant_id: nil) }
       base.scope :vendor_users, -> (vendor_id) { joins(:role_users => :role).where(spree_roles: { vendor_id: vendor_id }).distinct }
 
-      base.whitelisted_ransackable_attributes = %w[email first_name last_name gender phone_number]
-
-      base.before_save :update_otp_enabled
-      base.attr_accessor :assigned_roles
-      base.validates_password_strength :password, if: -> { requires_strong_password? && password.present? }
-
-      # Store has_incomplete_guest_info in public_metadata for easy frontend access
       base.store :public_metadata, accessors: [:has_incomplete_guest_info], coder: JSON
+      base.store :private_metadata, accessors: %i[otp_secret otp_required_for_login consumed_timestep], coder: JSON
+
       base.store_public_metadata :primary_service_type, :string
+      base.store_public_metadata :qr_data_version, :integer, default: 1
+      base.store_public_metadata :qr_data_invalidated_at, :datetime
+      base.store_public_metadata :branch_ids, :array, default: []
+
+      # Validations
       base.validates :primary_service_type,
                      inclusion: { in: SpreeCmCommissioner::ServiceType::SERVICE_TYPES.map(&:to_s) },
                      allow_nil: true
-      base.store_public_metadata :branch_ids, :array, default: []
-
-      base.devise :two_factor_authenticatable
-
-      base.store :private_metadata, accessors: %i[otp_secret otp_required_for_login consumed_timestep], coder: JSON
+      base.validates_password_strength :password, if: -> { requires_strong_password? && password.present? }
 
-      define_user_places(base)
+      # Login/username affect QR data, so invalidate it on change.
+      base.before_validation :invalidate_qr_data, if: :will_save_change_to_login?
+      base.before_save :update_otp_enabled
 
+      base.attr_accessor :assigned_roles
+      base.whitelisted_ransackable_attributes = %w[email first_name last_name gender phone_number]
+      base.devise :two_factor_authenticatable
       def base.end_users
         joins('LEFT JOIN spree_vendor_users ON spree_users.id = spree_vendor_users.user_id').where(spree_vendor_users: { user_id: nil })
       end
@@ -78,6 +81,10 @@ module SpreeCmCommissioner
       end
     end
 
+    def qr_data
+      SpreeCmCommissioner::Users::QrData::Generate.call(user: self).value
+    end
+
     def otp_secret
       private_metadata['otp_secret']
     end
@@ -90,15 +97,15 @@ module SpreeCmCommissioner
       private_metadata['consumed_timestep']
     end
 
-    def self.define_user_places(base)
-      base.has_many :user_places, class_name: 'SpreeCmCommissioner::UserPlace'
-      base.has_many :places, through: :user_places, class_name: 'SpreeCmCommissioner::Place'
-    end
-
     def permissions_for_vendor(vendor_id)
       permissions.joins(role_permissions: :role).where(spree_roles: { vendor_id: vendor_id })
     end
 
+    # override to auto-generate clean usernames (eg. JohnTraveler1 format)
+    def set_login
+      self.login ||= SpreeCmCommissioner::Users::Username::Generate.call(user: self)
+    end
+
     # override
     def has_spree_role?(role_name) # rubocop:disable Naming/PredicateName
       spree_roles.non_vendor.exists?(name: role_name)
@@ -148,6 +155,11 @@ module SpreeCmCommissioner
       phone_number
     end
 
+    def invalidate_qr_data
+      self.qr_data_version += 1
+      self.qr_data_invalidated_at = Time.zone.now
+    end
+
     def ensure_unique_database_delivery_method(attributes)
       recipient = self
 

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -82,9 +82,7 @@ module SpreeCmCommissioner
       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 :routes, class_name: 'SpreeCmCommissioner::Route', dependent: :destroy
-      base.has_many :popular_routes, -> { order(fulfilled_order_count: :desc, order_count: :desc) },
-                    class_name: 'SpreeCmCommissioner::Route'
+      base.has_many :vendor_routes, class_name: 'SpreeCmCommissioner::VendorRoute'
 
       base.has_many :homepage_section_relatables,
                     as: :relatable,

data/app/models/spree_cm_commissioner/vendor_route.rb

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  class VendorRoute < Base
+    belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
+    belongs_to :route, class_name: 'SpreeCmCommissioner::Route', optional: false
+
+    has_many :trips, -> (vr) { where(vendor_id: vr.vendor_id, route_id: vr.route_id) }, class_name: 'SpreeCmCommissioner::Trip'
+    validates :vendor_id, uniqueness: { scope: :route_id }
+  end
+end

data/app/queries/spree_cm_commissioner/guest_searcher_query.rb

@@ -8,7 +8,7 @@ module SpreeCmCommissioner
 
     def event_id = params[:event_id]
 
-    def call # rubocop:disable Metrics/PerceivedComplexity
+    def call # rubocop:disable Metrics/PerceivedComplexity,Metrics/CyclomaticComplexity
       return SpreeCmCommissioner::Guest.none if event_id.blank?
 
       if params[:qr_data].present? && order_qr_data?
@@ -17,6 +17,11 @@ module SpreeCmCommissioner
         search_by_line_item_qr
       elsif params[:qr_data].present? && guest_qr_data?
         search_by_guest_qr
+      elsif params[:qr_data].present? && user_qr_data?
+        search_by_user_qr
+      # QR data provided but didn't match any format, return none
+      elsif params[:qr_data].present?
+        SpreeCmCommissioner::Guest.none
       elsif params[:term].present?
         search_by_term
       elsif params[:ids].present?
@@ -45,6 +50,13 @@ module SpreeCmCommissioner
       )
     end
 
+    def search_by_user_qr
+      result = SpreeCmCommissioner::Users::QrData::Verify.call(qr_data: params[:qr_data])
+      return SpreeCmCommissioner::Guest.none if result.failure?
+
+      result.value.guests.complete_or_canceled.where(event_id: event_id)
+    end
+
     def order_qr_data?
       matches = construct_matches
       matches&.size == 2
@@ -57,7 +69,18 @@ module SpreeCmCommissioner
 
     def guest_qr_data?
       matches = construct_matches
-      matches.nil?
+      uuid_format = params[:qr_data].match?(/\A[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\z/)
+      matches.nil? && uuid_format
+    end
+
+    # When login is present in the QR payload, we treat it as user QR data.
+    # This method only extracts login from qr_data; it does not verify or load any records, so it is fast.
+    # Once we have identified it as user QR data, we perform the actual lookup and verification elsewhere.
+    def user_qr_data?
+      @user_qr_data ||= begin
+        result = SpreeCmCommissioner::Users::QrData::ExtractLogin.call(qr_data: params[:qr_data])
+        result.success? ? result.value : nil
+      end.present?
     end
 
     def construct_matches

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -77,8 +77,8 @@ module SpreeCmCommissioner
 
       scope
         .joins(<<~SQL.squish)
-          INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = cm_trips.id AND boarding.allow_boarding = true
-          INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = cm_trips.id AND drop_off.allow_drop_off = true
+          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_variants AS master ON master.product_id = cm_trips.product_id AND master.is_master = true

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

@@ -5,7 +5,8 @@ module Spree
         def self.prepended(base)
           base.attributes :first_name, :last_name, :gender, :phone_number, :intel_phone_number,
                           :country_code, :otp_enabled, :otp_email, :otp_phone_number,
-                          :confirm_pin_code_enabled, :tenant_id, :has_incomplete_guest_info
+                          :confirm_pin_code_enabled, :tenant_id, :has_incomplete_guest_info,
+                          :login, :qr_data, :qr_data_version, :qr_data_invalidated_at
 
           base.has_one :profile, serializer: ::Spree::V2::Storefront::UserProfileSerializer
           base.has_many :device_tokens, serializer: Spree::V2::Storefront::UserDeviceTokenSerializer

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

@@ -12,6 +12,7 @@ module SpreeCmCommissioner
         attribute :require_kyc_field, &:require_kyc_field?
 
         belongs_to :occupation, serializer: Spree::V2::Storefront::TaxonSerializer
+        belongs_to :user, serializer: SpreeCmCommissioner::V2::Operator::UserSerializer
 
         has_many :check_ins, serializer: SpreeCmCommissioner::V2::Operator::CheckInSerializer
         has_one :line_item, serializer: SpreeCmCommissioner::V2::Operator::LineItemSerializer

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

@@ -6,8 +6,8 @@ module SpreeCmCommissioner
 
         attributes :number, :name, :quantity, :options_text, :qr_data, :kyc_fields, :available_social_contact_platforms
 
-        belongs_to :order, serializer: SpreeCmCommissioner::V2::Operator::LineItemOrderSerializer
-        has_one  :variant, serializer: SpreeCmCommissioner::V2::Storefront::EventVariantSerializer
+        belongs_to :order, serializer: SpreeCmCommissioner::V2::Operator::OrderSerializer
+        has_one :variant, serializer: SpreeCmCommissioner::V2::Operator::VariantSerializer
         has_many :guests, serializer: SpreeCmCommissioner::V2::Operator::GuestSerializer
       end
     end

data/app/serializers/spree_cm_commissioner/v2/operator/{line_item_order_serializer.rb → order_serializer.rb}

@@ -1,10 +1,9 @@
 module SpreeCmCommissioner
   module V2
     module Operator
-      class LineItemOrderSerializer < BaseSerializer
+      class OrderSerializer < BaseSerializer
         set_type :order
 
-        has_one :user, serializer: Spree::V2::Storefront::UserSerializer
         belongs_to :billing_address,
                    id_method_name: :bill_address_id,
                    record_type: :address,

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

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  module V2
+    module Operator
+      class UserSerializer < BaseSerializer
+        attributes :email, :login,
+                   :phone_number, :intel_phone_number, :country_code,
+                   :first_name, :last_name, :gender
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  module V2
+    module Operator
+      class VariantSerializer < BaseSerializer
+        attributes :color, :ticket_type, :seat_type
+      end
+    end
+  end
+end

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

@@ -2,10 +2,8 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class RouteSerializer < BaseSerializer
-        attributes :route_name, :route_type, :short_name
+        attributes :route_name
 
-        has_many :route_photos, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer,
-                                if: proc { |record, _params| record.respond_to?(:route_photos) }
         has_one :origin_place, serializer: ::Spree::V2::Storefront::PlaceSerializer
         has_one :destination_place, serializer: ::Spree::V2::Storefront::PlaceSerializer
       end

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

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class TripStopSerializer < BaseSerializer
-        attributes :id, :allow_boarding, :allow_drop_off, :stop_name, :arrival_time, :departure_time
+        attributes :id, :stop_type, :stop_name, :arrival_time, :departure_time
 
         has_one :stop_place, serializer: ::SpreeCmCommissioner::V2::Storefront::TripPlaceSerializer
       end