spree_cm_commissioner 2.5.2.pre.pre1 → 2.5.2.pre.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbcd427457c152b80d8c5aa1f87a1633e29ba0c39b99c3ee856f88187e54ff6e
-  data.tar.gz: 372de4f3e2a8ab6df9fb2ba94287a5ae2f676633808c02593685ae93f5b201a8
+  metadata.gz: 415383ae7339303ff881a06d0642275576a1aa2e0bd685d2dfbf239cda829f6e
+  data.tar.gz: da42ba2da856fff29f83d67f574d6e07cd06c1066a1baa0ef30b92268533d8b0
 SHA512:
-  metadata.gz: 7d944b5af7b8fc624cce7d0ce5428060b7094429eb1619147790d606102d13dbf88702686d4723208feb531339eac39d87c9011320bb8f18b897a12267e699a3
-  data.tar.gz: 5a2896cb596c6bf3ed41c2a860e794ced42c3a317f7af71de69873fec33869a146cbc2cc4953eddce256d7a36d2a45f5b8e1319bc8d0836692b7a1a37dc1e397
+  metadata.gz: b3590bf3744645b2af02f779ccf4d6797879e71a47c9c01e524514428396813cc6752f25e361cf1489e0f1a2f106ba9987f43581d97788ce19ed290848a7fc68
+  data.tar.gz: 6d0b09ce6143a18db3118c284ae0c1b334bbd29baf9dcf106ec4253144afbdb5da6e78f952219821ccc782601eee2ac20f7f1ccf7f22148290ac9ae0f1a3a012

data/Gemfile.lock

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

data/app/controllers/spree/api/v2/storefront/invite_guests_controller.rb

@@ -0,0 +1,111 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class InviteGuestsController < ::Spree::Api::V2::ResourceController
+          before_action :load_invite_guest_by_token, only: %i[update]
+          before_action :require_spree_current_user, only: :update
+
+          def update
+            return if invite_unavailable?
+
+            order = @invite_guest.order
+            return unless ensure_order_belongs_to_current_user(order)
+
+            @line_item = @invite_guest.order.line_items.first
+            guest = find_unassigned_guest(@line_item)
+            return render_error_payload('No available guest to assign', 422) unless guest
+
+            assign_guest_from_user(guest)
+
+            finalize_guest_claim(guest)
+          end
+
+          private
+
+          def send_guest_claimed_invitation_telegram_alert_to_vendor(guest)
+            title = '📣 --- [NEW GUEST CLAIMED INVITATION] ---' # Style/StringLiterals
+            chat_id = guest.event&.vendor&.preferred_telegram_chat_id
+            return if chat_id.blank?
+
+            factory = SpreeCmCommissioner::InviteGuestClaimedTelegramMessageFactory.new(
+              title: title,
+              order: @invite_guest.order,
+              guest: guest,
+              vendor: guest.event.vendor
+            )
+            SpreeCmCommissioner::TelegramNotificationSenderJob.perform_later(
+              chat_id: chat_id,
+              message: factory.message,
+              parse_mode: factory.parse_mode
+            )
+          end
+
+          def load_invite_guest_by_token
+            @invite_guest = SpreeCmCommissioner::InviteGuest.find_by!(token: params[:id])
+          rescue ActiveRecord::RecordNotFound
+            render_error_payload(I18n.t('invite.url_not_found'))
+          end
+
+          def invite_unavailable?
+            return render_error(:revoked) if @invite_guest.revoked?
+            return render_error(:closed) if @invite_guest.expired?
+            return render_error(:fully_claimed) if @invite_guest.claimed? || @invite_guest.fully_claimed?
+
+            false
+          end
+
+          def ensure_order_belongs_to_current_user(order)
+            if order.user.nil?
+              order.update(user: spree_current_user)
+              return true
+            end
+
+            return true if order.user == spree_current_user
+
+            render_error_payload('You are not authorized to access this page.', 403)
+            false
+          end
+
+          def find_unassigned_guest(line_item)
+            return line_item.guests.build(event_id: @invite_guest&.event_id) if line_item.guests.blank?
+
+            line_item.guests.detect { |g| g.user.nil? }
+          end
+
+          def assign_guest_from_user(guest)
+            guest.first_name ||= spree_current_user.first_name
+            guest.last_name ||= spree_current_user.last_name
+            guest.phone_number ||= spree_current_user.try(:phone) || spree_current_user.try(:phone_number)
+            guest.dob ||= spree_current_user.try(:dob)
+            guest.gender ||= spree_current_user.try(:gender)
+
+            guest.line_item ||= @line_item
+            guest.event_id ||= @invite_guest.event_id
+            guest.user ||= spree_current_user
+          end
+
+          def finalize_guest_claim(guest)
+            if guest.save
+              @invite_guest.update(claimed_status: :claimed) if @line_item.guests.count == @invite_guest.quantity
+              send_guest_claimed_invitation_telegram_alert_to_vendor(guest) if guest.event&.vendor&.preferred_telegram_chat_id.present?
+
+              order = @invite_guest.order
+              render_serialized_payload { serialize_resource(order) }
+            else
+              render_error_payload(guest.errors.full_messages.to_sentence)
+            end
+          end
+
+          def render_error(message)
+            render json: { errors: message }
+          end
+
+          def resource_serializer
+            Spree::V2::Storefront::OrderSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/trips/create_single_leg.rb

