spree_cm_commissioner 2.5.1.pre.pre1 → 2.5.1.pre.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 161198a81f4cf2dff359256d58c277e0c493602378c854a7e8c937803b1c32fa
-  data.tar.gz: 71c19403432925ce94cdde05447d7f64766a7f7dec3a6e6637c06fd4e0e83990
+  metadata.gz: 20effeac142fface8df473f26f1a62707092ee81066953512b51f0a021657fa0
+  data.tar.gz: 82ffb806998821e0432c86aaabbe664b87d076453419926c392935e55b11d517
 SHA512:
-  metadata.gz: dab6644c7af312064a7bb5779306048b3b8984cc33caa50e369d4a5a63ee4ce6bce0534435096cfaebabcae924a3eca7c14ab47fae728059c2700092e6a1e5e8
-  data.tar.gz: 5e15d12cfa4f27ff55bd03f0d415d2862839d6f0fac91d3e9c233f2bb3af18d60819b20d6ae776d31115f437c71c7ae3029c306e1d58a9ae5268004b9f4d162d
+  metadata.gz: 944769159e8f13b6be0cfb8fda0929fb2ef5c19716c882aa7cfa0a16847820e19657e52cc50f831995c85a24299cb73f6d346a82f08483f702461f20f81199ea
+  data.tar.gz: fd28f9f3960e2bd0967e42d91f0434165f383fedf3c0e330fd812cce1a2ccea2921e1f07e380bbf8bd426a2e18adb5732974322b2083f2578b160cb57bd480f1

data/Gemfile.lock

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

data/app/controllers/spree/admin/guests_controller.rb

@@ -47,8 +47,8 @@ module Spree
       end
 
       def check_in
