spree_cm_commissioner 2.5.1.pre.pre2 → 2.5.1.pre.pre3

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/services/spree_cm_commissioner/seeds/user_usernames.rb

@@ -0,0 +1,86 @@
+module SpreeCmCommissioner
+  module Seeds
+    class UserUsernames
+      prepend Spree::ServiceModule::Base
+
+      def call(batch_size: 1000)
+        users = Spree::User.all
+        total_count = users.count
+        updated_count = 0
+        failed_count = 0
+        current_index = 0
+
+        Rails.logger.debug { "\n🚀 Starting login update for #{total_count} users (batch size: #{batch_size})..." }
+        start_time = Time.current
+
+        users.find_each(batch_size: batch_size) do |user|
+          current_index += 1
+
+          begin
+            new_login = SpreeCmCommissioner::Users::Username::Generate.call(user: user)
+
+            if user.update_column(:login, new_login) # rubocop:disable Rails/SkipsModelValidations
+              updated_count += 1
+
+              # Log progress every 100 users to avoid log spam
+              if (current_index % 100).zero? || current_index == total_count
+                elapsed = (Time.current - start_time).round(2)
+                rate = (current_index / elapsed).round(2)
+
+                Rails.logger.debug { "[#{current_index}/#{total_count}] ✓ Updated #{updated_count}, Failed #{failed_count} (#{rate} users/sec)" }
+              end
+            else
+              failed_count += 1
+              Rails.logger.warn { "[#{current_index}/#{total_count}] ✗ User ##{user.id}: Failed to update" }
+            end
+          rescue StandardError => e
+            failed_count += 1
+            Rails.logger.error { "[#{current_index}/#{total_count}] ✗ User ##{user.id}: #{e.message}" }
+          end
+        end
+
+        elapsed = (Time.current - start_time).round(2)
+        Rails.logger.debug { "\n✅ Completed in #{elapsed}s! Updated #{updated_count}/#{total_count} users (Failed: #{failed_count})" }
+      end
+
+      private
+
+      # Generate username with collision safety
+      # Format: NamePrefixNumber (TheaTraveler1) or PrefixNumber (Traveler1)
+      def generate_unique_username!(user, max_attempts: 10)
+        max_attempts.times do
+          username = generate_clean_username(user)
+          return username unless Spree::User.exists?(login: username)
+        end
+
+        # Last resort: use extended number range
+        generate_clean_username(user, number_range: 10_000..99_999)
+      end
+
+      # Generate clean username: NamePrefixNumber or PrefixNumber
+      # Examples: TheaTraveler1, Traveler1
+      def generate_clean_username(user, number_range: 1..9999)
+        name = format_name(user.first_name)
+        prefix = SAFE_USERNAME_PREFIXES.sample
+        number = rand(number_range)
+
+        name.present? ? "#{name}#{prefix}#{number}" : "#{prefix}#{number}"
+      end
+
+      # Format first name for username: title case, English only, max 8 chars
+      # Returns nil if name is empty or contains non-English characters
+      def format_name(first_name)
+        return nil if first_name.nil? || first_name.strip.empty?
+
+        # Remove special chars and whitespace
+        cleaned = first_name.strip.gsub(/[^a-zA-Z]/, '')
+
+        # Return nil if empty after cleaning or contains non-Latin characters
+        return nil if cleaned.empty? || first_name.match?(/[^\x00-\x7F]/)
+
+        # Title case and truncate to 8 chars
+        cleaned.capitalize.slice(0, 8)
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/users/qr_data/extract_login.rb

@@ -0,0 +1,18 @@
+module SpreeCmCommissioner
+  module Users::QrData
+    class ExtractLogin
+      prepend Spree::ServiceModule::Base
+
+      def call(qr_data:)
+        decoded_token = JWT.decode(qr_data, nil, false)
+        payload = decoded_token[0]
+
+        return success(payload['login']) if payload.key?('login')
+
+        failure(:user_login_not_found, 'User login not found in QR code payload')
+      rescue JWT::DecodeError
+        failure(:invalid_qr_data, 'Provided QR code is invalid')
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/users/qr_data/generate.rb

@@ -0,0 +1,14 @@
+module SpreeCmCommissioner
+  module Users::QrData
+    class Generate
+      prepend Spree::ServiceModule::Base
+
+      def call(user:)
+        # Keep key as small as possible to reduce QR code size
+        payload = { login: user.login, ver: user.qr_data_version, exp: 30.days.from_now.to_i }
+        qr_data = JWT.encode(payload, user.secure_token, 'HS256')
+        success(qr_data)
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/users/qr_data/invalidate.rb

@@ -0,0 +1,19 @@
+module SpreeCmCommissioner
+  module Users::QrData
+    class Invalidate
+      prepend Spree::ServiceModule::Base
+
+      def call(user:)
+        user.qr_data_version ||= 0
+        user.qr_data_version += 1
+        user.qr_data_invalidated_at = Time.zone.now
+
+        if user.save
+          success(user)
+        else
+          failure(:user_save_failed, user.errors.full_messages.to_sentence)
+        end
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/users/qr_data/verify.rb

