spree_cm_commissioner 2.5.1 → 2.5.2.pre.pre1

data/app/finders/spree_cm_commissioner/routes/find_popular.rb

@@ -1,46 +1,30 @@
-# Finds routes ordered by popularity based on order metrics.
-#
-# Routes are sorted by:
-# 1. fulfilled_order_count (completed orders) - DESC
-# 2. order_count (total orders including incomplete) - DESC
-#
-# @param route_type [Symbol, String] Optional. Filter by route type from associated trips (e.g., :ferry, :bus)
-#
-# @return [ActiveRecord::Relation<SpreeCmCommissioner::Route>] Routes with origin and destination places loaded,
-#   ordered from most to least popular
-#
-# @example Get all popular routes
-#   finder = SpreeCmCommissioner::Routes::FindPopular.new
-#   finder.execute # => Returns all routes sorted by fulfillment and order counts
-#
-# @example Get popular ferry routes
-#   finder = SpreeCmCommissioner::Routes::FindPopular.new
-#   finder.execute(route_type: :ferry) # => Returns ferry routes sorted by popularity
-#
-# @example Get popular bus routes
-#   finder = SpreeCmCommissioner::Routes::FindPopular.new
-#   finder.execute(route_type: :bus) # => Returns bus routes sorted by popularity
+# Finder to get popular route metrics scoped to a vendor or tenant.
+# Orders by fulfilled_order_count DESC, then order_count DESC.
+# Usage:
+#   finder = SpreeCmCommissioner::Routes::FindPopular.new(vendor: vendor, route_type: :bus, limit: 10)
+#   finder.execute
 
 module SpreeCmCommissioner
   module Routes
     class FindPopular
-      def execute(route_type: nil, query: nil)
-        scope(route_type: route_type, query: query)
+      def initialize(vendor: nil, tenant: nil, route_type: nil, limit: 20)
+        @vendor = vendor
+        @tenant = tenant
+        @route_type = route_type
+        @limit = limit.to_i
       end
 
-      private
-
-      def scope(route_type:, query:)
-        includes_associations = %i[origin_place destination_place]
-        includes_associations << :trips if route_type.present?
-        result = SpreeCmCommissioner::Route.includes(*includes_associations)
-
-        result = result.joins(:trips).where(cm_trips: { route_type: route_type.to_sym }) if route_type.present?
+      def execute
+        scope = SpreeCmCommissioner::Route.includes(:origin_place, :destination_place, :route_photos)
+        scope = scope.where(vendor_id: vendor.id) if vendor.present?
+        scope = scope.where(tenant_id: tenant.id) if tenant.present?
+        scope = scope.where(route_type: route_type.to_s) if route_type.present?
+        scope.order(fulfilled_order_count: :desc, order_count: :desc).limit(limit)
+      end
 
-        result = result.where('cm_routes.route_name ILIKE ?', "%#{query}%") if query.present?
+      private
 
-        result.distinct.order(fulfilled_order_count: :desc, order_count: :desc)
-      end
+      attr_reader :vendor, :tenant, :route_type, :limit
     end
   end
 end

data/app/interactors/spree_cm_commissioner/stock/permanent_inventory_items_generator.rb

@@ -33,11 +33,18 @@ module SpreeCmCommissioner
         end
       end
 
+      # Returns dates for which inventory should be generated, based on calendar or default period.
       def inventory_dates_for(variant)
-        start_date = Time.zone.tomorrow
-        end_date = Time.zone.today + pre_inventory_days_for(variant)
+        calendar = variant.product&.service_calendar
 
-        (start_date..end_date)
+        if calendar.present?
+          calendar.start_date.upto(calendar.end_date).select { |date| calendar.service_available?(date) }
+        else
+          start_date = Time.zone.tomorrow
+          end_date = Time.zone.today + pre_inventory_days_for(variant)
+
+          start_date.upto(end_date).to_a
+        end
       end
 
       def inventory_exist?(variant, inventory_date)
@@ -68,7 +75,7 @@ module SpreeCmCommissioner
       def variants
         scope = Spree::Variant.active.with_permanent_stock.where(is_master: false)
         scope = scope.where(id: variant_ids) if variant_ids.present?
