spree_cm_commissioner 2.5.1 → 2.5.2.pre.pre1

data/lib/spree_cm_commissioner/transit/route_stop_collection.rb

@@ -0,0 +1,175 @@
+module SpreeCmCommissioner::Transit
+  class RouteStopCollection
+    include Enumerable
+
+    attr_reader :stops
+
+    def initialize(stops = [])
+      @stops = stops
+      @errors = []
+    end
+
+    def self.from_hash(array)
+      # Handle nil, empty array, or string "[]" when loaded from database
+      parsed_array = case array
+                     when nil
+                       []
+                     when String
+                       JSON.parse(array)
+                     else
+                       array
+                     end
+
+      stops = Array(parsed_array).each_with_index.map do |raw, index|
+        hash = raw.to_h.symbolize_keys
+        RouteStop.from_hash(hash.merge(sequence: index))
+      end
+
+      new(stops)
+    end
+
+    def to_h
+      @stops.map(&:to_h)
+    end
+
+    def each(&block)
+      @stops.each(&block)
+    end
+
+    def [](index)
+      @stops[index]
+    end
+
+    def first
+      @stops.first
+    end
+
+    def last
+      @stops.last
+    end
+
+    def length
+      @stops.length
+    end
+
+    def empty?
+      @stops.empty?
+    end
+
+    def multi_leg?
+      branch_location_ids = @stops.select(&:branch?).map(&:location_id).uniq
+      branch_location_ids.length >= 3
+    end
+
+    def by_location
+      @stops.group_by(&:location_id)
+    end
+
+    # Fetches vendor places and groups route stops by their location object
+    # Returns: { location_obj => [route_stop_a, route_stop_b], location_obj_2 => [...] }
+    # Example: If you have stops for branches in "Bangkok" and "Chiang Mai",
+    #          this returns all stops grouped by their location object
+    def by_location_with_data
+      return {} if @stops.empty?
+
+      # Extract unique vendor_place_ids from all stops
+      vendor_place_ids = @stops.map(&:vendor_place_id).compact.uniq
+      return {} if vendor_place_ids.empty?
+
+      # Single query: fetch all vendor places with their locations
+      # index_by(:id) creates a hash for O(1) lookup: { vendor_place_id => vendor_place_obj }
+      vendor_places = SpreeCmCommissioner::VendorPlace.where(id: vendor_place_ids).includes(:location).index_by(&:id)
+
+      grouped = {}
+      @stops.each do |stop|
+        # Set the vendor_place object on the stop for later use
+        stop.vendor_place = vendor_places[stop.vendor_place_id]
+
+        # Get the location from the vendor_place (e.g., "Bangkok" location)
+        location = stop.vendor_place&.location
+        next if location.nil?
+
+        # Group stops by location object
+        grouped[location] ||= []
+        grouped[location] << stop
+      end
+
+      grouped
+    end
+
+    # Groups route stops by their location in sequence order
+    # Returns an array of hashes where each hash contains:
+    #   - location: the VendorPlace representing the location
+    #   - stops: array of route stops at that location, sorted by sequence
+    # Example usage: @stops.group_by_sequence
+    # {
+    #   location_object_1 => [stop1, stop2, stop3],
+    #   location_object_2 => [stop4, stop5]
+    # }
+    # Stop 0: Location A
+    # Stop 1: Location A
+    # Stop 2: Location B
+    # Stop 3: Location A ← Same location again (For case when the bus has the same origin/destination)
+    def group_by_sequence
+      return [] if @stops.blank?
+
+      by_location = by_location_with_data || {}
+
+      # location_id => location_vendor_place (the "location" vendor_place in the hash key)
+      location_by_id = by_location.keys.index_by(&:id)
+
+      ordered_stops =
+        by_location.values
+                   .flatten
+                   .compact
+                   .sort_by { |s| s.sequence.to_i }
+
+      grouped_stops = []
+      current_location_id = nil
+      current_group = nil
+
+      ordered_stops.each do |stop|
+        stop_location_id = stop.location_id
+
+        if stop_location_id != current_location_id
+          current_location_id = stop_location_id
+          current_group = {
+            location: location_by_id[stop_location_id],
+            stops: []
+          }
+          grouped_stops << current_group
+        end
+
+        current_group[:stops] << stop
+      end
+
+      grouped_stops
+    end
+
+    def valid?
+      errors.empty?
+    end
+
+    def errors
+      @errors = []
+
+      # Check each stop is valid
+      @stops.each_with_index do |stop, index|
+        next if stop.valid?
+
+        stop.errors.each do |error|
+          @errors << "Stop #{index}: #{error}"
+        end
+      end
+
+      # Check for duplicate vendor_place_ids
+      vendor_place_ids = @stops.map(&:vendor_place_id)
+      duplicates = vendor_place_ids.tally.select { |_, count| count > 1 }.keys
+      duplicates.each do |dup_id|
+        @errors << "vendor_place_id #{dup_id} appears more than once"
+      end
+
+      @errors
+    end
+  end
+end

