spree_cm_commissioner 2.3.1.pre.pre2 → 2.3.2.pre.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26be0034848358f7b5de1d490862a398ed97a3078c8cf2fe57df4d7e6e3be5a9
-  data.tar.gz: 37a918ae7deb8ea489361e890effc51c8b8534ab469cc04594f37495688e4ace
+  metadata.gz: 4090589caa9f83b8b2020e1ed20383647e2671b87692bcecf57f2f455bee7a58
+  data.tar.gz: 8cd128d3b2764b6ba6b309c8e0c9b71108b7057ccdd4e03fe92ec4e9d8702d9a
 SHA512:
-  metadata.gz: 8d6a2ddde23786c4a5bbc639d386d6337f8de52ddabd8b7da9149718d1ee61d7cf5b87ba2d0bfc63cf87f88abf9789adfd80465993c16a34a46f476045c79e22
-  data.tar.gz: 6d06c0ea1b09c4e957d5b2c40bb6cdc5cc2eab7f2a93a5e61bd5efd45e559c9fb0f2a354c5221308432bdeb6fc43f4ab164ca9205e339a595bedd7d9b9b14145
+  metadata.gz: 692a3b8079e7f44d84556a826f8519ece6226334b28f78b194829f908f005902a4aaa34f18683aecbb161450197f3c808a82d84545fcc868975306ae45b396a5
+  data.tar.gz: e5e0191151979f1476f7ba43fe46ce13dd346c9d44d729d18da9fcff587004c21c7f028bc814356fa2c08a3a32dc867e3bd155ccc0f7659761ab7a9a6201b9b9

data/Gemfile.lock

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

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

@@ -4,12 +4,16 @@ module Spree
       module Storefront
         module IntercityTaxi
           class DraftOrdersController < ::Spree::Api::V2::ResourceController
+            include Spree::Api::V2::Storefront::OrderConcern
+            include SpreeCmCommissioner::OrderConcern
+
+            before_action :ensure_order, only: :update
             def create
               order = SpreeCmCommissioner::IntercityTaxiOrder::Create.call(
                 trip_id: params[:trip_id],
                 from_date: params[:from_date],
                 to_date: params[:to_date],
-                user_id: params[:user_id],
+                user: spree_current_user,
                 quantity: params[:quantity]
               )
 
@@ -20,7 +24,8 @@ module Spree
 
             def update
               order = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
-                params: params
+                order: spree_current_order,
+                order_params: intercity_taxi_update_order_params
               )
 
               render_serialized_payload { serialize_resource(order) }
@@ -28,6 +33,43 @@ module Spree
               render_error_payload(e.message)
             end
 
+            private
+
+            def intercity_taxi_update_order_params
+              params.require(:order).permit(
+                line_items_attributes: %i[
+                  id
+                  pickup_place_name
+                  drop_off_place_name
+                  from_date
+                  pickup_lat
+                  pickup_lng
+                  pickup_oob_confirmed
+                  drop_off_lat
+                  drop_off_lng
+                  drop_off_oob_confirmed
+                  distance_km
+                  ordered_points
+                  base_km
+                  detour_pickup_km
+                  detour_dropoff_km
+                  extra_pickup_km
+                  extra_dropoff_km
+                  estimated_time_minutes
+                  remark
+                  passenger_count
+                ]
+              )
+            end
+
+            def required_schema
+              if action_name == 'create'
+                SpreeCmCommissioner::IntercityTaxiDraftOrderSchema
+              else
+                SpreeCmCommissioner::IntercityTaxiDraftOrderUpdateSchema
+              end
+            end
+
             def resource_serializer
               SpreeCmCommissioner::V2::Storefront::IntercityTaxiCartSerializer
             end

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

@@ -4,13 +4,17 @@ module Spree
       module Tenant
         module IntercityTaxi
           class DraftOrdersController < BaseController
+            include Spree::Api::V2::Storefront::OrderConcern
+            include SpreeCmCommissioner::OrderConcern
+
+            before_action :ensure_order, only: :update
             def create
               order = SpreeCmCommissioner::IntercityTaxiOrder::Create.call(
                 trip_id: params[:trip_id],
                 from_date: params[:from_date],
                 to_date: params[:to_date],
-                user_id: params[:user_id],
-                quantity: params[:quantity]
+                quantity: params[:quantity],
+                user: spree_current_user
               )
 
               render_serialized_payload { serialize_resource(order) }
@@ -20,7 +24,8 @@ module Spree
 
             def update
               order = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
-                params: params
+                order: spree_current_order,
+                order_params: intercity_taxi_update_order_params
               )
 
               render_serialized_payload { serialize_resource(order) }
@@ -30,6 +35,41 @@ module Spree
 
             private
 
+            def intercity_taxi_update_order_params
+              params.require(:order).permit(
+                line_items_attributes: %i[
+                  id
+                  pickup_place_name
+                  drop_off_place_name
+                  from_date
+                  pickup_lat
+                  pickup_lng
+                  pickup_oob_confirmed
+                  drop_off_lat
+                  drop_off_lng
+                  drop_off_oob_confirmed
+                  distance_km
+                  ordered_points
+                  base_km
+                  detour_pickup_km
+                  detour_dropoff_km
+                  extra_pickup_km
+                  extra_dropoff_km
+                  estimated_time_minutes
+                  remark
+                  passenger_count
+                ]
+              )
+            end
+
+            def required_schema
+              if action_name == 'create'
+                SpreeCmCommissioner::IntercityTaxiDraftOrderSchema
+              else
+                SpreeCmCommissioner::IntercityTaxiDraftOrderUpdateSchema
+              end
+            end
+
             def resource_serializer
               SpreeCmCommissioner::V2::Storefront::IntercityTaxiCartSerializer
             end