@@ -36,7 +36,10 @@ module SpreeCmCommissioner
       def create_variant!(vendor, trip_form)
         first_stop = trip_form.trip_stops.first
         vehicle_type = SpreeCmCommissioner::VehicleType.find(first_stop.vehicle_type_id)
-        capacity = vehicle_type.number_of_seats
+        capacity = vehicle_type.seat_layout&.total_seats || vehicle_type.number_of_seats
+
+        raise StandardError, 'Vehicle type must be selected' if vehicle_type.blank?
+        raise StandardError, 'Vehicle type seat capacity must be greater than 0' if capacity <= 0
 
         result = SpreeCmCommissioner::Trips::Variants::Create.call(
           vendor: vendor,
@@ -45,7 +48,7 @@ module SpreeCmCommissioner
           capacity: capacity
         )
 
-        raise result.error unless result.success?
+        raise StandardError, result.error unless result.success?
 
         result.value[:variant]
       end
@@ -57,14 +60,18 @@ module SpreeCmCommissioner
         last_stop  = trip_form.trip_stops.last
 
         locations = vendor.locations.where(id: trip_form.trip_stops.map(&:location_id)).index_by(&:id)
-        stops = vendor.stops.where(id: trip_form.trip_stops.map(&:stop_id)).index_by(&:id)
+
+        # vendor_places are either stops or branches
+        vendor_places = SpreeCmCommissioner::VendorPlace
+                        .where(id: trip_form.trip_stops.map(&:stop_id), vendor: vendor)
+                        .index_by(&:id)
 
         trip = vendor.trips.create!(
           product: variant.product,
           vehicle_type: SpreeCmCommissioner::VehicleType.find_by(id: first_stop.vehicle_type_id),
           vehicle: SpreeCmCommissioner::Vehicle.find_by(id: first_stop.vehicle_id),
-          origin_place: locations[first_stop.location_id].place,
-          destination_place: locations[last_stop.location_id].place,
+          origin_place_id: locations[first_stop.location_id.to_i].place_id,
+          destination_place_id: locations[last_stop.location_id.to_i].place_id,
           route: vendor.routes.find(trip_form.route_id),
           departure_time: first_stop.departure_time,
           duration: trip_form.total_duration_seconds,
@@ -73,23 +80,21 @@ module SpreeCmCommissioner
           route_type: trip_form.route_type || vendor.routes.find(trip_form.route_id)&.route_type
         )
 
-        create_trip_stops(trip, trip_form, locations, stops)
+        create_trip_stops(trip, trip_form, locations, vendor_places)
         trip
       end
 
       # Creates individual trip stops based on the trip form stops.
       # Each stop includes arrival/departure times and boarding/drop-off permissions.
-      def create_trip_stops(trip, trip_form, locations, stops)
+      def create_trip_stops(trip, trip_form, locations, vendor_places)
         previous_departure = nil