data/lib/spree_cm_commissioner/transit/trip_form.rb

@@ -0,0 +1,81 @@
+module SpreeCmCommissioner::Transit
+  class TripForm
+    include ActiveModel::Model
+
+    attr_accessor :route_id,
+                  :name,
+                  :short_name,
+                  :price,
+                  :allow_booking,
+                  :allow_seat_selection,
+                  :route_type,
+                  :trip_stops, # TripStopForm[]
+                  :service_calendar # monday, tuesday, wednesday, thursday, friday, saturday, sunday, start_date, end_date
+
+    def multi_leg?
+      trip_stops.map(&:location_id).uniq.size > 2
+    end
+
+    def total_duration_seconds
+      return 0 if trip_stops.size < 2
+
+      minutes = trip_stops[0...-1].sum { |s| s.duration_in_minutes || 0 }
+      minutes * 60
+    end
+
+    def valid_data? # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+      errors.clear
+
+      errors.add(:route_id, 'must be present') if route_id.blank?
+      errors.add(:trip_stops, 'must be present') if trip_stops.blank? || trip_stops.size < 2
+
+      first_stop = trip_stops&.first
+      last_stop  = trip_stops&.last
+
+      errors.add(:trip_stops, 'first stop must allow boarding') unless first_stop&.allow_boarding?
+      errors.add(:trip_stops, 'last stop must allow drop off')   unless last_stop&.allow_drop_off?
+      errors.add(:departure_time, 'missing on first stop')       if first_stop&.departure_time.blank?
+
+      errors.empty?
+    end
+
+    # Groups trip_stops into legs by location changes
+    # Separates legs when location_id changes (at branch stops)
+    # Break stops (stop_type = :stop) are included but don't trigger separation
+    #
+    # Example:
+    # [PP1, PP2, PTT1(break stop), BTB1, BTB2, PPT2(break stop), POIPET1, POIPET1]
+    #
+    # Output (legs):
+    # [
+    #   [PP1, PP2, PTT, BTB1, BTB2],
+    #   [BTB1, BTB2, PPT1, POIPET1, POIPET1]
+    # ]
+    def trip_stops_grouped_by_leg(stops)
+      return [] if trip_stops.empty?
+
+      legs = []
+      current_leg = []
+      last_location_id = nil
+
+      trip_stops.each do |trip_stop|
+        stop = stops[trip_stop.stop_id]
+
+        # If location changed and we have stops in current leg, start a new leg
+        current_leg << trip_stop
+        if last_location_id.present? && last_location_id != trip_stop.location_id && current_leg.any?
+          # Include the first stop of new location in previous leg
+          legs << current_leg
+          current_leg = [trip_stop]
+        end
+
+        # Update location only for branch stops (not for "just stops")
+        last_location_id = trip_stop.location_id if stop.branch?
+      end
+
+      # Add final leg if it has stops
+      legs << current_leg if current_leg.any?
+      legs
+    end
+  end
+end