data/app/request_schemas/spree_cm_commissioner/intercity_taxi_draft_order_schema.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  class IntercityTaxiDraftOrderSchema < ApplicationRequestSchema
+    params do
+      required(:trip_id).value(:integer)
+      required(:from_date).value(:date)
+      required(:to_date).value(:date)
+      required(:quantity).value(:integer)
+    end
+  end
+end

data/app/request_schemas/spree_cm_commissioner/intercity_taxi_draft_order_update_schema.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  class IntercityTaxiDraftOrderUpdateSchema < ApplicationRequestSchema
+    params do
+      required(:order).hash do
+        # Rails nested attributes send line_items_attributes as hash with numeric string keys (e.g., "0", "1")
+        required(:line_items_attributes).hash
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/intercity_taxi_order/create.rb

@@ -1,23 +1,23 @@
 module SpreeCmCommissioner
   module IntercityTaxiOrder
     class Create
-      attr_reader :trip_id, :from_date, :to_date, :user_id, :quantity
+      attr_reader :trip_id, :from_date, :to_date, :user, :quantity
 
-      def self.call(trip_id:, from_date:, to_date:, user_id: nil, quantity: 1)
+      def self.call(trip_id:, from_date:, to_date:, user: nil, quantity: 1)
         new(
           trip_id: trip_id,
           from_date: from_date,
           to_date: to_date,
-          user_id: user_id,
+          user: user,
           quantity: quantity
         ).call
       end
 
-      def initialize(trip_id:, from_date:, to_date:, user_id:, quantity:)
+      def initialize(trip_id:, from_date:, to_date:, user:, quantity:)
         @trip_id = trip_id
         @from_date = from_date
         @to_date = to_date
-        @user_id = user_id
+        @user = user
         @quantity = quantity.to_i <= 0 ? 1 : quantity.to_i
       end
 
@@ -29,7 +29,7 @@ module SpreeCmCommissioner
           variant = trip.product.variants.first
           raise ArgumentError, 'No variant found for trip' if variant.blank?
 
-          order = Spree::Order.new(state: 'cart', use_billing: true, user_id: user_id)
+          order = Spree::Order.new(state: 'cart', use_billing: true, user: user)
 
           line_item = order.line_items.new(
             variant_id: variant.id,

data/app/services/spree_cm_commissioner/intercity_taxi_order/update.rb

@@ -1,69 +1,22 @@
 module SpreeCmCommissioner
   module IntercityTaxiOrder
     class Update
-      attr_reader :params
+      attr_reader :order, :order_params
 
-      def self.call(params:)
-        new(params: params).call
+      def self.call(order:, order_params:)
+        new(order: order, order_params: order_params).call
       end
 
-      def initialize(params:)
-        @params = ensure_parameters(params)
+      def initialize(order:, order_params:)
+        @order = order
+        @order_params = order_params
       end
 
       def call
-        order = find_order!
         order.update!(order_params)
 
         order
       end
-
-      private
-
-      def ensure_parameters(params)
-        return params if params.is_a?(::ActionController::Parameters)
-
-        ::ActionController::Parameters.new(params)
-      end
-
-      def find_order!
-        raise(ArgumentError, 'Order token is required') if order_token.blank?
-
-        Spree::Order.find_by!(token: order_token)
-      end
-
-      def order_token
-        params[:order_token]
-      end
-
-      def order_params
-        params.require(:order).permit(
-          line_items_attributes: %i[
-            id
-            pickup_place_name
-            drop_off_place_name
-            from_date
-            pickup_lat
-            pickup_lng
-            pickup_oob_confirmed
-            drop_off_lat
-            drop_off_lng
-            drop_off_oob_confirmed
-            distance_km
-            ordered_points
-            base_km
-            detour_pickup_km
-            detour_dropoff_km
-            extra_pickup_km
-            extra_dropoff_km
-            extra_pickup_charge_usd
-            extra_dropoff_charge_usd
-            estimated_time_minutes
-            remark
-            passenger_count
-          ]
-        )
-      end
     end
   end
 end

data/config/routes.rb

@@ -701,7 +701,11 @@ Spree::Core::Engine.add_routes do
           resources :draft_orders, only: %i[create]
         end
         namespace :intercity_taxi do
-          resources :draft_orders, only: %i[create update]
+          resources :draft_orders, only: [:create] do
+            collection do
+              patch :update
+            end
+          end
         end
       end
 

data/lib/spree_cm_commissioner/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.3.1.pre.pre2
+  version: 2.3.2.pre.pre2
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-27 00:00:00.000000000 Z
+date: 2025-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1753,6 +1753,8 @@ files:
 - app/queries/spree_cm_commissioner/users_by_event_fetcher_query.rb
 - app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/application_request_schema.rb
+- app/request_schemas/spree_cm_commissioner/intercity_taxi_draft_order_schema.rb
+- app/request_schemas/spree_cm_commissioner/intercity_taxi_draft_order_update_schema.rb
 - app/request_schemas/spree_cm_commissioner/inventory_item_schema.rb
 - app/request_schemas/spree_cm_commissioner/profile_image_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/seat_layout_schema.rb