-        result = SpreeCmCommissioner::CheckInBulkCreator.call(
-          check_ins_attributes: [{ guest_id: @guest.id }],
+        result = SpreeCmCommissioner::CheckIns::CreateBulk.call(
+          check_ins_attributes: [{ guest_id: @guest.id, check_in_session_id: params[:check_in_session_id] }],
           check_in_by: spree_current_user
         )
 
@@ -62,15 +62,15 @@ module Spree
       end
 
       def uncheck_in
-        result = SpreeCmCommissioner::CheckInDestroyer.call(
-          guest_ids: [@guest.id],
+        result = SpreeCmCommissioner::CheckIns::DestroyBulk.call(
+          check_ins_attributes: [{ guest_id: @guest.id, check_in_session_id: params[:check_in_session_id] }],
           destroyed_by: spree_current_user
         )
 
         if result.success?
           flash[:success] = "Guest #{@guest.full_name} has been unchecked."
         else
-          flash[:error] = result.message.to_s.titleize
+          flash[:error] = result.error.to_s
         end
 
         redirect_to collection_url

data/app/controllers/spree/api/chatrace/check_ins_controller.rb

@@ -7,12 +7,14 @@ module Spree
         end
 
         def create
-          context = SpreeCmCommissioner::CheckInBulkCreator.call(check_ins_attributes: [{ guest_id: guest.id }])
+          result = SpreeCmCommissioner::CheckIns::CreateBulk.call(
+            check_ins_attributes: [{ guest_id: guest.id, check_in_session_id: params[:check_in_session_id] }]
+          )
 
-          if context.success?
-            render json: { checked_in_at: context.check_ins[0].confirmed_at }, status: :ok
+          if result.success?
+            render json: { checked_in_at: result.value[:check_ins][0].confirmed_at }, status: :ok
           else
-            render_error_payload(context.message)
+            render_error_payload(result.error)
           end
         end
       end

data/app/controllers/spree/api/chatrace/guests_controller.rb

@@ -31,17 +31,11 @@ module Spree
           guest.guest_dynamic_fields
                .includes(:dynamic_field)
                .to_h do |gdf|
-            label = gdf.dynamic_field.label.to_s.strip
-            key =
-              if label.ascii_only?
-                label.parameterize(separator: '_')
-              else
-                label
-              end
+            key = gdf.dynamic_field.label
+                     .parameterize
+                     .underscore
 
-            value = gdf.value.strip
-
-            [key, value]
+            [key, gdf.value]
           end
         end
 
@@ -55,13 +49,6 @@ module Spree
             dob: guest.dob,
             gender: guest.gender,
             age: guest.age,
-            nationality_id: guest.nationality_id,
-            emergency_contact: guest.emergency_contact,
-            guest_phone_number: guest.phone_number,
-            guest_contact: guest.contact,
-            guest_social_contact: guest.social_contact,
-            address: guest.address,
-            guest_id_card: guest.id_card,
             occupation: guest.occupation&.name || guest.other_occupation,
             entry_type: guest.entry_type,
             organization: guest.other_organization,
@@ -73,7 +60,7 @@ module Spree
             order_first_name: order.customer_address&.firstname,
             order_last_name: order.customer_address&.lastname,
             order_phone_number: order.intel_phone_number || order.customer_address&.phone,
-            checked_in_at: guest.check_in&.confirmed_at,
+            checked_in_at: guest.earliest_check_in&.created_at,
             qr_data: guest.qr_data,
             order_qr_data: order.qr_data,
             country_code: guest.country_code,

data/app/controllers/spree/api/v2/operator/check_in_bulks_controller.rb

@@ -13,22 +13,22 @@ module Spree
             if params[:check_ins].present?
               check_ins = process_check_ins(params[:check_ins])
             elsif params[:guest_ids].present?
-              check_ins = params[:guest_ids].map { |guest_id| { guest_id: guest_id } }
+              check_ins = params[:guest_ids].map { |guest_id| { guest_id: guest_id, check_in_session_id: params[:check_in_session_id] } }
             end
 
-            context = SpreeCmCommissioner::CheckInBulkCreator.call(
+            result = SpreeCmCommissioner::CheckIns::CreateBulk.call(
               check_ins_attributes: check_ins,
               check_in_by: spree_current_user
             )
 
-            if context.success?
+            if result.success?
               render_serialized_payload(201) do
                 collection_serializer.new(
-                  context.check_ins, { include: resource_includes }
+                  result.value[:check_ins], { include: resource_includes }
                 ).serializable_hash
               end
             else
-              render_error_payload(context.message)
+              render_error_payload(result.error)
             end
           end
 
@@ -39,6 +39,7 @@ module Spree
               check_in.permit(
                 :guest_id,
                 :confirmed_at,
+                :check_in_session_id,
                 guest_attributes: %i[
                   first_name
                   last_name

data/app/controllers/spree/api/v2/operator/check_in_sessions_controller.rb

@@ -0,0 +1,32 @@
+module Spree
+  module Api
+    module V2
+      module Operator
+        class CheckInSessionsController < ::Spree::Api::V2::ResourceController
+          before_action :require_spree_current_user, only: %i[index]
+          before_action :load_event, only: %i[index]
+
+          def collection
+            @collection ||= @event.active_check_in_sessions
+          end
+
+          def load_event
+            @event = Spree::Taxon.find(params[:event_id])
+          end
+
+          def model_class
+            SpreeCmCommissioner::CheckInSession
+          end
+
+          def resource_serializer
+            SpreeCmCommissioner::V2::Operator::CheckInSessionSerializer
+          end
+
+          def collection_serializer
+            SpreeCmCommissioner::V2::Operator::CheckInSessionSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/operator/check_ins_controller.rb

@@ -14,15 +14,15 @@ module Spree
           def create
             spree_authorize! :create, model_class
 
-            context = SpreeCmCommissioner::CheckInBulkCreator.call(
-              check_ins_attributes: [{ guest_id: params[:guest_id] }],
+            result = SpreeCmCommissioner::CheckIns::CreateBulk.call(
+              check_ins_attributes: [{ guest_id: params[:guest_id], check_in_session_id: params[:check_in_session_id] }],
               check_in_by: spree_current_user
             )
 
-            if context.success?
-              render_serialized_payload(201) { serialize_resource(context.check_ins[0]) }
+            if result.success?
+              render_serialized_payload(201) { serialize_resource(result.value[:check_ins][0]) }
             else
-              render_error_payload(context.message)
+              render_error_payload(result.error)
             end
           end
 

data/app/controllers/spree/api/v2/operator/event_qrs_controller.rb

@@ -10,6 +10,7 @@ module Spree
             context = SpreeCmCommissioner::EventQrGenerator.call(
               operator: spree_current_user,
               event: @event,
+              check_in_session: @check_in_session,
               expired_in_mn: params[:expired_in_mn]&.to_i || 5
             )
 
@@ -20,6 +21,7 @@ module Spree
 
           def load_event
             @event = Spree::Taxon.find(params[:id])
+            @check_in_session = (@event.check_in_sessions.find(params[:check_in_session_id]) if params[:check_in_session_id].present?)
           end
 
           # override

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

@@ -31,7 +31,7 @@ module Spree
 
           # override
           def collection_finder
-            SpreeCmCommissioner::Routes::FindPopular
+            SpreeCmCommissioner::RouteMetrics::FindPopular
           end
 
           # override

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

@@ -26,24 +26,24 @@ module Spree
               return
             end
 
-            context = create_check_in_records(params[:guest_ids])
+            result = create_check_in_records(params[:guest_ids], params[:check_in_session_id])
 
-            if context.success?
+            if result.success?
               render_serialized_payload(201) do
                 collection_serializer.new(
-                  context.check_ins, { include: resource_includes }
+                  result.value[:check_ins], { include: resource_includes }
                 ).serializable_hash
               end
             else
-              render_error_payload(context.message)
+              render_error_payload(result.error)
             end
           end
 
           private
 
-          def create_check_in_records(guest_ids)
-            SpreeCmCommissioner::CheckInBulkCreator.call(
-              check_ins_attributes: guest_ids.map { |guest_id| { guest_id: guest_id } },
+          def create_check_in_records(guest_ids, check_in_session_id)
+            SpreeCmCommissioner::CheckIns::CreateBulk.call(
+              check_ins_attributes: guest_ids.map { |guest_id| { guest_id: guest_id, check_in_session_id: check_in_session_id } },
               check_in_by: @operator
             )
           end

data/app/controllers/spree/api/v2/storefront/transit/draft_orders_controller.rb

@@ -15,7 +15,7 @@ module Spree
               @outbound_legs = params[:outbound_legs].is_a?(Array) && params[:outbound_legs].any? ? build_legs(:outbound, params[:outbound_legs]) : []
               @inbound_legs  = params[:inbound_legs].is_a?(Array) && params[:inbound_legs].any? ? build_legs(:inbound, params[:inbound_legs]) : []
 
-              context = SpreeCmCommissioner::Transit::DraftOrderCreator.call(
+              result = SpreeCmCommissioner::TransitOrder::Create.call(
                 outbound_date: params[:outbound_date]&.to_date,
                 inbound_date: params[:inbound_date]&.to_date,
                 outbound_legs: @outbound_legs,
@@ -23,10 +23,10 @@ module Spree
                 user: spree_current_user
               )
 
-              if context.success?
-                render_serialized_payload { serialize_resource(context.order) }
+              if result.success?
+                render_serialized_payload { serialize_resource(result.value[:order]) }
               else
-                render_error_payload(context.message)
+                render_error_payload(result.error)
               end
             end
 

data/app/controllers/spree/api/v2/tenant/popular_route_places_controller.rb

@@ -0,0 +1,60 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class PopularRoutePlacesController < BaseController
+          private
+
+          # override
+          def collection
+            @collection ||= collection_finder.new(
+              tenant: @tenant,
+              route_type: params[:route_type]
+            ).execute
+          end
+
+          # override
+          def default_resource_includes
+            %w[origin_place destination_place]
+          end
+
+          # override
+          def collection_finder
+            SpreeCmCommissioner::Routes::FindPopular
+          end
+
+          # override
+          def collection_serializer
+            resource_serializer
+          end
+
+          # override
+          def resource_serializer
+            SpreeCmCommissioner::V2::Storefront::RouteSerializer
+          end
+
+          # override
+          def serializer_params
+            super.merge(
+              include_vendors: include_vendors?,
+              include_nearby_places: include_nearby_places?
+            )
+          end
+
+          # override
+          def required_schema
+            SpreeCmCommissioner::PopularRoutePlacesRequestSchema
+          end
+
+          def include_vendors?
+            resource_includes.include?(:vendors) || false
+          end
+
+          def include_nearby_places?
+            resource_includes.include?(:nearby_places) || false
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/routes_controller.rb

@@ -0,0 +1,50 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class RoutesController < BaseController
+          private
+
+          # override
+          def collection
+            @collection ||= collection_finder.new(
+              tenant: @tenant,
+              params: params
+            ).execute
+          end
+
+          # override
+          def collection_finder
+            SpreeCmCommissioner::Routes::Find
+          end
+
+          # override
+          def collection_serializer
+            SpreeCmCommissioner::V2::Storefront::RouteSerializer
+          end
+
+          # override
+          def serializer_params
+            super.merge(
+              include_vendors: include_vendors?,
+              include_nearby_places: include_nearby_places?
+            )
+          end
+
+          # override
+          def required_schema
+            SpreeCmCommissioner::PopularRoutePlacesRequestSchema
+          end
+
+          def include_vendors?
+            resource_includes.include?(:vendors) || false
+          end
+
+          def include_nearby_places?
+            resource_includes.include?(:nearby_places) || false
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/transit/draft_orders_controller.rb

@@ -0,0 +1,46 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        module Transit
+          class DraftOrdersController < BaseController
+            # Creates a draft transit order for tenant.
+            # Endpoint: POST /api/v2/tenant/transit/draft_orders
+            # Params:
+            # - outbound_date: Date of outbound transit (optional)
+            # - inbound_date: Date of inbound transit (optional)
+            # - outbound_legs: Array of outbound leg details (required)
+            # - inbound_legs: Array of inbound leg details (optional)
+            def create
+              @outbound_legs = params[:outbound_legs].is_a?(Array) && params[:outbound_legs].any? ? build_legs(:outbound, params[:outbound_legs]) : []
+              @inbound_legs  = params[:inbound_legs].is_a?(Array) && params[:inbound_legs].any? ? build_legs(:inbound, params[:inbound_legs]) : []
+
+              result = SpreeCmCommissioner::TransitOrder::Create.call(
+                outbound_date: params[:outbound_date]&.to_date,
+                inbound_date: params[:inbound_date]&.to_date,
+                outbound_legs: @outbound_legs,
+                inbound_legs: @inbound_legs,
+                user: spree_current_user
+              )
+
+              if result.success?
+                render_serialized_payload { serialize_resource(result.value[:order]) }
+              else
+                render_error_payload(result.error)
+              end
+            end
+
+            def build_legs(direction, legs_params)
+              SpreeCmCommissioner::Transit::LegsBuilderService.new(direction: direction, legs_params: legs_params).call
+            end
+
+            # override
+            def resource_serializer
+              Spree::V2::Tenant::TransitCartSerializer
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/events/guests_controller.rb

@@ -15,38 +15,37 @@ module Spree
 
       def check_in
         guest_ids = [params[:id]]
-        context = SpreeCmCommissioner::CheckInBulkCreator.call(
-          check_ins_attributes: guest_ids.map { |guest_id| { guest_id: guest_id } },
+        result = SpreeCmCommissioner::CheckIns::CreateBulk.call(
+          check_ins_attributes: guest_ids.map { |guest_id| { guest_id: guest_id, check_in_session_id: params[:check_in_session_id] } },
           check_in_by: spree_current_user
         )
 
-        if context.success?
+        if result.success?
           flash[:success] = Spree.t('event.check_in.success')
         else
-          flash[:error] = context.message.to_s.titleize
+          flash[:error] = result.error.to_s
         end
 
         redirect_to edit_object_url
       end
 
       def uncheck_in
-        guest_ids = [params[:id]]
-        context = SpreeCmCommissioner::CheckInDestroyer.call(
-          guest_ids: guest_ids,
+        result = SpreeCmCommissioner::CheckIns::DestroyBulk.call(
+          check_ins_attributes: [{ guest_id: params[:id], check_in_session_id: params[:check_in_session_id] }],
           destroyed_by: spree_current_user
         )
 
-        if context.success?
+        if result.success?
           flash[:success] = Spree.t('event.uncheck_in.success')
         else
-          flash[:error] = context.message.to_s.titleize
+          flash[:error] = result.error.to_s
         end
 
         redirect_to edit_object_url
       end
 
       def edit
-        @check_in = @guest.check_in
+        @check_in = @guest.earliest_check_in
       end
 
       def edit_object_url

data/app/controllers/spree/transit/trips_controller.rb

@@ -48,13 +48,13 @@ module Spree
         boarding_points_attributes = (cm_params.delete('boarding_points') || []).compact_blank
                                                                                 .map do |point_id|
           trip_stop = trip_stops.delete(point_id.to_i)
-          { stop_id: point_id, stop_type: 'boarding', id: trip_stop.try(:id) }
+          { stop_id: point_id, allow_boarding: true, id: trip_stop.try(:id) }
         end
 
         drop_off_points_attributes = (cm_params.delete('drop_off_points') || []).compact_blank
                                                                                 .map do |point_id|
           trip_stop = trip_stops.delete(point_id.to_i)
-          { stop_id: point_id, stop_type: 'drop_off', id: trip_stop.try(:id) }
+          { stop_id: point_id, allow_drop_off: true, id: trip_stop.try(:id) }
         end
 
         trip_stops.each_value do |trip_stop|
@@ -74,7 +74,7 @@ module Spree
           :origin_id, :destination_id, :vehicle_id, :hours, :minutes, :seconds,
           'departure_time(1i)', 'departure_time(2i)', 'departure_time(3i)',
           'departure_time(4i)', 'departure_time(5i)', :product_id,
-          trip_stops_attributes: %i[stop_id stop_type _destroy id]
+          trip_stops_attributes: %i[stop_id allow_boarding allow_drop_off _destroy id]
         )
       end
 

data/app/finders/spree_cm_commissioner/places/find_with_route.rb

@@ -1,20 +1,20 @@
-# Finds places connected via routes with optional filtering.
+# Finds places connected via route metrics with optional filtering.
 #
 # @param place_type [String] Required. 'origin' or 'destination'
 # @param place_id [Integer] Optional. Filter by connected place ID
 # @param query [String] Optional. Filter by place name (case-insensitive)
-# @param route_type [Symbol, String] Optional. Filter by route type from associated trips (e.g., :ferry, :bus)
+# @param route_type [Symbol, String] Optional. Filter by route type from route metrics (e.g., :ferry, :bus)
 #
 # @return [ActiveRecord::Relation<SpreeCmCommissioner::Place>]
 #
 # Modes:
 #   - place_id only: returns connected places (origins TO or destinations FROM given place)
 #   - query only: filters by name
-#   - route_type only: filters by trip route types on those routes
+#   - route_type only: filters by route type on route metrics
 #   - combinations: connected places filtered by name and/or route type
-#   - neither: all origins/destinations in routes
+#   - neither: all origins/destinations in route metrics
 #
-# @example Origins with ferry trips to place 123
+# @example Origins with ferry route metrics to place 123
 #   FindWithRoute.new(place_type: 'origin', place_id: 123, route_type: :ferry).execute
 #
 # @example Destinations filtered by query and route type
@@ -46,14 +46,14 @@ module SpreeCmCommissioner
       def scope
         return SpreeCmCommissioner::Place.none unless valid_place_type?
 
-        base_scope = origin? ? SpreeCmCommissioner::Place.with_routes_as_origin : SpreeCmCommissioner::Place.with_routes_as_destination
+        base_scope = origin? ? SpreeCmCommissioner::Place.with_route_metrics_as_origin : SpreeCmCommissioner::Place.with_route_metrics_as_destination
 
         return base_scope if place_id.blank?
 
         if origin?
-          base_scope.where(routes_as_origin: { destination_place_id: place_id })
+          base_scope.where(route_metrics_as_origin: { destination_place_id: place_id })
         else
-          base_scope.where(routes_as_destination: { origin_place_id: place_id })
+          base_scope.where(route_metrics_as_destination: { origin_place_id: place_id })
         end
       end
 
@@ -62,10 +62,10 @@ module SpreeCmCommissioner
       end
 
       def apply_route_type_filter(result)
-        trips_association = origin? ? :trips_as_origin : :trips_as_destination
-        result.joins(trips_association)
-              .where(cm_trips: { route_type: route_type.to_sym })
-              .distinct
+        # Use the association name as the table alias in the WHERE clause
+        # This works whether the association is already joined or not
+        association_name = origin? ? :route_metrics_as_origin : :route_metrics_as_destination
+        result.where(association_name => { route_type: route_type.to_sym })
       end
 
       def origin?

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

@@ -0,0 +1,44 @@
+# Finds route metrics ordered by popularity based on order metrics.
+#
+# Route metrics 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 (e.g., :ferry, :bus)
+#
+# @return [ActiveRecord::Relation<SpreeCmCommissioner::RouteMetric>] Route metrics with origin and destination places loaded,
+#   ordered from most to least popular
+#
+# @example Get all popular route metrics
+#   finder = SpreeCmCommissioner::RouteMetrics::FindPopular.new
+#   finder.execute # => Returns all route metrics sorted by fulfillment and order counts
+#
+# @example Get popular ferry route metrics
+#   finder = SpreeCmCommissioner::RouteMetrics::FindPopular.new
+#   finder.execute(route_type: :ferry) # => Returns ferry route metrics sorted by popularity
+#
+# @example Get popular bus route metrics
+#   finder = SpreeCmCommissioner::RouteMetrics::FindPopular.new
+#   finder.execute(route_type: :bus) # => Returns bus route metrics sorted by popularity
+
+module SpreeCmCommissioner
+  module RouteMetrics
+    class FindPopular
+      def execute(route_type: nil, query: nil)
+        scope(route_type: route_type, query: query)
+      end
+
+      private
+
+      def scope(route_type:, query:)
+        result = SpreeCmCommissioner::RouteMetric.all
+
+        result = result.where(route_type: route_type.to_sym) if route_type.present?
+        result = result.where('cm_route_metrics.route_name ILIKE ?', "%#{query}%") if query.present?
+
+        result.includes(:origin_place, :destination_place)
+              .order(fulfilled_order_count: :desc, order_count: :desc)
+      end
+    end
+  end
+end