-
-        trip_form.trip_stops.each do |ts|
+        Array(trip_form.trip_stops).each do |ts|
           arrival_time = previous_departure || ts.departure_time
-
           trip.trip_stops.create!(
-            stop_place: stops[ts.stop_id].place,
-            location_place: locations[ts.location_id].place,
+            stop_place: vendor_places[ts.stop_id.to_i].place,
+            location_place: locations[ts.location_id.to_i].place,
             allow_boarding: ts.allow_boarding?,
-            allow_drop_off: ts.allow_drop_off,
+            allow_drop_off: ts.allow_drop_off?,
             arrival_time: arrival_time,
             departure_time: ts.departure_time
           )
@@ -109,7 +114,7 @@ module SpreeCmCommissioner
           exception_rules: calendar_form.exception_rules || []
         )
 
-        raise res.error unless res.success?
+        raise StandardError, res.error unless res.success?
 
         res.value[:calendar]
       end

data/app/services/spree_cm_commissioner/trips/update_single_leg.rb

@@ -25,7 +25,7 @@ module SpreeCmCommissioner
             error_message: e.message
           }
         )
-        failure(nil, 'Failed to update trip')
+        failure(nil, e)
       end
 
       private
@@ -47,6 +47,8 @@ module SpreeCmCommissioner
 
       # Iterates through stops and applies updates only if attributes are present.
       def update_trip_stops(trip, trip_form)
+        return if trip_form.trip_stops.blank?
+
         trip.trip_stops.each_with_index do |stop, idx|
           ts_form = trip_form.trip_stops[idx]
           next unless ts_form
@@ -71,7 +73,7 @@ module SpreeCmCommissioner
           exception_rules: calendar_form.exception_rules || []
         )
 
-        raise result.error unless result.success?
+        raise StandardError, 'Failed to update service calendar' unless result.success?
 
         result.value[:calendar]
       end

data/app/services/spree_cm_commissioner/trips/variants/create.rb

@@ -40,12 +40,12 @@ module SpreeCmCommissioner
         # Creates a transit product with name based on stops, assigns vendor, type, and options.
         # Includes seat-type option type and default store association.
         def create_product!(vendor, trip_form)
