spree_cm_commissioner 2.3.1.pre.pre1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7791d1c6474375315937bc020c5bb5274abecbddc5e9b9f5df5a73e53576d626
-  data.tar.gz: 03c0f3ccc698d12697c135f4daaab5718b1a72117288de9270069397660d62a5
+  metadata.gz: f69009264c3f351003ddd4885f403db68bc0a589a9e28123188a26bdd382b3d6
+  data.tar.gz: fea37b83621c4eb39ee2936ae4d72c377ee6d0767fb240be01c2de82e63d4c83
 SHA512:
-  metadata.gz: 5cb82c98aac134ebedbdb29c1daf2cc22035ac4e5856c548b22015ffb9a574e6873e897407b8043d899164a9a1ffa941ec04fc25df2263e255e5fd1ad362531c
-  data.tar.gz: 4ff0e66a420d2e7f589f2c63d55ca18acc0065aa015033b3917a5dbf603440df4f8a56a32834a02135f5e216a2e5f7d82e8e78f5c6d1df571dc7b261ddb90a79
+  metadata.gz: 8530a8855d325ffae9223d3ed705be0f445bd5ce01c2479ef809f783804af5d4b90cd716a5c10076cbad561f6d57c03becf4d8ccb2e7e33bd57144c29bd1ff5e
+  data.tar.gz: 9d2bada64c5ac4701bb9f18d233e8948e0e8b6b9cf6fd0e923157007bd06cde7ef79b13ffa0476aad2a3ec955a268e66249b3f49097fce93136a61dfa0856f4f

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.3.1.pre.pre1)
+    spree_cm_commissioner (2.3.2)
       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

@@ -20,6 +20,7 @@ module Spree
 
             def update
               order = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
+                order_number: params[:id],
                 params: params
               )
 

data/app/models/spree_cm_commissioner/vendor_place.rb

@@ -3,7 +3,6 @@ module SpreeCmCommissioner
     enum place_type: { venue: 0, branch: 1, stop: 2, location: 3 }
     acts_as_list scope: :vendor
 
-    belongs_to :tenant, class_name: 'SpreeCmCommissioner::Tenant', optional: true
     belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
     belongs_to :place, class_name: 'SpreeCmCommissioner::Place', optional: false
     belongs_to :location, class_name: 'SpreeCmCommissioner::VendorPlace', optional: true
@@ -17,8 +16,6 @@ module SpreeCmCommissioner
 
     accepts_nested_attributes_for :place, allow_destroy: true
 
-    before_save :set_tenant_id
-
     # include place when using these delegate to avoid N+1
     def display_name
       place&.name
@@ -31,11 +28,5 @@ module SpreeCmCommissioner
     def selected
       vendor.selected_place_references.include?(place&.reference)
     end
-
-    private
-
-    def set_tenant_id
-      self.tenant_id = vendor&.tenant_id
-    end
   end
 end

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -1,13 +1,12 @@
 module SpreeCmCommissioner
   class TripQuery
-    attr_reader :origin_id, :destination_id, :date, :vendor_id, :tenant_id, :number_of_guests, :route_type, :params
+    attr_reader :origin_id, :destination_id, :date, :vendor_id, :number_of_guests, :route_type, :params
 
-    def initialize(origin_id:, destination_id:, date:, route_type: nil, vendor_id: nil, tenant_id: nil, number_of_guests: nil, params: {}) # rubocop:disable Metrics/ParameterLists
+    def initialize(origin_id:, destination_id:, date:, route_type: nil, vendor_id: nil, number_of_guests: nil, params: {}) # rubocop:disable Metrics/ParameterLists
       @origin_id = origin_id
       @destination_id = destination_id
       @date = date.to_date == Time.zone.now.to_date ? Time.zone.now : Time.zone.parse(date.to_s)
       @vendor_id = vendor_id
-      @tenant_id = tenant_id
       @number_of_guests = number_of_guests || 1
       @route_type = route_type
       @params = params
@@ -37,9 +36,8 @@ module SpreeCmCommissioner
 
     def direct_trips
       result = trip_scope