data/lib/spree_cm_commissioner/transit/trip_stop_form.rb

@@ -0,0 +1,65 @@
+module SpreeCmCommissioner::Transit
+  class TripStopForm
+    attr_accessor :location_id,
+                  :stop_id,
+                  :departure_time,
+                  :duration_in_hours,
+                  :route_type,
+                  #
+                  # when create, vehicle_type_id is required. But if board_to_trip_id present (from another route), we can copy from that trip.
+                  # when edit, vehicle_type_id can be changed since we already copied the seat layout.
+                  :vehicle_type_id,
+                  #
+                  # (optional), same as vehicle_type_id.
+                  :vehicle_id,
+                  #
+                  # when create:
+                  # if board_to_trip_id present, it mean it link to another trip to board.
+                  #
+                  # when edit:
+                  # board_to_trip_id can't be set to nil or changed to another trip id.
+                  :board_to_trip_id,
+                  #
+                  # for first stop, allow_boarding must be true.
+                  # for last stop, allow_boarding must be false.
+                  # for middle stops, both can be true/false.
+                  #
+                  # but when stop.type is not branch (eg. stop), allow_boarding must be false.
+                  :allow_boarding,
+                  #
+                  # for first stop, allow_drop_off must be false.
+                  # for last stop, allow_drop_off must be true.
+                  # for middle stops, both can be true/false.
+                  #
+                  # but when stop.type is not branch (eg. stop), allow_drop_off must be false.
+                  :allow_drop_off,
+                  #
+                  # when stop.type is branch, admin can toggle allow_seat_selection.
+                  # but for edit, if board_to_trip_id is from another route, allow_seat_selection can't be changed.
+                  # only allow changed from its own route.
+                  :allow_seat_selection,
+                  #
+                  # when create, allow_booking only when stop.type is branch, use it to assign to create sub-trip.
+                  # but for edit, if board_to_trip_id is from another route, allow_booking can't be changed.
+                  # only allow changed from its own route.
+                  :allow_booking,
+                  :sequence,
+                  #
+                  # set from create service
+                  :vendor_id
+
+    def allow_boarding?
+      ActiveModel::Type::Boolean.new.cast(allow_boarding)
+    end
+
+    def allow_drop_off?
+      ActiveModel::Type::Boolean.new.cast(allow_drop_off)
+    end
+
+    def duration_in_minutes
+      return nil if duration_in_hours.blank?
+
+      (duration_in_hours.to_f * 60).to_i
+    end
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.5.1'.freeze
+  VERSION = '2.5.2-pre1'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -23,6 +23,10 @@ require 'spree_cm_commissioner/trip_query_result'
 require 'spree_cm_commissioner/cached_inventory_item'
 require 'spree_cm_commissioner/transit/leg'
 require 'spree_cm_commissioner/transit/seat_selection'
+require 'spree_cm_commissioner/transit/route_stop'
+require 'spree_cm_commissioner/transit/route_stop_collection'
+require 'spree_cm_commissioner/transit/trip_form'
+require 'spree_cm_commissioner/transit/trip_stop_form'
 require 'spree_cm_commissioner/intercity_taxi/map_place'
 require 'spree_cm_commissioner/distance'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2.pre.pre1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-27 00:00:00.000000000 Z
+date: 2026-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1033,13 +1033,16 @@ files:
 - app/controllers/spree/api/v2/tenant/order_histories_controller.rb
 - app/controllers/spree/api/v2/tenant/pin_code_checkers_controller.rb
 - app/controllers/spree/api/v2/tenant/pin_code_generators_controller.rb
+- app/controllers/spree/api/v2/tenant/popular_route_places_controller.rb
 - app/controllers/spree/api/v2/tenant/product_dynamic_fields_controller.rb
 - app/controllers/spree/api/v2/tenant/products_controller.rb
 - app/controllers/spree/api/v2/tenant/profile_images_controller.rb
 - app/controllers/spree/api/v2/tenant/reset_passwords_controller.rb