-        scope
+        scope.includes(product: :service_calendar)
       end
     end
   end

data/app/interactors/spree_cm_commissioner/stock/stock_movement_creator.rb

@@ -8,7 +8,8 @@ module SpreeCmCommissioner
 
         return context.fail!(message: Spree.t(:doesnt_track_inventory)) unless variant.track_inventory?
 
-        stock_location = Spree::StockLocation.find(stock_location_id)
+        stock_location = resolve_stock_location(variant, stock_location_id)
+
         stock_movement = stock_location.stock_movements.build(stock_movement_params)
         stock_movement.stock_item = stock_location.set_up_stock_item(variant)
 
@@ -22,6 +23,14 @@ module SpreeCmCommissioner
 
       private
 
+      def resolve_stock_location(variant, stock_location_id = nil)
+        if stock_location_id.present?
+          Spree::StockLocation.find(stock_location_id)
+        else
+          variant.vendor.stock_locations.first || variant.vendor.send(:create_stock_location)
+        end
+      end
+
       def adjust_inventory_items_async(variant_id, quantity)
         args = { variant_id: variant_id, quantity: quantity }
         CmAppLogger.log(label: "#{self.class.name}#adjust_inventory_items_async", data: args) do

data/app/interactors/spree_cm_commissioner/trip_clone_creator.rb

@@ -91,9 +91,10 @@ module SpreeCmCommissioner
       stop_params = params.dig(:trip_stops_attributes, index.to_s)
       return unless stop_params
 
-      cloned_stop.departure_time    = parse_time(stop_params[:departure_time])
-      cloned_stop.arrival_time      = parse_time(stop_params[:arrival_time])
-      cloned_stop.stop_type         = stop_params[:stop_type].presence
+      cloned_stop.departure_time = parse_time(stop_params[:departure_time])
+      cloned_stop.arrival_time = parse_time(stop_params[:arrival_time])
+      cloned_stop.allow_boarding = stop_params[:allow_boarding] if stop_params.key?(:allow_boarding)
+      cloned_stop.allow_drop_off = stop_params[:allow_drop_off] if stop_params.key?(:allow_drop_off)
       cloned_stop.location_place_id = stop_params[:location_place_id].presence
     end
 

data/app/interactors/spree_cm_commissioner/trip_stops_creator.rb

@@ -26,7 +26,7 @@ module SpreeCmCommissioner
         trip: trip,
         stop_place: origin_place,
         location_place: origin_place,
-        stop_type: :boarding
+        allow_boarding: true
       }
 
       attributes[:departure_time] = departure_time
@@ -42,7 +42,7 @@ module SpreeCmCommissioner
         trip: trip,
         stop_place: destination_place,
         location_place: destination_place,
-        stop_type: :drop_off
+        allow_drop_off: true
       }
 
       attributes[:arrival_time] = departure_time + duration_seconds.seconds

data/app/jobs/spree_cm_commissioner/route_metrics/decrease_trip_count_job.rb

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

data/app/jobs/spree_cm_commissioner/route_metrics/increase_fulfilled_order_count_job.rb

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

data/app/jobs/spree_cm_commissioner/route_metrics/increase_order_count_job.rb

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

data/app/jobs/spree_cm_commissioner/route_metrics/increase_trip_count_job.rb

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

data/app/jobs/spree_cm_commissioner/stock/permanent_inventory_items_generator_job.rb

@@ -1,8 +1,8 @@
 module SpreeCmCommissioner
   module Stock
     class PermanentInventoryItemsGeneratorJob < ApplicationUniqueJob
-      def perform
-        SpreeCmCommissioner::Stock::PermanentInventoryItemsGenerator.call
+      def perform(options = {})
+        SpreeCmCommissioner::Stock::PermanentInventoryItemsGenerator.call(options)
       end
     end
   end

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

@@ -7,13 +7,13 @@ module SpreeCmCommissioner
     def increment_route_fulfilled_order_count
       return unless has_trip_ids?
 