-      result = result.where({ vendor_id: vendor_id }.compact) if vendor_id.present?
+      result = result.where({ vendor_id: vendor_id }.compact)
       result = result.where(route_type: route_type) if route_type.present?
-      result = result.where(spree_vendors: { tenant_id: tenant_id }) if tenant_id.present?
       paginate(result)
     end
 
@@ -58,24 +56,20 @@ module SpreeCmCommissioner
     private
 
     def trip_scope
-      scope = SpreeCmCommissioner::Trip
-              .select(<<~SQL.squish)
-                cm_trips.*,
-                boarding.departure_time AS boarding_departure_time,
-                boarding.stop_place_id AS boarding_stop_id, boarding.stop_name AS boarding_stop_name,
-                drop_off.stop_name AS drop_off_stop_name, drop_off.stop_place_id AS drop_off_stop_id,
-                drop_off.arrival_time AS drop_off_arrival_time,
-                COALESCE(iv.quantity_available, 0) AS quantity_available,
-                COALESCE(iv.max_capacity, 0) AS max_capacity,
-                origin_places.name AS origin_place_name, dest_places.name AS destination_place_name,
-                prices.amount AS amount, prices.compare_at_amount AS compare_at_amount,
-                prices.currency AS currency
-              SQL
-              .includes(vendor: :logo, vehicle: :option_values)
-
-      scope = scope.joins(:vendor) if tenant_id.present?
-
-      scope
+      SpreeCmCommissioner::Trip
+        .select(<<~SQL.squish)
+          cm_trips.*,
+          boarding.departure_time AS boarding_departure_time,
+          boarding.stop_place_id AS boarding_stop_id, boarding.stop_name AS boarding_stop_name,
+          drop_off.stop_name AS drop_off_stop_name, drop_off.stop_place_id AS drop_off_stop_id,
+          drop_off.arrival_time AS drop_off_arrival_time,
+          COALESCE(iv.quantity_available, 0) AS quantity_available,
+          COALESCE(iv.max_capacity, 0) AS max_capacity,
+          origin_places.name AS origin_place_name, dest_places.name AS destination_place_name,
+          prices.amount AS amount, prices.compare_at_amount AS compare_at_amount,
+          prices.currency AS currency
+        SQL
+        .includes(vendor: :logo, vehicle: :option_values)
         .joins(<<~SQL.squish)
           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

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

@@ -42,7 +42,6 @@ module SpreeCmCommissioner
           )
 
           build_guests_for!(line_item, quantity)
-          assign_saved_guests_to_line_item(line_item)
 
           order.save!
           order.update_with_updater!
@@ -63,13 +62,6 @@ module SpreeCmCommissioner
       def build_guests_for!(line_item, qty)
         Array.new(qty) { line_item.guests.new }
       end
-
-      def assign_saved_guests_to_line_item(line_item)
-        line_item.guests.each do |guest|
-          saved_guest = SpreeCmCommissioner::SavedGuest.new
-          guest.saved_guest = saved_guest
-        end
-      end
     end
   end
 end

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

@@ -1,20 +1,23 @@
 module SpreeCmCommissioner
   module IntercityTaxiOrder
     class Update
-      attr_reader :params
+      attr_reader :order_number, :params
 
-      def self.call(params:)
-        new(params: params).call
+      def self.call(order_number:, params:)
+        new(order_number: order_number, params: params).call
       end
 
-      def initialize(params:)
+      def initialize(order_number:, params:)
+        @order_number = order_number
         @params = ensure_parameters(params)
       end
 
       def call
-        order = find_order!
+        order = Spree::Order.find_by!(number: order_number)
         order.update!(order_params)
 
+        create_billing_address_if_missing(order)
+
         order
       end
 
@@ -26,41 +29,48 @@ module SpreeCmCommissioner
         ::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 create_billing_address_if_missing(order)
+        return if order.bill_address.present?
 
-      def order_token
-        params[:order_token]
+        SpreeCmCommissioner::BillingAddressCreator.call(order: order)
       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
+          :intel_phone_number,
+          :email,
+          line_items_attributes: [
+            :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,
+            { guests_attributes: %i[
+              id
+              first_name
+              last_name
+              gender
+              nationality_id
+              age
+            ]
+            }
           ]
         )
       end