+- app/controllers/spree/api/v2/tenant/routes_controller.rb
 - app/controllers/spree/api/v2/tenant/s3_signed_urls_controller.rb
 - app/controllers/spree/api/v2/tenant/taxons_controller.rb
 - app/controllers/spree/api/v2/tenant/tickets_controller.rb
+- app/controllers/spree/api/v2/tenant/transit/draft_orders_controller.rb
 - app/controllers/spree/api/v2/tenant/trip_places_controller.rb
 - app/controllers/spree/api/v2/tenant/trip_search_controller.rb
 - app/controllers/spree/api/v2/tenant/trips_controller.rb
@@ -1147,6 +1150,8 @@ files:
 - app/finders/spree_cm_commissioner/payment_methods/group_by_bank.rb
 - app/finders/spree_cm_commissioner/places/find_with_route.rb
 - app/finders/spree_cm_commissioner/products/find_decorator.rb
+- app/finders/spree_cm_commissioner/route_metrics/find_popular.rb
+- app/finders/spree_cm_commissioner/routes/find.rb
 - app/finders/spree_cm_commissioner/routes/find_popular.rb
 - app/helpers/spree/admin/base_helper_decorator.rb
 - app/helpers/spree/admin/google_wallets_helper.rb
@@ -1273,7 +1278,6 @@ files:
 - app/interactors/spree_cm_commissioner/telegram_web_app_vendor_user_authorizer.rb
 - app/interactors/spree_cm_commissioner/telegram_web_app_vendor_user_checker.rb
 - app/interactors/spree_cm_commissioner/transactional_email_sender.rb
-- app/interactors/spree_cm_commissioner/transit/draft_order_creator.rb
 - app/interactors/spree_cm_commissioner/trip_clone_creator.rb
 - app/interactors/spree_cm_commissioner/trip_stops_creator.rb
 - app/interactors/spree_cm_commissioner/unique_device_token_cron_executor.rb
@@ -1342,6 +1346,10 @@ files:
 - app/jobs/spree_cm_commissioner/product_event_id_to_children_syncer_job.rb
 - app/jobs/spree_cm_commissioner/queue_order_webhooks_requests_job.rb
 - app/jobs/spree_cm_commissioner/reports_assigner_job.rb
+- app/jobs/spree_cm_commissioner/route_metrics/decrease_trip_count_job.rb
+- app/jobs/spree_cm_commissioner/route_metrics/increase_fulfilled_order_count_job.rb
+- app/jobs/spree_cm_commissioner/route_metrics/increase_order_count_job.rb
+- app/jobs/spree_cm_commissioner/route_metrics/increase_trip_count_job.rb
 - app/jobs/spree_cm_commissioner/seats/bulk_release_on_hold_blocks_job.rb
 - app/jobs/spree_cm_commissioner/seats/release_expired_blocks_job.rb
 - app/jobs/spree_cm_commissioner/sms_job.rb
@@ -1355,11 +1363,6 @@ files:
 - app/jobs/spree_cm_commissioner/telegram_debug_pin_code_sender_job.rb
 - app/jobs/spree_cm_commissioner/telegram_notification_sender_job.rb
 - app/jobs/spree_cm_commissioner/telegram_start_message_sender_job.rb
-- app/jobs/spree_cm_commissioner/transit/route_fulfilled_order_count_incrementer_job.rb
-- app/jobs/spree_cm_commissioner/transit/route_order_count_incrementer_job.rb
-- app/jobs/spree_cm_commissioner/transit/route_previous_trip_count_decrementer_job.rb
-- app/jobs/spree_cm_commissioner/transit/route_trip_count_decrementer_job.rb
-- app/jobs/spree_cm_commissioner/transit/route_trip_count_incrementer_job.rb
 - app/jobs/spree_cm_commissioner/unique_device_token_cron_job.rb
 - app/jobs/spree_cm_commissioner/variants_public_metadata_updater_job.rb
 - app/jobs/spree_cm_commissioner/vendor_creation_telegram_alert_sender_job.rb
