spree_cm_commissioner 2.5.1.pre.pre1 → 2.5.1.pre.pre2

data/app/services/spree_cm_commissioner/trips/update_single_leg.rb

@@ -0,0 +1,88 @@
+module SpreeCmCommissioner
+  module Trips
+    # Service class responsible for updating an existing single-leg trip.
+    # Handles updates to trip, product, variant, stops, and calendar in the booking system.
+    class UpdateSingleLeg
+      prepend Spree::ServiceModule::Base
+
+      # Main service method that orchestrates trip updates within a database transaction.
+      # Updates trip/product, variant if price provided, stops, and calendar conditionally.
+      # Returns success with updated objects or failure with error message.
+      def call(trip:, trip_form:)
+        ApplicationRecord.transaction do
+          update_trip_and_product(trip, trip_form)
+          update_variant(trip, trip_form) if trip_form.price.present?
+          update_trip_stops(trip, trip_form)
+          calendar = update_calendar(trip.product, trip_form.service_calendar) if trip_form.service_calendar.present?
+
+          success(trip: trip, variant: trip.product.variants.first, calendar: calendar)
+        rescue StandardError => e
+          CmAppLogger.error(
+            label: 'SpreeCmCommissioner::Trips::UpdateSingleLeg#call',
+            data: {
+              error_class: e.class.name,
+              error_message: e.message
+            }
+          )
+          failure(nil, 'Failed to update trip')
+        end
+      end
+
+      private
+
+      # Updates the trip record and associated product with attributes from the form.
+      def update_trip_and_product(trip, trip_form)
+        trip.update!(trip_attrs(trip_form))
+        trip.product.update!(product_attrs(trip_form))
+      end
+
+      # Updates the variant's price if a new price is provided in the form.
+      def update_variant(trip, trip_form)
+        variant = trip.product.variants.where.not(id: trip.product.master.id).first
+        return unless variant
+
+        variant.update!(price: trip_form.price)
+        trip.product.update!(price: trip_form.price)
+      end
+
+      # Iterates through stops and applies updates only if attributes are present.
+      def update_trip_stops(trip, trip_form)
+        trip.trip_stops.each_with_index do |stop, idx|
+          ts_form = trip_form.trip_stops[idx]
+          next unless ts_form
+
+          updates = {
+            allow_boarding: ts_form.allow_boarding?,
+            allow_drop_off: ts_form.allow_drop_off
+          }.compact
+
+          stop.update!(updates) if updates.any?
+        end
+      end
+
+      # Updates or creates the service calendar for the product using calendar form data.
+      def update_calendar(product, calendar_form)
+        result = SpreeCmCommissioner::Trips::ServiceCalendars::CreateOrUpdate.call(
+          calendarable: product,
+          name: calendar_form.name,
+          start_date: calendar_form.start_date,
+          end_date: calendar_form.end_date,
+          weekdays: calendar_form.weekdays,
+          exception_rules: calendar_form.exception_rules || []
+        )
+
+        raise result.error unless result.success?
+
+        result.value[:calendar]
+      end
+
+      def trip_attrs(form)
+        { allow_booking: form.allow_booking, allow_seat_selection: form.allow_seat_selection }.compact
+      end
+
+      def product_attrs(form)
+        { name: form.name, short_name: form.short_name }.compact
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/trips/variants/create.rb