-      SpreeCmCommissioner::Transit::RouteFulfilledOrderCountIncrementerJob.perform_later(order_id: id)
+      SpreeCmCommissioner::RouteMetrics::IncreaseFulfilledOrderCountJob.perform_later(order_id: id)
     end
 
     def increment_route_order_count
       return unless has_trip_ids?
 
-      SpreeCmCommissioner::Transit::RouteOrderCountIncrementerJob.perform_later(order_id: id)
+      SpreeCmCommissioner::RouteMetrics::IncreaseOrderCountJob.perform_later(order_id: id)
     end
   end
 end

data/app/models/spree_cm_commissioner/place.rb

@@ -21,15 +21,12 @@ module SpreeCmCommissioner
     has_many :taxon_places, class_name: 'SpreeCmCommissioner::TaxonPlace', dependent: :destroy
     has_many :taxons, through: :taxon_places
 
-    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
+    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 :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 }
+    # 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 }
 
     def self.ransackable_attributes(auth_object = nil)
       super & %w[name code]

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -48,6 +48,7 @@ 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,12 +1,52 @@
 module SpreeCmCommissioner
   class Route < Base
-    has_many :vendor_routes, class_name: 'SpreeCmCommissioner::VendorRoute', dependent: :destroy
-    has_many :vendors, through: :vendor_routes
+    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 :trips, inverse_of: :route
 
-    belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place'
-    belongs_to :destination_place, class_name: 'SpreeCmCommissioner::Place'
+    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?
 
-    validates :origin_place_id, uniqueness: { scope: :destination_place_id }
+      route_stops.errors.each { |error| errors.add(:route_stops, error) }
+    end
   end
 end

data/app/models/spree_cm_commissioner/route_metric.rb

@@ -0,0 +1,21 @@
+module SpreeCmCommissioner
+  class RouteMetric < Base
+    include SpreeCmCommissioner::RouteType
+
+    belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place', optional: false
+    belongs_to :destination_place, class_name: 'SpreeCmCommissioner::Place', optional: false
+
+    validates :route_type, presence: true
+    validates :route_type, uniqueness: { scope: %i[origin_place_id destination_place_id] }
+
+    validate :origin_and_destination_cannot_be_the_same
+
+    private
+
+    def origin_and_destination_cannot_be_the_same
+      return unless origin_place_id == destination_place_id
+
+      errors.add(:base, 'Origin and destination cannot be the same')
+    end
+  end
+end

data/app/models/spree_cm_commissioner/route_photo.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  class RoutePhoto < Asset
+    # 16x9
+    def asset_styles
+      {
+        mini: '160x90>',
+        small: '480x270>',
+        medium: '960x540>'
+      }
+    end
+  end
+end

data/app/models/spree_cm_commissioner/trip.rb

@@ -2,7 +2,6 @@ module SpreeCmCommissioner
   class Trip < Base
     include SpreeCmCommissioner::StoreMetadata
     include SpreeCmCommissioner::RouteType
-    include SpreeCmCommissioner::RouteTripCountCallbacks
 
     attr_accessor :hours, :minutes, :seconds
 
@@ -15,7 +14,9 @@ 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? }
-    before_validation :assign_route_and_vendor_route, if: :changed_route_attributes?
+
+    after_create :increment_route_metric_trip_count
+    before_destroy :decrement_route_metric_trip_count
 
     belongs_to :vendor, class_name: 'Spree::Vendor', inverse_of: :trips, optional: false
     belongs_to :product, class_name: 'Spree::Product', inverse_of: :trip, optional: false
@@ -26,7 +27,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, inverse_of: :trips
+    belongs_to :route, class_name: 'SpreeCmCommissioner::Route', inverse_of: :trips, optional: true
 
     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'
@@ -48,10 +49,6 @@ 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?
 
@@ -104,34 +101,12 @@ module SpreeCmCommissioner
                 )
     end
 
-    # 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?
+    def increment_route_metric_trip_count
+      SpreeCmCommissioner::RouteMetrics::IncreaseTripCountJob.perform_later(trip_id: id)
     end
 
-    # 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
+    def decrement_route_metric_trip_count
+      SpreeCmCommissioner::RouteMetrics::DecreaseTripCountJob.perform_later(trip_id: id)
     end
   end
 end

data/app/models/spree_cm_commissioner/trip_stop.rb