@@ -1400,7 +1403,6 @@ files:
 - app/models/concerns/spree_cm_commissioner/product_delegation.rb
 - app/models/concerns/spree_cm_commissioner/product_type.rb
 - app/models/concerns/spree_cm_commissioner/route_order_countable.rb
-- app/models/concerns/spree_cm_commissioner/route_trip_count_callbacks.rb
 - app/models/concerns/spree_cm_commissioner/route_type.rb
 - app/models/concerns/spree_cm_commissioner/service_calendar_type.rb
 - app/models/concerns/spree_cm_commissioner/service_recommendations.rb
@@ -1563,6 +1565,8 @@ files:
 - app/models/spree_cm_commissioner/role_decorator.rb
 - app/models/spree_cm_commissioner/role_permission.rb
 - app/models/spree_cm_commissioner/route.rb
+- app/models/spree_cm_commissioner/route_metric.rb
+- app/models/spree_cm_commissioner/route_photo.rb
 - app/models/spree_cm_commissioner/s3_presigned_url.rb
 - app/models/spree_cm_commissioner/s3_presigned_url_builder.rb
 - app/models/spree_cm_commissioner/saved_guest.rb
@@ -1601,7 +1605,6 @@ files:
 - app/models/spree_cm_commissioner/tenant.rb
 - app/models/spree_cm_commissioner/transactional_email.rb
 - app/models/spree_cm_commissioner/trip.rb
-- app/models/spree_cm_commissioner/trip_connection.rb
 - app/models/spree_cm_commissioner/trip_stop.rb
 - app/models/spree_cm_commissioner/user_decorator.rb
 - app/models/spree_cm_commissioner/user_deletion_survey.rb
@@ -1627,7 +1630,6 @@ files:
 - app/models/spree_cm_commissioner/vendor_photo.rb
 - app/models/spree_cm_commissioner/vendor_place.rb
 - app/models/spree_cm_commissioner/vendor_promotion_rule.rb
-- app/models/spree_cm_commissioner/vendor_route.rb
 - app/models/spree_cm_commissioner/vendor_web_promotion_banner.rb
 - app/models/spree_cm_commissioner/video.rb
 - app/models/spree_cm_commissioner/video_on_demand.rb
@@ -1893,6 +1895,7 @@ files:
 - app/serializers/spree/v2/tenant/taxon_serializer.rb
 - app/serializers/spree/v2/tenant/taxonomy_serializer.rb
 - app/serializers/spree/v2/tenant/ticket_serializer.rb
+- app/serializers/spree/v2/tenant/transit_cart_serializer.rb
 - app/serializers/spree/v2/tenant/trip_place_serializer.rb
 - app/serializers/spree/v2/tenant/trip_query_result_serializer.rb
 - app/serializers/spree/v2/tenant/trip_serializer.rb
@@ -1964,6 +1967,7 @@ files:
 - app/serializers/spree_cm_commissioner/v2/storefront/qr_url_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/reserved_block_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/reset_password_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/route_metric_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/route_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/saved_guest_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/seat_layout_serializer.rb
@@ -1971,6 +1975,7 @@ files:
 - app/serializers/spree_cm_commissioner/v2/storefront/self_check_in_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/stock_item_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/taxon_include_product_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/transit_line_item_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/trip_place_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/trip_query_result_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/trip_result_serializer.rb
@@ -2065,12 +2070,13 @@ files:
 - app/services/spree_cm_commissioner/pricing_rules/update.rb
 - app/services/spree_cm_commissioner/role_permissions_constructor.rb
 - app/services/spree_cm_commissioner/role_permissions_loader.rb