@@ -0,0 +1,103 @@
+module SpreeCmCommissioner
+  module Trips
+    module Variants
+      # Service class responsible for creating product and variant for a trip.
+      # Handles validations, product creation with options, variant pricing, and stock setup.
+      class Create
+        prepend ::Spree::ServiceModule::Base
+
+        # Main method that validates inputs and creates product, options, variant, and stock in transaction.
+        # Returns success with product and variant or failure with error message.
+        def call(vendor:, trip_form:, price:, capacity:)
+          return failure(nil, 'vendor must be present') if vendor.blank?
+          return failure(nil, 'trip_form must be present') if trip_form.blank?
+          return failure(nil, 'price must be present') if price.blank?
+          return failure(nil, 'capacity must be present') if capacity.blank?
+          return failure(nil, 'capacity must be greater than 0') if capacity <= 0
+
+          ApplicationRecord.transaction do
+            product = create_product!(vendor, trip_form)
+            option_values = setup_option_values!(product)
+            variant = create_variant!(product, price, option_values)
+
+            create_stock_item!(variant, capacity)
+
+            success(product: product, variant: variant)
+          end
+        rescue StandardError => e
+          CmAppLogger.error(
+            label: 'SpreeCmCommissioner::Trips::Variants::Create#call',
+            data: {
+              error_class: e.class.name,
+              error_message: e.message
+            }
+          )
+          failure(nil, e.message)
+        end
+
+        private
+
+        # Creates a transit product with name based on stops, assigns vendor, type, and options.
+        # Includes seat-type option type and default store association.
+        def create_product!(vendor, trip_form)
+          vendor_stops = stops(vendor, trip_form)
+          first_stop = vendor_stops[trip_form.trip_stops.first.stop_id].place
+          last_stop = vendor_stops[trip_form.trip_stops.last.stop_id].place
+
+          Spree::Product.create!(
+            name: trip_form.name.presence || "#{first_stop.name} - #{last_stop.name}",
+            short_name: trip_form.short_name,
+            vendor: vendor,
+            product_type: 'transit',
+            status: 'active',
+            available_on: Time.current,
+            price: trip_form.price,
+            shipping_category: Spree::ShippingCategory.find_or_create_by!(name: 'Default'),
+            option_types: [Spree::OptionType.find_by(name: 'seat-type')].compact,
+            stores: [Spree::Store.default].compact
+          )
+        end
+
+        # Retrieves and indexes stops from the vendor for the trip form's stop IDs.
+        def stops(vendor, trip_form)
+          vendor.stops.where(id: trip_form.trip_stops.map(&:stop_id)).index_by(&:id)
+        end
+
+        # Sets up or finds the seat-type option type and creates normal option value.
+        # Associates the option type with the product if not already present.
+        def setup_option_values!(product)
+          option_type = Spree::OptionType.find_or_create_by!(
+            name: 'seat-type',
+            presentation: 'Seat Type'
+          )
+
+          product.option_types << option_type unless product.option_types.include?(option_type)
+
+          option_value = option_type.option_values.find_or_create_by_name!(option_type, 'Normal')
+
+          [option_value]
+        end
+
+        # Creates a product variant with the given price and associated option values.
+        # Saves the variant to the database.
+        def create_variant!(product, price, option_values)
+          variant = product.variants.new(price: price)
+          variant.option_values = option_values
+          variant.save!
+          variant
+        end
+
+        # Creates a stock item for the variant with the specified capacity.
+        # Uses stock movement creator to initialize inventory.
+        def create_stock_item!(variant, capacity)
+          result = SpreeCmCommissioner::Stock::StockMovementCreator.call(
+            variant_id: variant.id,
+            current_store: variant.product.stores.first,
+            stock_movement_params: { quantity: capacity }
+          )
+          result.stock_item
+        end
+      end
+    end
+  end
+end

data/app/views/spree/transit/trip_stops/index.html.erb

@@ -9,7 +9,8 @@
         <tr data-hook="option_header">
           <th class="no-border handel-head"></th>
           <th><%= Spree.t(:name) %></th>
-          <th><%= Spree.t(:stop_type) %></th>
+          <th><%= Spree.t(:allow_boarding) %></th>
+          <th><%= Spree.t(:allow_drop_off) %></th>
           <th><%= Spree.t(:sequence) %></th>
           <th><%= Spree.t(:created_at) %></th>
         </tr>
@@ -21,7 +22,8 @@
               <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
             </td>
             <td><%= stop.stop_name %></td>
-            <td> <%= stop.stop_type %></td>
+            <td> <%= stop.allow_boarding ? 'Yes' : 'No' %></td>
+	           <td> <%= stop.allow_drop_off ? 'Yes' : 'No' %></td>
             <td> <%= stop.sequence %></td>
             <td> <%= stop.created_at.to_date %></td>
           </tr>

data/app/views/spree_cm_commissioner/guest_mailer/send_ticket_to_guest.html.erb

@@ -151,7 +151,6 @@
             <% @trip.trip_stops.order(:sequence).each do |stop| %>
               <tr>
                 <td>
-                  <span class="stop-type <%= stop.stop_type %>"><%= stop.stop_type.to_s.titleize %></span>
                   <div class="stop-name"><strong><%= stop.stop_name %></strong></div>
                   <% if stop.respond_to?(:location_place) && stop.location_place.present? %>
                     <% if stop.location_place.respond_to?(:address) && stop.location_place.address.present? %>