data/config/routes.rb

@@ -550,18 +550,6 @@ Spree::Core::Engine.add_routes do
         resources :guest_card_classes
         resources :tickets, only: :index
 
-        resources :trip_places, only: :index
-        resources :trip_search, only: [:index]
-        resources :trips, only: %i[show]
-
-        namespace :intercity_taxi do
-          resources :draft_orders, only: [:create] do
-            collection do
-              patch :update
-            end
-          end
-        end
-
         resource :reset_passwords, only: [:update]
         resource :change_passwords, only: [:update]
         resource :user_contacts, only: [:update]

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.3.1.pre.pre1'.freeze
+  VERSION = '2.3.2'.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.pre1
+  version: 2.3.2
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-25 00:00:00.000000000 Z
+date: 2025-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1013,7 +1013,6 @@ files:
 - app/controllers/spree/api/v2/tenant/guests_controller.rb
 - app/controllers/spree/api/v2/tenant/homepage_sections_controller.rb
 - app/controllers/spree/api/v2/tenant/id_cards_controller.rb
-- app/controllers/spree/api/v2/tenant/intercity_taxi/draft_orders_controller.rb
 - app/controllers/spree/api/v2/tenant/line_items_controller.rb
 - app/controllers/spree/api/v2/tenant/notifications_controller.rb
 - app/controllers/spree/api/v2/tenant/order_histories_controller.rb
@@ -1026,9 +1025,6 @@ files:
 - app/controllers/spree/api/v2/tenant/s3_signed_urls_controller.rb
 - app/controllers/spree/api/v2/tenant/taxons_controller.rb
 - app/controllers/spree/api/v2/tenant/tickets_controller.rb
-- app/controllers/spree/api/v2/tenant/trip_places_controller.rb
-- app/controllers/spree/api/v2/tenant/trip_search_controller.rb
-- app/controllers/spree/api/v2/tenant/trips_controller.rb
 - app/controllers/spree/api/v2/tenant/user_account_linkages_controller.rb
 - app/controllers/spree/api/v2/tenant/user_contacts_controller.rb
 - app/controllers/spree/api/v2/tenant/user_device_tokens_controller.rb
@@ -2856,7 +2852,6 @@ files:
 - db/migrate/20251009073040_add_lock_version_to_cm_routes.rb
 - db/migrate/20251009073929_add_lock_version_to_cm_vendor_routes.rb
 - db/migrate/20251113081853_add_index_to_spree_orders_updated_at.rb
-- db/migrate/20251119093000_add_tenant_id_to_cm_vendor_places.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md
@@ -3021,9 +3016,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubygems_version: 3.4.1

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

