spree_cm_commissioner 2.5.1.pre.pre5 → 2.5.1

data/app/models/spree_cm_commissioner/trip.rb

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

data/app/models/spree_cm_commissioner/trip_connection.rb

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

data/app/models/spree_cm_commissioner/trip_stop.rb

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

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -82,9 +82,7 @@ module SpreeCmCommissioner
       base.has_many :subscriptions, through: :customers, class_name: 'SpreeCmCommissioner::Subscription'
       base.has_many :subscription_orders, through: :subscriptions, class_name: 'Spree::Order', source: :orders
       base.has_many :promotion_categories, class_name: 'Spree::PromotionCategory', foreign_key: :vendor_id, dependent: :destroy
-      base.has_many :routes, class_name: 'SpreeCmCommissioner::Route', dependent: :destroy
-      base.has_many :popular_routes, -> { order(fulfilled_order_count: :desc, order_count: :desc) },
-                    class_name: 'SpreeCmCommissioner::Route'
+      base.has_many :vendor_routes, class_name: 'SpreeCmCommissioner::VendorRoute'
 
       base.has_many :homepage_section_relatables,
                     as: :relatable,

data/app/models/spree_cm_commissioner/vendor_route.rb

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

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -77,8 +77,8 @@ module SpreeCmCommissioner
 
       scope
         .joins(<<~SQL.squish)
-          INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = cm_trips.id AND boarding.allow_boarding = true
-          INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = cm_trips.id AND drop_off.allow_drop_off = true
+          INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = cm_trips.id AND boarding.stop_type = 0
+          INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = cm_trips.id AND drop_off.stop_type = 1
           INNER JOIN cm_places AS origin_places ON origin_places.id = cm_trips.origin_place_id
           INNER JOIN cm_places AS dest_places ON dest_places.id = cm_trips.destination_place_id
           INNER JOIN spree_variants AS master ON master.product_id = cm_trips.product_id AND master.is_master = true

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

@@ -2,9 +2,8 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class RouteSerializer < BaseSerializer
-        attributes :route_name, :route_type, :short_name
+        attributes :route_name
 
-        has_many :route_photos, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
         has_one :origin_place, serializer: ::Spree::V2::Storefront::PlaceSerializer
         has_one :destination_place, serializer: ::Spree::V2::Storefront::PlaceSerializer
       end

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

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

data/app/services/spree_cm_commissioner/{route_metrics/update_route_metrics.rb → routes/base_update_order_metrics.rb}

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
-  module RouteMetrics
-    class UpdateRouteMetrics
+  module Routes
+    class BaseUpdateOrderMetrics
       attr_reader :order, :attribute
 
       SUPPORTED_ATTRIBUTES = %i[order_count fulfilled_order_count].freeze
@@ -31,21 +31,26 @@ module SpreeCmCommissioner
         trip = product&.trip
         return unless trip
 
-        route_metric = find_or_create_route_metric_for_trip(trip)
-        increment_route_by(route_metric, line_item.quantity)
-
-        route = trip.route
-        increment_route_by(route, line_item.quantity) if route
+        route = find_or_create_route_for_trip(trip)
+        ensure_trip_route(trip, route)
+        increment_route_by(route, line_item.quantity)
       end
 