data/config/initializers/spree_permitted_attributes.rb

@@ -1,5 +1,8 @@
 module Spree
   module PermittedAttributes
+    ATTRIBUTES << :route_attributes unless ATTRIBUTES.include?(:route_attributes)
+    mattr_reader :route_attributes
+
     @@vendor_attributes << :logo
 
     # Permitted all guest attributes for now as permitting only some guest attributes is not working by design
@@ -85,5 +88,13 @@ module Spree
       originator_type
       originator_id
     ]
+
+    @@route_attributes = %i[
+      route_name
+      short_name
+      vendor_id
+      route_type
+      route_stops
+    ]
   end
 end

data/config/locales/en.yml

@@ -480,6 +480,8 @@ en:
         success: "Guest uncheck-in in successfully"
     check_in:
       already_checked_in: "Guest has already checked in for this session"
+      check_in_session_required: "Check-in session required"
+      check_in_session_is_not_allowed_or_invalid: "Check-in session is not allowed or invalid for this guest/ticket"
 
   activerecord:
     attributes:

data/config/locales/km.yml

@@ -24,6 +24,8 @@ km:
       success: "Guest uncheck-in in successfully"
   check-in:
     already_checked_in: "ភ្ញៀវបានចូលរួចហើយ"
+    check_in_session_required: "ត្រូវតែមានវគ្គចុះឈ្មោះចូល"
+    check_in_session_is_not_allowed_or_invalid: "វគ្គចុះឈ្មោះនេះមិនត្រឹមត្រូវ សម្រាប់ភ្ញៀវ ឬសំបុត្រនេះទេ"
 
   sms:
     to:

data/config/routes.rb

@@ -560,6 +560,12 @@ Spree::Core::Engine.add_routes do
         resources :trip_places, only: :index
         resources :trip_search, only: [:index]
         resources :trips, only: %i[show]
+        resources :popular_route_places, only: [:index]
+        resources :routes, only: [:index]
+
+        namespace :transit do
+          resources :draft_orders, only: %i[create]
+        end
 
         namespace :intercity_taxi do
           resource :draft_orders, only: %i[create update]
@@ -721,6 +727,8 @@ Spree::Core::Engine.add_routes do
         resources :dashboard_crew_events, only: %i[index]
         resources :event_qrs, only: [:show]
         resources :recalculate_tickets, only: [:create]
+        resources :check_in_sessions, only: %i[index]
+
         resources :taxons, only: %i[show] do
           resource :event_ticket_aggregators, only: %i[show]
           resource :pie_chart_event_aggregators, only: %i[show]

data/db/migrate/20251224033103_migrate_cm_routes_to_cm_route_metrics.rb

@@ -0,0 +1,17 @@
+class MigrateCmRoutesToCmRouteMetrics < ActiveRecord::Migration[7.0]
+  def change
+    # 1. Rename cm_routes which we use to track order, trip count to cm_route_metrics instead.
+    remove_index :cm_routes, [:origin_place_id, :destination_place_id] if index_exists?(:cm_routes, [:origin_place_id, :destination_place_id])
+    rename_table :cm_routes, :cm_route_metrics unless table_exists?(:cm_route_metrics)
+    add_column :cm_route_metrics, :route_type, :integer, default: 0, null: false unless column_exists?(:cm_route_metrics, :route_type)
+
+    # 2. Drop the old index before renaming table to avoid index name length issues & re-add the index with a shorter name
+    unless index_exists?(:cm_route_metrics, [:route_type, :origin_place_id, :destination_place_id], name: 'index_cm_route_metrics_on_origin_dest')
+      add_index :cm_route_metrics, [:route_type, :origin_place_id, :destination_place_id], unique: true, name: 'index_cm_route_metrics_on_origin_dest'
+    end
+
+    # 3. Remove old route_id column from trips.
+    # it has route_metrics value, and trip don't need to have association with metric directly.
+    remove_column :cm_trips, :route_id if column_exists?(:cm_trips, :route_id)
+  end
+end

data/db/migrate/20251224033910_migrate_cm_vendor_routes_to_cm_routes.rb

