spree_cm_commissioner 2.9.1.pre.pre3 → 2.9.1.pre.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84c27f4187a23acbe9422e5b33cba6cca077dee5fe7a5e879acd3a5d06ee20c9
-  data.tar.gz: e46311b9f88d5a32ddb2272506e99dc1aee786acf800163a833134d942705bc1
+  metadata.gz: ebefceb78297eb71b4dcb417b47de1c9440786f17942f341aa5cff394558b2aa
+  data.tar.gz: 4fae27019658db8352dd7001445b331355d7b20f321b079c211e4e87889789eb
 SHA512:
-  metadata.gz: f679ac4607b2c7a6b01d6151605cd7339ff57ad721bb18708cff888362b4c19bb9b7f9847016b3e1f93fd0ce31a74635eb6635de83f6764b89873fc44aeb8d2e
-  data.tar.gz: 0705c2ddb0b22a1bd2581645cfe18f2488b7aaf827ba90873130c782ac253fd95a50aa9795f982b863fc401744eb8654bc4c225caebec1af08965bab8144c72f
+  metadata.gz: ed1b54c40e5288bc4e04e467c978b531f80b49985e387e4ed5a65908dd9b8152fe024fd4dcfdadba2f279b385fc8250588b3cd674125abf4a4ddd4d0306560b1
+  data.tar.gz: 283fa4cceb6e50ef28eba6e0eb4ecbdba5ca2984a377009934d057606840ce101db088d4f766c8d37b623bff61fe5b030867c99540ea00e33ed3067c20a4c243

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.9.1.pre.pre3)
+    spree_cm_commissioner (2.9.1.pre.pre4)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/models/spree_cm_commissioner/pricing_model_route.rb

@@ -1,10 +1,18 @@
 module SpreeCmCommissioner
+  # A pricing-model assignment. A row is either:
+  #   - route-scoped: trip_id NULL, keyed by route + O-D (unchanged legacy behaviour), or
+  #   - trip-scoped:  trip_id set, keyed by that specific trip + its own O-D (overrides route pricing
+  #     for that trip only).
   class PricingModelRoute < Base
     belongs_to :route, class_name: 'SpreeCmCommissioner::Route'
+    belongs_to :trip, class_name: 'SpreeCmCommissioner::Trip', optional: true
     belongs_to :pricing_model, class_name: 'SpreeCmCommissioner::PricingModel'
     belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place'
     belongs_to :destination_place, class_name: 'SpreeCmCommissioner::Place'
 
+    scope :route_scoped, -> { where(trip_id: nil) }
+    scope :trip_scoped, -> { where.not(trip_id: nil) }
+
     scope :for_origin_destination, lambda { |origin_place_id, destination_place_id|
       where(origin_place_id: origin_place_id, destination_place_id: destination_place_id)
     }

data/app/models/spree_cm_commissioner/trip.rb

@@ -52,6 +52,9 @@ module SpreeCmCommissioner
     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'
 
+    has_many :pricing_model_routes, class_name: 'SpreeCmCommissioner::PricingModelRoute', dependent: :destroy
+    has_many :pricing_models, through: :pricing_model_routes, class_name: 'SpreeCmCommissioner::PricingModel'
+
     has_many :trip_stops, class_name: 'SpreeCmCommissioner::TripStop', dependent: :destroy
     has_many :boarding_trip_stops, -> { boarding.order('departure_time ASC NULLS LAST, id ASC') }, class_name: 'SpreeCmCommissioner::TripStop'
     has_many :drop_off_trip_stops, -> { drop_off.order('arrival_time ASC NULLS LAST') }, class_name: 'SpreeCmCommissioner::TripStop'

data/app/services/spree_cm_commissioner/pricing_models/create_with_rule_groups.rb

@@ -3,13 +3,13 @@ module SpreeCmCommissioner
     class CreateWithRuleGroups
       prepend ::Spree::ServiceModule::Base
 
-      def call(vendor:, params:, route: nil, origin_place_id: nil, destination_place_id: nil)
+      def call(vendor:, params:, route: nil, trip: nil, origin_place_id: nil, destination_place_id: nil) # rubocop:disable Metrics/ParameterLists
         pricing_model = vendor.pricing_models.new(model_params(params))
 
         ApplicationRecord.transaction do
           pricing_model.save!
           build_rule_groups(pricing_model, params[:rule_groups])