-      def find_or_create_route_metric_for_trip(trip)
-        SpreeCmCommissioner::RouteMetric.find_or_create_by(
+      def find_or_create_route_for_trip(trip)
+        SpreeCmCommissioner::Route.find_or_create_by(
           origin_place_id: trip.origin_place_id,
-          destination_place_id: trip.destination_place_id,
-          route_type: trip.route_type
+          destination_place_id: trip.destination_place_id
         )
       end
 
+      def ensure_trip_route(trip, route)
+        trip_route_id = trip.respond_to?(:route_id) ? trip.route_id : nil
+
+        return unless trip.respond_to?(:update_column) && trip_route_id != route.id
+
+        trip.update_column(:route_id, route.id) # rubocop:disable Rails/SkipsModelValidations
+      end
+
       def increment_route_by(route, qty)
         route.with_lock do
           current_value = route.public_send(attribute) || 0

data/app/services/spree_cm_commissioner/routes/decrement_previous_trip_count.rb

@@ -0,0 +1,30 @@
+module SpreeCmCommissioner
+  module Routes
+    class DecrementPreviousTripCount
+      prepend ::Spree::ServiceModule::Base
+
+      def call(previous_route_id:)
+        previous_route = SpreeCmCommissioner::Route.find_by(id: previous_route_id)
+        return failure(nil, 'Route not found') unless previous_route
+
+        if previous_route.vendors.exists?
+
+          # Build a trip-like object that responds to :route and :vendor so the delegated
+          # service can locate vendor routes correctly.
+          trip_like = Struct.new(:route, :vendor).new(previous_route, previous_route.vendors.first)
+          result = SpreeCmCommissioner::Routes::DecrementTripCount.call(trip: trip_like)
+          return result if result.failure?
+        else
+          previous_route.with_lock do
+            new_count = [previous_route.trip_count.to_i - 1, 0].max
+            previous_route.update!(trip_count: new_count)
+          end
+        end
+
+        success(previous_route: previous_route)
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/routes/decrement_trip_count.rb

@@ -0,0 +1,33 @@
+module SpreeCmCommissioner
+  module Routes
+    class DecrementTripCount
+      prepend ::Spree::ServiceModule::Base
+
+      def call(trip:)
+        return failure(nil, 'Trip not found') unless trip
+
+        vendor = trip.vendor
+        return failure(nil, 'Vendor not found') unless vendor
+
+        ActiveRecord::Base.transaction do
+          route = trip.route
+
+          route.update!(trip_count: [route.trip_count - 1, 0].max)
+
+          vendor_route = locate_vendor_route(vendor: vendor, route: route)
+          vendor_route&.update!(trip_count: [vendor_route.trip_count - 1, 0].max)
+        end
+
+        success(trip: trip)
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+
+      private
+
+      def locate_vendor_route(vendor:, route:)
+        vendor.vendor_routes.find_by(route_id: route.id)
+      end
+    end
+  end
+end

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

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

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

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

data/app/services/spree_cm_commissioner/routes/increment_trip_count.rb

@@ -0,0 +1,33 @@
+module SpreeCmCommissioner
+  module Routes
+    class IncrementTripCount
+      prepend ::Spree::ServiceModule::Base
+
+      def call(trip:)
+        return failure(nil, 'Trip not found') unless trip
+
+        vendor = trip.vendor
+        return failure(nil, 'Vendor not found') unless vendor
+
+        ActiveRecord::Base.transaction do
+          route = trip.route
+
+          route.update!(trip_count: route.trip_count + 1)
+
+          vendor_route = find_or_create_vendor_route(vendor: vendor, route: route)
+          vendor_route.update!(trip_count: vendor_route.trip_count + 1)
+        end
+
+        success(trip: trip)
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+
+      private
+
+      def find_or_create_vendor_route(vendor:, route:)
+        vendor.vendor_routes.find_or_create_by!(route_id: route.id)
+      end
+    end
+  end
+end

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

@@ -9,8 +9,7 @@
         <tr data-hook="option_header">
           <th class="no-border handel-head"></th>
           <th><%= Spree.t(:name) %></th>
-          <th><%= Spree.t(:allow_boarding) %></th>
-          <th><%= Spree.t(:allow_drop_off) %></th>
+          <th><%= Spree.t(:stop_type) %></th>
           <th><%= Spree.t(:sequence) %></th>
           <th><%= Spree.t(:created_at) %></th>
         </tr>
@@ -22,8 +21,7 @@
               <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
             </td>
             <td><%= stop.stop_name %></td>
-            <td> <%= stop.allow_boarding ? 'Yes' : 'No' %></td>
-	           <td> <%= stop.allow_drop_off ? 'Yes' : 'No' %></td>
+            <td> <%= stop.stop_type %></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,6 +151,7 @@
             <% @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,8 +1,5 @@
 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
@@ -89,13 +86,5 @@ module Spree
       originator_type
       originator_id
     ]
-
-    @@route_attributes = %i[
-      route_name
-      short_name
-      vendor_id
-      route_type
-      route_stops
-    ]
   end
 end

data/config/routes.rb

@@ -560,12 +560,6 @@ 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]

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

@@ -1,11 +1,10 @@
 FactoryBot.define 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
-
+  factory :cm_route, class: 'SpreeCmCommissioner::Route' do
     sequence(:route_name) { |n| "Route #{n}" }
-    sequence(:short_name) { |n| "R#{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 }
   end
 end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :cm_trip_connection, class: SpreeCmCommissioner::TripConnection do
+    from_trip_id { create(:cm_trip) }
+    to_trip_id { create(:cm_trip) }
+  end
+end

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

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

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

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

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

@@ -1,6 +1,5 @@
 FactoryBot.define do
   factory :cm_transit_vendor, parent: :vendor do
-    from_email { FFaker::Internet.email } # required only when tenant exist.
     sequence(:name) { |n| "#{FFaker::Company.name} #{n}#{Kernel.rand(9999)}" }
     state { :active }
     primary_product_type { :transit }
@@ -8,7 +7,6 @@ FactoryBot.define do
 
   factory :cm_vendor, parent: :vendor do
     sequence(:name) { |n| "#{FFaker::Company.name} #{n}#{Kernel.rand(9999)}" }
-    from_email { FFaker::Internet.email } # required only when tenant exist.
     state { :active }
     default_state_id { Spree::State.first&.id }
     primary_product_type { :ecommerce }

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

@@ -7,17 +7,6 @@ FactoryBot.define do
     position  { FFaker::Number.number }
 
     place_type { :location }
-
-    transient do
-      place_name { nil }
-    end
-
-    before :create do |vendor_place, evaluator|
-      if evaluator.place_name.present?
-        vendor_place.place.name = evaluator.place_name
-        vendor_place.place.save!
-      end
-    end
   end
 
   factory :cm_vendor_place, class: SpreeCmCommissioner::VendorPlace do
@@ -41,16 +30,5 @@ FactoryBot.define do
       place_type { :location }
       location { nil }
     end
-
-    transient do
-      place_name { nil }
-    end
-
-    before :create do |vendor_place, evaluator|
-      if evaluator.place_name.present?
-        vendor_place.place.name = evaluator.place_name
-        vendor_place.place.save!
-      end
-    end
   end
 end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.5.1.pre.pre5'.freeze
+  VERSION = '2.5.1'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -23,10 +23,6 @@ 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'