@@ -0,0 +1,33 @@
+module SpreeCmCommissioner
+  module Users::QrData
+    class Verify
+      prepend Spree::ServiceModule::Base
+
+      def call(qr_data:)
+        user = find_and_verify_by!(qr_data: qr_data)
+        success(user) if user.present?
+      rescue JWT::ExpiredSignature
+        failure(:expired_qr_data, 'Provided QR code has expired')
+      rescue JWT::DecodeError, JWT::VerificationError
+        failure(:invalid_qr_data, 'Provided QR code is invalid')
+      end
+
+      def find_and_verify_by!(qr_data:)
+        decoded_token = JWT.decode(qr_data, nil, false)
+        payload = decoded_token[0]
+        login = payload['login']
+
+        # we don't reveal whether user exists or not in error messages for security reasons.
+        user = Spree::User.find_by(login: login)
+        raise JWT::DecodeError, 'QR code is invalid' if user.nil?
+
+        JWT.decode(qr_data, user.secure_token, true, { algorithm: 'HS256' })
+
+        # Validate version to ensure QR code hasn't been invalidated
+        raise JWT::VerificationError, 'QR code has been invalidated' if payload['ver'] != user.qr_data_version
+
+        user
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/users/username/generate.rb

@@ -0,0 +1,68 @@
+require 'securerandom'
+
+module SpreeCmCommissioner
+  module Users
+    module Username
+      class Generate
+        # Travel/Social Username Prefixes - See https://github.com/channainfo/commissioner/pull/3389
+        # Format: NamePrefixNumber (e.g., TheaTraveler1) or PrefixNumber (e.g., Traveler1)
+        SAFE_USERNAME_PREFIXES = %w[
+          Traveler Rider Explorer Voyager Passenger
+          Journey Buddy Mate Friend Crew
+        ].freeze
+
+        # Generate unique username for a user with collision safety
+        # @param user [Spree::User] User object to generate username for
+        # @param max_attempts [Integer] Maximum retry attempts before fallback
+        # @return [String] Generated unique username
+        def self.call(user:, max_attempts: 10)
+          new(user, max_attempts: max_attempts).call
+        end
+
+        def initialize(user, max_attempts: 10)
+          @user = user
+          @max_attempts = max_attempts
+        end
+
+        def call
+          @max_attempts.times do
+            username = generate_clean_username
+            return username unless Spree::User.exists?(login: username)
+          end
+
+          # Last resort: use extended number range
+          generate_clean_username(number_range: 10_000..99_999)
+        end
+
+        private
+
+        attr_reader :user
+
+        # Generate clean username: NamePrefixNumber or PrefixNumber
+        # Examples: TheaTraveler1, Traveler1
+        def generate_clean_username(number_range: 1..9999)
+          name = format_name(user.first_name)
+          prefix = SAFE_USERNAME_PREFIXES.sample
+          number = rand(number_range)
+
+          name.present? ? "#{name}#{prefix}#{number}" : "#{prefix}#{number}"
+        end
+
+        # Format first name for username: title case, English only, max 8 chars
+        # Returns nil if name is empty or contains non-English characters
+        def format_name(first_name)
+          return nil if first_name.nil? || first_name.strip.empty?
+
+          # Remove special chars and whitespace
+          cleaned = first_name.strip.gsub(/[^a-zA-Z]/, '')
+
+          # Return nil if empty after cleaning or contains non-Latin characters
+          return nil if cleaned.empty? || first_name.match?(/[^\x00-\x7F]/)
+
+          # Title case and truncate to 8 chars
+          cleaned.capitalize.slice(0, 8)
+        end
+      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
@@ -15,6 +12,7 @@ module Spree
     ]
 
     @@user_attributes += %i[
+      login
       first_name
       last_name
       dob gender
@@ -88,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]
@@ -634,6 +628,8 @@ Spree::Core::Engine.add_routes do
 
         namespace :account do
           resource :preferred_payment_method, controller: :preferred_payment_method, only: %i[show update]
+          resource :qr_data, controller: :qr_data, only: %i[update]
+
           patch :mark_guest_info_complete, to: 'mark_guest_info_complete#update'
           resources :guests, only: [] do
             patch 'dynamic_fields/:phase', to: 'guest_dynamic_fields#update_dynamic_field', as: :update_dynamic_fields

data/db/migrate/20260126110528_seed_user_initial_usernames.rb

@@ -0,0 +1,5 @@
+class SeedUserInitialUsernames < ActiveRecord::Migration[7.0]
+  def change
+    SpreeCmCommissioner::Seeds::UserUsernames.call
+  end
+end

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/vehicle_type_factory.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :cm_vehicle_type, class: SpreeCmCommissioner::VehicleType do
-    sequence(:name) { |n| "vehicle_type_#{n}" }
+    name { "vehicle_type_#{SecureRandom.hex(4)}" }
     kind { :air_bus }
     association :vendor, factory: :vendor
   end

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

@@ -1,13 +1,12 @@
 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 }
   end
 
   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.pre2'.freeze
+  VERSION = '2.5.1.pre.pre3'.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'