@@ -1,25 +1,39 @@
 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 stop_type]
+      %w[stop_name allow_boarding allow_drop_off]
     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/vendor_decorator.rb

@@ -82,7 +82,9 @@ 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 :vendor_routes, class_name: 'SpreeCmCommissioner::VendorRoute'
+      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 :homepage_section_relatables,
                     as: :relatable,

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.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_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_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/tenant/transit_cart_serializer.rb

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Tenant
+      class TransitCartSerializer < CartSerializer
+        has_many :line_items, serializer: SpreeCmCommissioner::V2::Storefront::TransitLineItemSerializer
+
+        cache_options store: nil
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class RouteMetricSerializer < BaseSerializer
+        set_type :route
+        attributes :route_name
+
+        has_one :origin_place, serializer: ::Spree::V2::Storefront::PlaceSerializer
+        has_one :destination_place, serializer: ::Spree::V2::Storefront::PlaceSerializer
+      end
+    end
+  end
+end

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

@@ -2,8 +2,9 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class RouteSerializer < BaseSerializer
-        attributes :route_name
+        attributes :route_name, :route_type, :short_name
 
+        has_many :route_photos, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
         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/transit_line_item_serializer.rb

@@ -0,0 +1,17 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class TransitLineItemSerializer < BaseSerializer
+        # Nested-only API shape
+        attributes :from_date,
+                   :to_date,
+                   :trip_id,
+                   :direction,
+                   :boarding_trip_stop_id,
+                   :drop_off_trip_stop_id
+
+        cache_options store: nil
+      end
+    end
+  end
+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, :stop_type, :stop_name, :arrival_time, :departure_time
+        attributes :id, :allow_boarding, :allow_drop_off, :stop_name, :arrival_time, :departure_time
 
         has_one :stop_place, serializer: ::SpreeCmCommissioner::V2::Storefront::TripPlaceSerializer
       end

data/app/services/spree_cm_commissioner/route_metrics/decrease_trip_count.rb

@@ -0,0 +1,31 @@
+module SpreeCmCommissioner
+  module RouteMetrics
+    class DecreaseTripCount
+      prepend ::Spree::ServiceModule::Base
+
+      def call(trip:)
+        return failure(nil, 'Trip not found') unless trip
+
+        route_metric = find_or_create_route_metric(trip)
+
+        route_metric.with_lock do
+          route_metric.update!(trip_count: [route_metric.trip_count - 1, 0].max)
+        end
+
+        success(trip: trip)
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+
+      private
+
+      def find_or_create_route_metric(trip)
+        SpreeCmCommissioner::RouteMetric.find_or_create_by!(
+          origin_place_id: trip.origin_place_id,
+          destination_place_id: trip.destination_place_id,
+          route_type: trip.route_type
+        )
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/{routes/increment_fulfilled_order_count.rb → route_metrics/increase_fulfilled_order_count.rb}

@@ -1,12 +1,12 @@
 module SpreeCmCommissioner
-  module Routes
-    class IncrementFulfilledOrderCount
+  module RouteMetrics
+    class IncreaseFulfilledOrderCount
       prepend ::Spree::ServiceModule::Base
 
       def call(order:)
         return failure(nil, 'Order not found') unless order
 
-        SpreeCmCommissioner::Routes::BaseUpdateOrderMetrics
+        SpreeCmCommissioner::RouteMetrics::UpdateRouteMetrics
           .call(order: order, attribute: :fulfilled_order_count)
 
         success(order: order)

data/app/services/spree_cm_commissioner/{routes/increment_order_count.rb → route_metrics/increase_order_count.rb}

@@ -1,12 +1,12 @@
 module SpreeCmCommissioner
-  module Routes
-    class IncrementOrderCount
+  module RouteMetrics
+    class IncreaseOrderCount
       prepend ::Spree::ServiceModule::Base
 
       def call(order:)
         return failure(nil, 'Order not found') unless order
 
-        SpreeCmCommissioner::Routes::BaseUpdateOrderMetrics
+        SpreeCmCommissioner::RouteMetrics::UpdateRouteMetrics
           .new(order: order, attribute: :order_count)
           .call