-- app/services/spree_cm_commissioner/routes/base_update_order_metrics.rb
-- app/services/spree_cm_commissioner/routes/decrement_previous_trip_count.rb
-- app/services/spree_cm_commissioner/routes/decrement_trip_count.rb
-- app/services/spree_cm_commissioner/routes/increment_fulfilled_order_count.rb
-- app/services/spree_cm_commissioner/routes/increment_order_count.rb
-- app/services/spree_cm_commissioner/routes/increment_trip_count.rb
+- app/services/spree_cm_commissioner/route_metrics/decrease_trip_count.rb
+- app/services/spree_cm_commissioner/route_metrics/increase_fulfilled_order_count.rb
+- app/services/spree_cm_commissioner/route_metrics/increase_order_count.rb
+- app/services/spree_cm_commissioner/route_metrics/increase_trip_count.rb
+- app/services/spree_cm_commissioner/route_metrics/update_route_metrics.rb
+- app/services/spree_cm_commissioner/routes/create.rb
+- app/services/spree_cm_commissioner/routes/update.rb
 - app/services/spree_cm_commissioner/rsa_service.rb
 - app/services/spree_cm_commissioner/seats/bulk_release_on_hold_blocks.rb
 - app/services/spree_cm_commissioner/seats/release_expired_blocks.rb
@@ -2081,7 +2087,12 @@ files:
 - app/services/spree_cm_commissioner/telegram_alerts/integration_sync_failure.rb
 - app/services/spree_cm_commissioner/transit/export_order.rb
 - app/services/spree_cm_commissioner/transit/legs_builder_service.rb
+- app/services/spree_cm_commissioner/transit_order/create.rb
+- app/services/spree_cm_commissioner/trips/create_single_leg.rb
 - app/services/spree_cm_commissioner/trips/search.rb
+- app/services/spree_cm_commissioner/trips/service_calendars/create_or_update.rb
+- app/services/spree_cm_commissioner/trips/update_single_leg.rb
+- app/services/spree_cm_commissioner/trips/variants/create.rb
 - app/services/spree_cm_commissioner/update_guest_service.rb
 - app/services/spree_cm_commissioner/user_authenticator.rb
 - app/services/spree_cm_commissioner/user_roles_assigner.rb
@@ -2196,7 +2207,8 @@ files:
 - app/views/spree/admin/integrations/edit.html.erb
 - app/views/spree/admin/integrations/index.html.erb
 - app/views/spree/admin/integrations/new.html.erb
-- app/views/spree/admin/inventory_items/show.html.erb
+- app/views/spree/admin/inventory_items/prices.html.erb
+- app/views/spree/admin/inventory_items/stocks.html.erb
 - app/views/spree/admin/kyc/_form.html.erb
 - app/views/spree/admin/kyc/edit.html.erb
 - app/views/spree/admin/line_items/_form.html.erb
@@ -2998,10 +3010,14 @@ files:
 - db/migrate/20251127074809_change_guest_dynamic_fields_value_from_jsonb_to_text.rb
 - db/migrate/20251209022924_add_contact_fields_to_cm_tenants.rb
 - db/migrate/20251219035243_add_migrations_to_support_vehicle_types.rb
+- db/migrate/20251224033103_migrate_cm_routes_to_cm_route_metrics.rb
+- db/migrate/20251224033910_migrate_cm_vendor_routes_to_cm_routes.rb
 - db/migrate/20251225100000_add_age_group_to_cm_guests.rb
 - db/migrate/20260105024742_add_type_to_cm_pricing_actions.rb
 - db/migrate/20260105072146_add_nationality_group_and_age_group_to_cm_saved_guests.rb
+- db/migrate/20260105072450_migrate_cm_trip_stops_to_support_trip_connection.rb
 - db/migrate/20260106093359_add_contact_phone_to_cm_vendor_places.rb
+- db/migrate/20260108101406_add_allow_booking_to_cm_trips.rb
 - db/migrate/20260121024645_add_nationality_group_to_cm_guests.rb
 - db/migrate/20260126110528_seed_user_initial_usernames.rb
 - docker-compose.yml