@@ -0,0 +1,30 @@
+class MigrateCmVendorRoutesToCmRoutes < ActiveRecord::Migration[7.0]
+  def change
+    # 1. Remove cm_vendor_routes and add cm_routes instead for routes that associated with vendor.
+    drop_table :cm_vendor_routes, if_exists: true
+    create_table :cm_routes, if_not_exists: true do |t|
+      t.string :route_name
+      t.string :short_name
+      t.integer :order_count
+      t.integer :fulfilled_order_count
+      t.integer :route_type
+      t.jsonb :route_stops, default: "[]"
+      t.references :vendor, foreign_key: { to_table: :spree_vendors }, null: false
+      t.references :tenant, foreign_key: { to_table: :cm_tenants }, null: true
+
+      t.references :origin_place, foreign_key: { to_table: :cm_places }, null: false
+      t.references :destination_place, foreign_key: { to_table: :cm_places }, null: false
+
+      t.integer :lock_version, default: 0, null: false
+      t.timestamps
+    end
+
+    # 2. Add indexes for popular_routes association (vendor_id + order by fulfilled_order_count, order_count)
+    add_index :cm_routes, [:vendor_id, :route_type, :fulfilled_order_count, :order_count],
+              order: { fulfilled_order_count: :desc, order_count: :desc },
+              name: 'index_cm_routes_on_vendor_id_route_type_and_popular' unless index_exists?(:cm_routes, [:vendor_id, :route_type, :fulfilled_order_count, :order_count])
+
+    # 3. Add new route reference to cm_trips
+    add_reference :cm_trips, :route, foreign_key: { to_table: :cm_routes }, null: true unless column_exists?(:cm_trips, :route_id)
+  end
+end

data/db/migrate/20251225100000_add_age_group_to_cm_guests.rb

@@ -0,0 +1,6 @@
+class AddAgeGroupToCmGuests < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_guests, :age_group, :integer, if_not_exists: true
+    add_index  :cm_guests, :age_group, if_not_exists: true
+  end
+end

data/db/migrate/20260105024742_add_type_to_cm_pricing_actions.rb

@@ -0,0 +1,11 @@
+class AddTypeToCmPricingActions < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_pricing_actions,
+               :type,
+               :string,
+               default: 'SpreeCmCommissioner::PricingActions::CreateLineItemAdjustments',
+               if_not_exists: true
+
+    add_index :cm_pricing_actions, :type, if_not_exists: true
+  end
+end

data/db/migrate/20260105072450_migrate_cm_trip_stops_to_support_trip_connection.rb

@@ -0,0 +1,12 @@
+class MigrateCmTripStopsToSupportTripConnection < ActiveRecord::Migration[7.0]
+  def change
+    # 1. Replace stop_type with allow_boarding & allow_drop_off instead, it is more flexible.
+    # Useful for middle stops where both boarding & drop off can be allowed or both can be disallowed.
+    remove_column :cm_trip_stops, :stop_type if column_exists?(:cm_trip_stops, :stop_type)
+    add_column :cm_trip_stops, :allow_boarding, :boolean unless column_exists?(:cm_trip_stops, :allow_boarding)
+    add_column :cm_trip_stops, :allow_drop_off, :boolean unless column_exists?(:cm_trip_stops, :allow_drop_off)
+
+    # 2. Add references to link trip stops to trips for boarding, this will enable trip connections. Where current trip is main trip.
+    add_reference :cm_trip_stops, :board_to_trip, foreign_key: { to_table: :cm_trips }, null: true unless column_exists?(:cm_trip_stops, :board_to_trip_id)
+  end
+end

data/db/migrate/20260108101406_add_allow_booking_to_cm_trips.rb

@@ -0,0 +1,5 @@
+class AddAllowBookingToCmTrips < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_trips, :allow_booking, :boolean, default: true, if_not_exists: true
+  end
+end

data/db/migrate/20260121024645_add_nationality_group_to_cm_guests.rb

@@ -0,0 +1,5 @@
+class AddNationalityGroupToCmGuests < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_guests, :nationality_group, :integer, default: 0, null: false, if_not_exists: true
+  end
+end

data/docs/pricing_model/age_group.md