-          create_route_assignment(pricing_model, route, origin_place_id, destination_place_id) if route.present?
+          create_route_assignment(pricing_model, route, trip, origin_place_id, destination_place_id) if route.present?
         end
 
         success(pricing_model)
@@ -41,11 +41,17 @@ module SpreeCmCommissioner
         end
       end
 
-      def create_route_assignment(pricing_model, route, origin_place_id, destination_place_id)
+      # A row is trip-scoped when a trip is given (overrides route pricing for that trip);
+      # otherwise route-scoped (unchanged legacy behaviour). Trip-scoped rows take their O-D from
+      # the trip so they match the trip's own journey at resolution time.
+      def create_route_assignment(pricing_model, route, trip, origin_place_id, destination_place_id)
+        origin_place_id = trip.origin_place_id if trip.present?
+        destination_place_id = trip.destination_place_id if trip.present?
         return unless origin_place_id.present? && destination_place_id.present?
 
         PricingModelRoute.create!(
           route: route,
+          trip: trip,
           pricing_model: pricing_model,
           origin_place_id: origin_place_id,
           destination_place_id: destination_place_id

data/app/services/spree_cm_commissioner/pricing_models/preview.rb

@@ -39,29 +39,72 @@ module SpreeCmCommissioner
       end
 
       def find_pricing_models(group_contexts)
-        route_pricing_models(group_contexts) + variant_pricing_models(group_contexts)
+        transit_pricing_models(group_contexts) + variant_pricing_models(group_contexts)
       end
 
-      def route_pricing_models(group_contexts)
+      # Trip-level pricing overrides route-level pricing for the same journey; route pricing
+      # is the fallback when the trip (or connected journey's parent trip) has none assigned.
+      def transit_pricing_models(group_contexts)
         transit_contexts = group_contexts.select { |ctx| ctx.trip_id.present? }
         return [] if transit_contexts.blank?
 
         origin_place_id, destination_place_id = determine_origin_destination(transit_contexts)
         return [] if origin_place_id.blank? || destination_place_id.blank?
 
-        vendor_ids = transit_contexts.map { |ctx| variant_vendor_id(ctx.variant_id) }.compact.uniq
+        vendor_ids = transit_vendor_ids(transit_contexts)
         return [] if vendor_ids.blank?
 
-        route_ids = trip_route_ids(transit_contexts)
+        trip_level_pricing_models(
+          trip_ids: trip_candidate_ids(transit_contexts),
+          origin_place_id: origin_place_id,
+          destination_place_id: destination_place_id,
+          vendor_ids: vendor_ids
+        ).presence || route_level_pricing_models(
+          route_ids: trip_route_ids(transit_contexts),
+          origin_place_id: origin_place_id,
+          destination_place_id: destination_place_id,
+          vendor_ids: vendor_ids
+        )
+      end
+
+      def trip_level_pricing_models(trip_ids:, origin_place_id:, destination_place_id:, vendor_ids:)
+        return [] if trip_ids.empty?
 
         scope = SpreeCmCommissioner::PricingModelRoute
                 .active
+                .trip_scoped
+                .where(trip_id: trip_ids)
                 .for_origin_destination(origin_place_id, destination_place_id)
-                .includes(:pricing_model)
 
+        pricing_models_for(scope, vendor_ids)
+      end
+
+      def route_level_pricing_models(route_ids:, origin_place_id:, destination_place_id:, vendor_ids:)
+        scope = SpreeCmCommissioner::PricingModelRoute
+                .active
+                .route_scoped
+                .for_origin_destination(origin_place_id, destination_place_id)
         scope = scope.where(route_id: route_ids) if route_ids.any?
 
-        scope.map(&:pricing_model).select { |pm| vendor_ids.include?(pm.vendor_id) }
+        pricing_models_for(scope, vendor_ids)
+      end
+
+      # Resolves a PricingModelRoute scope into its pricing models, restricted to vendors
+      # actually present among the line items being priced.
+      def pricing_models_for(scope, vendor_ids)
+        scope.includes(:pricing_model).map(&:pricing_model).select { |pm| vendor_ids.include?(pm.vendor_id) }
+      end
+
+      # A booking's legs can each have their own trip-level price, and a connected journey
+      # (multiple legs sharing connected_trip_id) can also have its own price on the shared
+      # parent trip. This returns every trip id worth checking for either case.
+      def trip_candidate_ids(transit_contexts)
+        connected_trip_id = Integer(transit_contexts.first&.connected_trip_id.to_s, exception: false)
+        (transit_contexts.map(&:trip_id) + [connected_trip_id]).compact.uniq
+      end
+
+      def transit_vendor_ids(transit_contexts)
+        transit_contexts.map { |ctx| variant_vendor_id(ctx.variant_id) }.compact.uniq
       end
 
       def variant_pricing_models(group_contexts)

data/app/services/spree_cm_commissioner/pricing_models/update_with_rule_groups.rb

@@ -3,11 +3,11 @@ module SpreeCmCommissioner
     class UpdateWithRuleGroups
       prepend ::Spree::ServiceModule::Base
 
-      def call(pricing_model:, params:, route: nil, origin_place_id: nil, destination_place_id: nil)
+      def call(pricing_model:, params:, route: nil, trip: nil, origin_place_id: nil, destination_place_id: nil) # rubocop:disable Metrics/ParameterLists
         ApplicationRecord.transaction do
           pricing_model.update!(model_params(params))
           sync_rule_groups(pricing_model, params[:rule_groups])
-          update_route_assignment(pricing_model, route, origin_place_id, destination_place_id) if route.present?
+          update_route_assignment(pricing_model, route, trip, origin_place_id, destination_place_id) if route.present?
         end
 
         success(pricing_model)
@@ -47,14 +47,17 @@ module SpreeCmCommissioner
         end
       end
 
-      def update_route_assignment(pricing_model, route, origin_place_id, destination_place_id)
+      # Each pricing model created via this flow has a single assignment row; update it in place so
+      # the assigned trip (and O-D) can be changed on edit. Trip-scoped rows take O-D from the trip.
+      def update_route_assignment(pricing_model, route, trip, origin_place_id, destination_place_id)
+        origin_place_id = trip.origin_place_id if trip.present?
+        destination_place_id = trip.destination_place_id if trip.present?
         return unless origin_place_id.present? && destination_place_id.present?
 
-        route_assignment = PricingModelRoute.find_or_initialize_by(
-          route: route,
-          pricing_model: pricing_model
-        )
+        route_assignment = PricingModelRoute.find_or_initialize_by(pricing_model: pricing_model)
         route_assignment.update!(
+          route: route,
+          trip: trip,
           origin_place_id: origin_place_id,
           destination_place_id: destination_place_id
         )

data/db/migrate/20260630000001_add_trip_to_cm_pricing_model_routes.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+class AddTripToCmPricingModelRoutes < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_pricing_model_routes, :trip, null: true,
+                  foreign_key: { to_table: :cm_trips }, index: true
+  end
+end

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

@@ -0,0 +1,11 @@
+FactoryBot.define do
+  # A trip-scoped PricingModelRoute row — overrides route pricing for one specific trip.
+  # origin/destination default to the trip's own O-D (mirrors how trip pricing is resolved).
+  factory :cm_pricing_model_trip, class: 'SpreeCmCommissioner::PricingModelRoute' do
+    association :pricing_model, factory: :cm_pricing_model
+    association :trip, factory: :cm_trip
+    route { trip.route || create(:cm_route, origin_place: trip.origin_place, destination_place: trip.destination_place) }
+    origin_place { trip.origin_place }
+    destination_place { trip.destination_place }
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.9.1.pre.pre3'.freeze
+  VERSION = '2.9.1.pre.pre4'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.9.1.pre.pre3
+  version: 2.9.1.pre.pre4
 platform: ruby
 authors:
 - You
@@ -3410,6 +3410,7 @@ files:
 - db/migrate/20260623082233_create_cm_claims.rb
 - db/migrate/20260624175658_add_unique_index_to_cm_claims.rb
 - db/migrate/20260629000001_add_term_of_use_to_spree_vendors.rb
+- db/migrate/20260630000001_add_trip_to_cm_pricing_model_routes.rb
 - db/migrate/20260701000001_add_device_info_to_cm_waiting_room_sessions.rb
 - db/migrate/20260703065239_add_position_to_cm_voting_contestants.rb
 - docker-compose.yml
@@ -3510,6 +3511,7 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/pricing_action_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_model_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_model_route_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/pricing_model_trip_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_model_variant_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_rule_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_rule_group_factory.rb