@@ -1,41 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Tenant
-        module IntercityTaxi
-          class DraftOrdersController < BaseController
-            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]
-              )
-
-              render_serialized_payload { serialize_resource(order) }
-            rescue StandardError => e
-              render_error_payload(e.message)
-            end
-
-            def update
-              order = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
-                params: params
-              )
-
-              render_serialized_payload { serialize_resource(order) }
-            rescue StandardError => e
-              render_error_payload(e.message)
-            end
-
-            private
-
-            def resource_serializer
-              SpreeCmCommissioner::V2::Storefront::IntercityTaxiCartSerializer
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,48 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Tenant
-        class TripPlacesController < BaseController
-          def index
-            render_serialized_payload do
-              serialize_collection(paginated_collection)
-            end
-          end
-
-          private
-
-          def paginated_collection
-            collection.page(params[:page]).per(params[:per_page])
-          end
-
-          def collection
-            @collection ||= begin
-              base_scope = scope
-
-              if params[:q].present?
-                @search = base_scope.ransack(params[:q])
-                @search.result
-              else
-                base_scope
-              end
-            end
-          end
-
-          def scope
-            model_class.joins(:location_vendor_places)
-                       .where(location_vendor_places: { tenant_id: @tenant.id })
-                       .distinct
-          end
-
-          def model_class
-            SpreeCmCommissioner::Place
-          end
-
-          def collection_serializer
-            SpreeCmCommissioner::V2::Storefront::TripPlaceSerializer
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,103 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Tenant
-        class TripSearchController < BaseController
-          CACHE_EXPIRES_IN = 5.minutes
-
-          def index
-            render_serialized_payload do
-              Rails.cache.fetch(collection_cache_key, collection_cache_opts) do
-                trips = SpreeCmCommissioner::TripQuery.new(
-                  origin_id: params[:origin_id],
-                  destination_id: params[:destination_id],
-                  date: params[:date],
-                  route_type: params[:route_type],
-                  number_of_guests: params[:number_of_guests],
-                  tenant_id: @tenant.id,
-                  params: params
-                ).call
-
-                serialize_collection(trips)
-              end
-            end
-          end
-
-          private
-
-          # override from ContentCacheable
-          def max_age
-            CACHE_EXPIRES_IN.to_i
-          end
-
-          # override
-          def collection_cache_key
-            cache_key_parts = [
-              'trip_search',
-              @tenant.id,
-              params[:origin_id],
-              params[:destination_id],
-              params[:date],
-              params[:route_type],
-              params[:number_of_guests],
-              resource_includes&.sort&.join(','),
-              sparse_fields&.sort&.join(','),
-              serializer_params.to_json,
-              params[:page]&.to_s&.strip,
-              params[:per_page]&.to_s&.strip
-            ].compact.join('-')
-
-            Digest::MD5.hexdigest(cache_key_parts)
-          end
-
-          # override
-          def collection_cache_opts
-            {
-              namespace: Spree::Api::Config[:api_v2_collection_cache_namespace],
-              expires_in: CACHE_EXPIRES_IN
-            }
-          end
-
-          # override
-          def default_resource_includes
-            [
-              'trips.vendor',
-              'trips.vendor.logo',
-              'trips.vehicle',
-              'trips.vehicle.vehicle_photos',
-              'trips.amenities'
-            ]
-          end
-
-          def serialize_collection(collection)
-            serialized_data = SpreeCmCommissioner::V2::Storefront::TripQueryResultSerializer.new(
-              collection,
-              include: default_resource_includes,
-              params: serializer_params
-            ).serializable_hash
-            serialized_data[:meta] = {
-              count: collection.size,
-              total_count: collection.respond_to?(:total_count) ? collection.total_count : collection.size,
-              current_page: collection.respond_to?(:current_page) ? collection.current_page : 1,
-              per_page: collection.respond_to?(:limit_value) ? collection.limit_value : collection.size,
-              pages: collection.respond_to?(:total_pages) ? collection.total_pages : 1,
-              next_page: collection.respond_to?(:next_page) ? collection.next_page : nil,
-              prev_page: collection.respond_to?(:prev_page) ? collection.prev_page : nil
-            }
-            serialized_data
-          end
-
-          # override
-          def serializer_params
-            params.permit(:include).to_hash
-          end
-
-          # override
-          def required_schema
-            SpreeCmCommissioner::TripSearchRequestSchema
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,32 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Tenant
-        class TripsController < BaseController
-          def show
-            resource = scope.find(params[:id])
-
-            render_serialized_payload do
-              serialize_resource(resource)
-            end
-          end
-
-          private
-
-          def scope
-            model_class.joins(:vendor)
-                       .where(spree_vendors: { tenant_id: @tenant.id })
-          end
-
-          def model_class
-            SpreeCmCommissioner::Trip
-          end
-
-          def resource_serializer
-            SpreeCmCommissioner::V2::Storefront::TripSerializer
-          end
-        end
-      end
-    end
-  end
-end

data/db/migrate/20251119093000_add_tenant_id_to_cm_vendor_places.rb

@@ -1,7 +0,0 @@
-class AddTenantIdToCmVendorPlaces < ActiveRecord::Migration[7.0]
-  def change
-    add_column :cm_vendor_places, :tenant_id, :integer, if_not_exists: true
-    add_index :cm_vendor_places, :tenant_id, if_not_exists: true
-    add_index :cm_vendor_places, %i[tenant_id vendor_id], if_not_exists: true, name: 'index_cm_vendor_places_on_tenant_and_vendor'
-  end
-end