@@ -0,0 +1,40 @@
+## 📌 Summary
+
+Add **age-based pricing rules** for **discounts or surcharges** based on guest age groups
+Supports both **line-item** and **per-guest** adjustments.
+
+---
+
+## ⚙️ How It Works
+
+### 👶 Children Discount (Per-Guest)
+
+- **Rule:** `all` + `['child']`
+- **Adjustment:** $1 per child
+- **Guests:** 3 children ($6 each)
+- **Calculation:** 3 × $6 = $18 → $3 total discount
+- **Total:** **$15**
+
+### 👧 Children Surcharge (Per-Guest)
+
+- **Rule:** `any` + `['child']`
+- **Adjustment:** $0.50 per child
+- **Guests:** 2 children ($6 each)
+- **Calculation:** 2 × $6 = $12 → $1 total surcharge
+- **Total:** **$13**
+
+### 🧑 Adult Discount (Line-Item)
+
+- **Rule:** `any` + `['adult']`
+- **Adjustment:** $1 discount
+- **Guests:** 2 adults, 2 children ($6 each)
+- **Calculation:** 4 × $6 = $24 → $1 discount
+- **Total:** **$23**
+
+### 🧔 Adult Surcharge (Line-Item)
+
+- **Rule:** `none` + `['adult']`
+- **Adjustment:** $0.50 surcharge
+- **Guests:** 3 teenagers ($6 each)
+- **Calculation:** 3 × $6 = $18 → $0.50 surcharge
+- **Total:** **$18.50**

data/docs/pricing_model/nationality_group.md

@@ -0,0 +1,35 @@
+## 📌 Summary
+Add **nationality-based pricing rules** for **discounts or surcharges** based on guest nationality groups.
+Supports both **line-item** and **per-guest** adjustments.
+
+---
+
+## ⚙️ How It Works
+
+### Local Discount (Per-Guest)
+- **Rule:** `any` + `['local']`
+- **Adjustment:** $1 per local
+- **Guests:** 2 locals ($6 each)
+- **Calculation:** 2 × $6 = $12 → $2 total discount
+- **Total:** **$10**
+
+### Local Discount (Line-Item)
+- **Rule:** `any` + `['local']`
+- **Adjustment:** $1 discount
+- **Guests:** 2 locals, 1 foreigner ($6 each)
+- **Calculation:** 3 × $6 = $18 → $1 discount
+- **Total:** **$17**
+
+### 🌍 Foreigner Surcharge (Per-Guest)
+- **Rule:** `any` + `['foreigner']`
+- **Adjustment:** $2 per foreigner
+- **Guests:** 1 local, 2 foreigners ($6 each)
+- **Calculation:** 2 × $2 = $4 total surcharge
+- **Total:** **$20**
+
+### 🌍 Foreigner Surcharge (Line-Item)
+- **Rule:** `none` + `['foreigner']`
+- **Adjustment:** $0.50 surcharge
+- **Guests:** 3 locals ($6 each)
+- **Calculation:** 3 × $6 = $18 → $0.50 surcharge
+- **Total:** **$18.50**

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

@@ -2,8 +2,10 @@ FactoryBot.define do
   factory :cm_check_in, class: SpreeCmCommissioner::CheckIn do
     confirmed_at { DateTime.current }
     check_in_type { "pre_check_in" }
-    guest_id { 1 }
+    association :guest, factory: :cm_guest
     check_in_method { "manual" }
+    check_in_by { create(:user) }
+    checkinable { create(:cm_taxon_event) }
     verification_state { "submitted" }
   end
 end

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

@@ -7,5 +7,31 @@ FactoryBot.define do
     start_time { 1.hour.from_now }
     end_time { 2.hours.from_now }
     association :event, factory: :cm_taxon_event
+
+    transient do
+      products { nil }
+      variants { nil }
+      option_values { nil }
+    end
+
+    after(:build) do |check_in_session, evaluator|
+      if evaluator.products.present?
+        evaluator.products.each do |product|
+          check_in_session.check_in_rules.build(ruleable: product)
+        end
+      end
+
+      if evaluator.variants.present?
+        evaluator.variants.each do |variant|
+          check_in_session.check_in_rules.build(ruleable: variant)
+        end
+      end
+
+      if evaluator.option_values.present?
+        evaluator.option_values.each do |option_value|
+          check_in_session.check_in_rules.build(ruleable: option_value)
+        end
+      end
+    end
   end
 end

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

@@ -7,6 +7,8 @@ FactoryBot.define do
     gender { 1 }
     dob { '1986-03-28' }
     token { SecureRandom.hex(32) }
+    public_metadata { {} }
+    private_metadata { {} }
   end
 
   factory :cm_guest, class: SpreeCmCommissioner::Guest do
@@ -16,5 +18,7 @@ FactoryBot.define do
     gender { 1 }
     dob { '1986-03-28' }
     token { SecureRandom.hex(32) }
+    public_metadata { {} }
+    private_metadata { {} }
   end
 end

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