-          vendor_stops = stops(vendor, trip_form)
-          first_stop = vendor_stops[trip_form.trip_stops.first.stop_id].place
-          last_stop = vendor_stops[trip_form.trip_stops.last.stop_id].place
+          vendor_stops = branches(vendor, trip_form)
+          first_stop = vendor_stops[trip_form.trip_stops.first.stop_id]
+          last_stop = vendor_stops[trip_form.trip_stops.last.stop_id]
 
           Spree::Product.create!(
-            name: trip_form.name.presence || "#{first_stop.name} - #{last_stop.name}",
+            name: trip_form.name.presence || "#{first_stop&.name} - #{last_stop&.name}",
             short_name: trip_form.short_name,
             vendor: vendor,
             product_type: 'transit',
@@ -59,8 +59,8 @@ module SpreeCmCommissioner
         end
 
         # Retrieves and indexes stops from the vendor for the trip form's stop IDs.
-        def stops(vendor, trip_form)
-          vendor.stops.where(id: trip_form.trip_stops.map(&:stop_id)).index_by(&:id)
+        def branches(vendor, trip_form)
+          vendor.branches.where(id: trip_form.trip_stops.map(&:stop_id)).index_by(&:id)
         end
 
         # Sets up or finds the seat-type option type and creates normal option value.

data/config/routes.rb

@@ -483,7 +483,6 @@ Spree::Core::Engine.add_routes do
         resource :s3_signed_urls
         resources :invites
         resources :invite_crews, only: %i[show update]
-        resources :invite_guests, only: %i[show update]
       end
 
       namespace :tenant do
@@ -711,6 +710,7 @@ Spree::Core::Engine.add_routes do
         resources :seat_layouts, only: %i[show index]
         resources :inventory_items, only: %i[index]
         resources :event_matches, only: %i[index]
+        resources :invite_guests, only: %i[show update]
         namespace :transit do
           resources :draft_orders, only: %i[create]
         end

data/lib/spree_cm_commissioner/transit/route_stop_collection.rb

@@ -97,6 +97,34 @@ module SpreeCmCommissioner::Transit
       grouped
     end
 
+    def by_location_id_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 id
+        grouped[location.id] ||= []
+        grouped[location.id] << 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

data/lib/spree_cm_commissioner/transit/service_calendar_form.rb

@@ -0,0 +1,51 @@
+module SpreeCmCommissioner::Transit
+  class ServiceCalendarForm
+    include ActiveModel::Model
+
+    attr_accessor :name,
+                  :start_date,
+                  :end_date,
+                  :monday,
+                  :tuesday,
+                  :wednesday,
+                  :thursday,
+                  :friday,
+                  :saturday,
+                  :sunday,
+                  :exception_rules
+
+    def initialize(attrs = {})
+      super
+      @exception_rules ||= []
+    end
+
+    def weekdays
+      {
+        'monday' => monday,
+        'tuesday' => tuesday,
+        'wednesday' => wednesday,
+        'thursday' => thursday,
+        'friday' => friday,
+        'saturday' => saturday,
+        'sunday' => sunday
+      }
+    end
+
+    def weekdays=(hash)
+      hash = hash.transform_keys(&:to_s)
+      @monday = cast_bool(hash['monday'])
+      @tuesday = cast_bool(hash['tuesday'])
+      @wednesday = cast_bool(hash['wednesday'])
+      @thursday = cast_bool(hash['thursday'])
+      @friday = cast_bool(hash['friday'])
+      @saturday = cast_bool(hash['saturday'])
+      @sunday = cast_bool(hash['sunday'])
+    end
+
+    private
+
+    def cast_bool(val)
+      ActiveModel::Type::Boolean.new.cast(val)
+    end
+  end
+end

data/lib/spree_cm_commissioner/transit/trip_form.rb

@@ -12,6 +12,30 @@ module SpreeCmCommissioner::Transit
                   :trip_stops, # TripStopForm[]
                   :service_calendar # monday, tuesday, wednesday, thursday, friday, saturday, sunday, start_date, end_date
 
+    # Convert params hashes into TripStopForm objects
+    def trip_stops_attributes=(arr)
+      items = arr.is_a?(Hash) ? arr.values : Array(arr)
+      @trip_stops = items.map do |h|
+        h = h.to_h.symbolize_keys
+        TripStopForm.new.tap do |ts|
+          ts.location_id = h[:location_id]
+          ts.stop_id = h[:stop_id]
+          ts.departure_time = h[:departure_time]
+          ts.duration_in_hours = h[:duration_in_hours]
+          ts.route_type = h[:route_type]
+          ts.vehicle_type_id = h[:vehicle_type_id]
+          ts.vehicle_id = h[:vehicle_id]
+          ts.board_to_trip_id = h[:board_to_trip_id]
+          ts.allow_boarding = h[:allow_boarding]
+          ts.allow_drop_off = h[:allow_drop_off]
+          ts.allow_seat_selection = h[:allow_seat_selection]
+          ts.allow_booking = h[:allow_booking]
+          ts.sequence = h[:sequence]
+          ts.vendor_id = h[:vendor_id]
+        end
+      end
+    end
+
     def multi_leg?
       trip_stops.map(&:location_id).uniq.size > 2
     end

data/lib/spree_cm_commissioner/transit/trip_stop_form.rb

@@ -46,7 +46,11 @@ module SpreeCmCommissioner::Transit
                   :sequence,
                   #
                   # set from create service
-                  :vendor_id
+                  :vendor_id,
+                  # branch or stop
+                  :stop_type,
+                  # (optional) for view lookup
+                  :vendor_place
 
     def allow_boarding?
       ActiveModel::Type::Boolean.new.cast(allow_boarding)

data/lib/spree_cm_commissioner/version.rb

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

data/lib/spree_cm_commissioner.rb

@@ -27,6 +27,7 @@ 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/transit/service_calendar_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.2.pre.pre1
+  version: 2.5.2.pre.pre2
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-28 00:00:00.000000000 Z
+date: 2026-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -919,7 +919,6 @@ files:
 - app/controllers/spree/api/v2/organizer/base_controller.rb
 - app/controllers/spree/api/v2/organizer/images_controller.rb
 - app/controllers/spree/api/v2/organizer/invite_crews_controller.rb
-- app/controllers/spree/api/v2/organizer/invite_guests_controller.rb
 - app/controllers/spree/api/v2/organizer/invites_controller.rb
 - app/controllers/spree/api/v2/organizer/s3_signed_urls_controller.rb
 - app/controllers/spree/api/v2/organizer/ticket_images_controller.rb
@@ -965,6 +964,7 @@ files:
 - app/controllers/spree/api/v2/storefront/intercity_taxi/distance_calculator_controller.rb
 - app/controllers/spree/api/v2/storefront/intercity_taxi/draft_orders_controller.rb
 - app/controllers/spree/api/v2/storefront/inventory_items_controller.rb
+- app/controllers/spree/api/v2/storefront/invite_guests_controller.rb
 - app/controllers/spree/api/v2/storefront/line_item_qrs_controller.rb
 - app/controllers/spree/api/v2/storefront/line_items_controller.rb
 - app/controllers/spree/api/v2/storefront/nearby_places_controller.rb
@@ -3151,6 +3151,7 @@ files:
 - 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/service_calendar_form.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

data/app/controllers/spree/api/v2/organizer/invite_guests_controller.rb

@@ -1,91 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Organizer
-        class InviteGuestsController < ::Spree::Api::V2::Organizer::BaseController
-          before_action :load_invite_guest_by_token, only: :show
-          before_action :load_invite_guest, :assign_line_item_data, only: :update
-
-          def show
-            render_serialized_payload { serialize_resource(@invite_guest) }
-          end
-
-          def update
-            return render_error(:revoked) if @invite_guest.revoked?
-            return render_error(:closed) if @invite_guest.expired?
-            return render_error(:fully_claimed) if @invite_guest.fully_claimed?
-
-            guest = @line_item.guests.new(guest_params)
-            guest.event_id = @invite_guest.event_id
-
-            if guest.save
-              @invite_guest.update(claimed_status: :claimed) if @line_item.guests.count == @invite_guest.quantity
-              send_guest_claimed_invitation_telegram_alert_to_vendor(guest) if guest.event.vendor.preferred_telegram_chat_id.present?
-
-              render json: SpreeCmCommissioner::V2::Storefront::GuestSerializer.new(guest.reload).serializable_hash
-            else
-              render_error_payload(guest.errors.full_messages.to_sentence)
-            end
-          end
-
-          private
-
-          def send_guest_claimed_invitation_telegram_alert_to_vendor(guest)
-            title = '📣 --- [NEW GUEST CLAIMED INVITATION] ---' # Style/StringLiterals
-            chat_id = guest.event.vendor.preferred_telegram_chat_id
-            return if chat_id.blank?
-
-            factory = SpreeCmCommissioner::InviteGuestClaimedTelegramMessageFactory.new(
-              title: title,
-              order: @invite_guest.order,
-              guest: guest,
-              vendor: guest.event.vendor
-            )
-            SpreeCmCommissioner::TelegramNotificationSenderJob.perform_later(
-              chat_id: chat_id,
-              message: factory.message,
-              parse_mode: factory.parse_mode
-            )
-          end
-
-          def load_invite_guest_by_token
-            @invite_guest = SpreeCmCommissioner::InviteGuest.find_by(token: params[:id])
-          rescue ActiveRecord::RecordNotFound
-            render_error_payload(I18n.t('invite.url_not_found'))
-          end
-
-          def load_invite_guest
-            @invite_guest = SpreeCmCommissioner::InviteGuest.find(params[:id])
-          end
-
-          def assign_line_item_data
-            @line_item = @invite_guest.order.line_items.first
-            @guests = @line_item.guests
-          end
-
-          def render_error(message)
-            render json: { errors: message }
-          end
-
-          def guest_params
-            params.require(:invite_guest).permit(
-              :first_name,
-              :last_name,
-              :dob,
-              :gender,
-              :age,
-              :emergency_contact,
-              :phone_number,
-              :address,
-              :other_organization
-            )
-          end
-
-          def resource_serializer
-            ::Spree::V2::Organizer::InviteGuestSerializer
-          end
-        end
-      end
-    end
-  end
-end