@@ -3097,6 +3113,8 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/role.rb
 - lib/spree_cm_commissioner/test_helper/factories/role_permission_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/route_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/route_metric_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/route_photo_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/saved_guest_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/seat_layout_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/seat_section_factory.rb
@@ -3113,7 +3131,6 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/telegram_bot_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/tenant_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/transactional_email_factory.rb
-- lib/spree_cm_commissioner/test_helper/factories/trip_connection_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/trip_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/trip_stop_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/user_deletion_reasons_factory.rb
@@ -3131,7 +3148,11 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/webhook_subscriber_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/webhook_subscriber_rule_factory.rb
 - lib/spree_cm_commissioner/transit/leg.rb
+- lib/spree_cm_commissioner/transit/route_stop.rb
+- lib/spree_cm_commissioner/transit/route_stop_collection.rb
 - lib/spree_cm_commissioner/transit/seat_selection.rb
+- lib/spree_cm_commissioner/transit/trip_form.rb
+- lib/spree_cm_commissioner/transit/trip_stop_form.rb
 - lib/spree_cm_commissioner/trip_query_result.rb
 - lib/spree_cm_commissioner/trip_result.rb
 - lib/spree_cm_commissioner/user_session_jwt_token.rb
@@ -3180,9 +3201,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubygems_version: 3.4.1

data/app/jobs/spree_cm_commissioner/transit/route_fulfilled_order_count_incrementer_job.rb

@@ -1,10 +0,0 @@
-module SpreeCmCommissioner
-  module Transit
-    class RouteFulfilledOrderCountIncrementerJob < ApplicationUniqueJob
-      def perform(options = {})
-        order = Spree::Order.find(options[:order_id])
-        SpreeCmCommissioner::Routes::IncrementFulfilledOrderCount.call(order: order)
-      end
-    end
-  end
-end

data/app/jobs/spree_cm_commissioner/transit/route_order_count_incrementer_job.rb

@@ -1,10 +0,0 @@
-module SpreeCmCommissioner
-  module Transit
-    class RouteOrderCountIncrementerJob < ApplicationUniqueJob
-      def perform(options = {})
-        order = Spree::Order.find(options[:order_id])
-        SpreeCmCommissioner::Routes::IncrementOrderCount.call(order: order)
-      end
-    end
-  end
-end

data/app/jobs/spree_cm_commissioner/transit/route_previous_trip_count_decrementer_job.rb

@@ -1,13 +0,0 @@
-# Perform the previous-route decrement outside the Trip transaction.
-
-module SpreeCmCommissioner
-  module Transit
-    class RoutePreviousTripCountDecrementerJob < ApplicationUniqueJob
-      queue_as :default
-
-      def perform(options = {})
-        SpreeCmCommissioner::Routes::DecrementPreviousTripCount.call(previous_route_id: options[:previous_route_id])
-      end
-    end
-  end
-end

data/app/jobs/spree_cm_commissioner/transit/route_trip_count_decrementer_job.rb

@@ -1,10 +0,0 @@
-module SpreeCmCommissioner
-  module Transit
-    class RouteTripCountDecrementerJob < ApplicationUniqueJob
-      def perform(options = {})
-        trip = SpreeCmCommissioner::Trip.find(options[:trip_id])
-        SpreeCmCommissioner::Routes::DecrementTripCount.call(trip: trip)
-      end
-    end
-  end
-end

data/app/jobs/spree_cm_commissioner/transit/route_trip_count_incrementer_job.rb

@@ -1,10 +0,0 @@
-module SpreeCmCommissioner
-  module Transit
-    class RouteTripCountIncrementerJob < ApplicationUniqueJob
-      def perform(options = {})
-        trip = SpreeCmCommissioner::Trip.find(options[:trip_id])
-        SpreeCmCommissioner::Routes::IncrementTripCount.call(trip: trip)
-      end
-    end
-  end
-end