@@ -2,4 +2,8 @@ FactoryBot.define do
   factory :pricing_action, class: 'SpreeCmCommissioner::PricingAction' do
     association :pricing_rule_group, factory: :pricing_rule_group
   end
+
+  factory :pricing_action_guest_adjustments, class: 'SpreeCmCommissioner::PricingActions::CreateGuestAdjustments' do
+    association :pricing_rule_group, factory: :pricing_rule_group
+  end
 end

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :pricing_rule_nationality, class: 'SpreeCmCommissioner::PricingRules::Nationality' do
     association :pricing_rule_group, factory: :pricing_rule_group
-    rule_type { 'must' }
+    rule_type { 'any' }
     nationalities { ["Cambodian"] }
   end
 
@@ -14,4 +14,48 @@ FactoryBot.define do
     association :pricing_rule_group, factory: :pricing_rule_group
     min_distance { 5 }
   end
+
+  factory :pricing_rule_age_group, class: 'SpreeCmCommissioner::PricingRules::AgeGroup' do
+    association :pricing_rule_group, factory: :pricing_rule_group
+    rule_type { 'any' }
+    age_groups { ['adult'] }
+
+    trait :all_match do
+      rule_type { 'all' }
+    end
+
+    trait :none_match do
+      rule_type { 'none' }
+    end
+
+    trait :children do
+      age_groups { ['child'] }
+    end
+
+    trait :adults do
+      age_groups { ['adult'] }
+    end
+  end
+
+  factory :pricing_rule_nationality_group, class: 'SpreeCmCommissioner::PricingRules::NationalityGroup' do
+    association :pricing_rule_group, factory: :pricing_rule_group
+    rule_type { 'any' }
+    nationality_groups { ['local'] }
+
+    trait :all_match do
+      rule_type { 'all' }
+    end
+
+    trait :none_match do
+      rule_type { 'none' }
+    end
+
+    trait :locals do
+      nationality_groups { ['local'] }
+    end
+
+    trait :foreigners do
+      nationality_groups { ['foreigner'] }
+    end
+  end
 end

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

@@ -1,10 +1,11 @@
 FactoryBot.define do
-  factory :cm_route, class: 'SpreeCmCommissioner::Route' do
+  factory :cm_route, class: SpreeCmCommissioner::Route do
+    association :vendor, factory: :vendor
+    association :tenant, factory: :cm_tenant
+    association :origin_place, factory: :cm_place
+    association :destination_place, factory: :cm_place
+
     sequence(:route_name) { |n| "Route #{n}" }
-    origin_place_id { create(:cm_place).id }
-    destination_place_id { create(:cm_place).id }
-    trip_count { 0 }
-    order_count { 0 }
-    fulfilled_order_count { 0 }
+    sequence(:short_name) { |n| "R#{n}" }
   end
 end

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

@@ -0,0 +1,12 @@
+FactoryBot.define do
+  factory :cm_route_metric, class: SpreeCmCommissioner::RouteMetric do
+    association :origin_place, factory: :cm_place
+    association :destination_place, factory: :cm_place
+
+    route_name { "#{origin_place.name} - #{destination_place.name}" } 
+    route_type { :bus }
+    trip_count { 0 }
+    order_count { 0 }
+    fulfilled_order_count { 0 }
+  end
+end

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

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :route_photo, class: SpreeCmCommissioner::RoutePhoto do
+    attachment { Rack::Test::UploadedFile.new(SpreeMultiVendor::Engine.root.join('spec', 'fixtures', 'thinking-cat.jpg'), 'image/jpeg') }
+  end
+end

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

@@ -11,7 +11,10 @@ FactoryBot.define do
     association :vehicle, factory: :cm_vehicle
     association :origin_place, factory: :cm_place
     association :destination_place, factory: :cm_place
-    association :route, factory: :cm_route
+
+    # Don't create route by default to avoid uniqueness conflicts
+    # Tests that need these should create them explicitly
+    route { nil }
   end
 
   factory :cm_trip_with_seat_counts, parent: :cm_trip do

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

@@ -4,7 +4,9 @@ FactoryBot.define do
     association :stop_place, factory: :cm_place
     association :location_place, factory: :cm_place
 
-    stop_type { :boarding }
+    allow_boarding { true }
+    allow_drop_off { true }
+
     stop_name { stop_place.name }
 
     arrival_time { Time.current }