spree_cm_commissioner 2.1.5.pre.pre3 → 2.1.5.pre.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06e22965144e75388dd801148c7d38580aee08856973332edc2c40ad31f6772a
-  data.tar.gz: 1b33b7d645b36c9ccf42444dfa09aa7826a43d9c8e2a3dd0aaaa6d1668f6643d
+  metadata.gz: d8486b28317774d671766e586870afa3396fc006efd21ea825bdc6769985e4be
+  data.tar.gz: 60df005650d9f053548a82bb7aa3818dd36e3b6aec8773a5fe05c3c5bf7d5d5a
 SHA512:
-  metadata.gz: 781da351e0880acf7f46fbbc060844a31f26b322d781fc17ad1da51ac4a3e7d0a9c991d2fb4921ec1cc1e89a255c2abf9457c3bf7c163108838b199cb9865054
-  data.tar.gz: 6322d9ef0cca35c6d225cb91917cb3e49a6a96221b60025103f09f607658eaf0c797d0d37f6ad44b3c183a5f7c8d6a64afd0326de016047cf005dfb8ae200b4b
+  metadata.gz: 16f526c38a5084769158d1a1cf643c77458f9a031adb21911f6b6699b2cd9421cb865d2de8d200bb7d4649aa30f79ef98273283aebf51a09ce25b45eeb1ae0c4
+  data.tar.gz: 894f3c5cb26b1506042a35a3fc36ac7d09b40828ee242715a47d83dc4141dcfb9ddcde3603e6a233b92df6aefab59ad0873778fa9f1ee286041ba262e6f95e9c

data/Gemfile.lock

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

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

@@ -156,7 +156,7 @@ module Spree
           end
 
           def resource_serializer
-            Spree::Api::Dependencies.storefront_cart_serializer.constantize
+            Spree::V2::Tenant::CartSerializer
           end
 
           def create_service

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

@@ -67,7 +67,7 @@ module Spree
           end
 
           def resource_serializer
-            Spree::Api::Dependencies.storefront_cart_serializer.constantize
+            Spree::V2::Tenant::CartSerializer
           end
 
           def next_service

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

@@ -0,0 +1,32 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class DynamicFieldOptionsController < BaseController
+          # override
+          def collection
+            return @collection if defined?(@collection)
+            return SpreeCmCommissioner::DynamicFieldOption.none if params[:dynamic_field_id].blank?
+
+            @collection = SpreeCmCommissioner::DynamicFieldOption
+                          .where(dynamic_field_id: params[:dynamic_field_id])
+                          .active
+                          .order(position: :asc)
+
+            @collection = @collection.where('value LIKE ?', "%#{params[:query]}%") if params[:query].present?
+            @collection
+          end
+
+          # override
+          def collection_serializer
+            Spree::V2::Tenant::DynamicFieldOptionSerializer
+          end
+
+          def model_class
+            SpreeCmCommissioner::DynamicFieldOption
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -9,6 +9,9 @@ module Spree
           # raise 404 when no order
           before_action :ensure_order
 
+          rescue_from ActiveRecord::RecordInvalid, with: :handle_record_invalid
+          rescue_from ActiveRecord::RecordNotFound, with: :handle_record_not_found
+
           # override
           def model_class
             SpreeCmCommissioner::Guest
@@ -27,23 +30,28 @@ module Spree
           def create
             spree_authorize! :update, spree_current_order, order_token
 
-            resource = scope.new(guest_params)
+            resource = scope.new(guest_params.except(:guest_dynamic_fields_attributes))
 
-            if resource.save
-              render_serialized_payload(201) { serialize_resource(resource) }
-            else
-              render_error_payload(resource.errors, 400)
+            ActiveRecord::Base.transaction do
+              resource.save!
+              run_dynamic_fields(resource)
+              resource.save_and_move_to_next_stage
             end
+
+            render_serialized_payload(201) { serialize_resource(resource) }
           end
 
           def update
             spree_authorize! :update, spree_current_order, order_token
 
-            if resource.update(guest_params)
-              render_serialized_payload { serialize_resource(resource) }
-            else
-              render_error_payload(resource, 400)
+            ActiveRecord::Base.transaction do
+              run_dynamic_fields(resource) if guest_params[:guest_dynamic_fields_attributes]
+              resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
+              resource.save!
+              resource.save_and_move_to_next_stage
             end
+
+            render_serialized_payload { serialize_resource(resource) }
           end
 
           private
@@ -78,9 +86,31 @@ module Spree
               :address,
               :other_organization,
               :expectation,
-              :upload_later
+              :upload_later,
+              guest_dynamic_fields_attributes: %i[
+                id
+                dynamic_field_id
+                dynamic_field_option_id
+                value
+                _destroy
+              ]
+            )
+          end
+
+          def run_dynamic_fields(resource)
+            SpreeCmCommissioner::GuestDynamicFieldsManager.call(
+              resource: resource,
+              dynamic_fields_attributes: guest_params[:guest_dynamic_fields_attributes]
             )
           end
+
+          def handle_record_invalid(exception)
+            render_error_payload(exception.record.errors, 422)
+          end
+
+          def handle_record_not_found(exception)
+            render_error_payload({ base: [exception.message] }, 404)
+          end
         end
       end
     end

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

@@ -0,0 +1,41 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class ProductDynamicFieldsController < BaseController
+          before_action :load_product, only: :index
+
+          # override
+          def collection
+            return @collection if defined?(@collection)
+
+            product_dynamic_fields = @product.product_dynamic_fields.includes(dynamic_field: :dynamic_field_options)
+
+            if params[:phase].present?
+              requested_phase = params[:phase].to_s
+              if SpreeCmCommissioner::DynamicField.data_fill_stages.key?(requested_phase)
+                product_dynamic_fields = product_dynamic_fields.joins(:dynamic_field)
+                                                               .where(dynamic_field: { data_fill_stage: requested_phase })
+                                                               .order(:position)
+              end
+            end
+
+            @collection = product_dynamic_fields.order(:section)
+          end
+
+          private
+
+          def load_product
+            return render_error_payload({ error: 'product_id is required' }, 400) if params[:product_id].blank?
+
+            @product ||= Spree::Product.find(params[:product_id])
+          end
+
+          def collection_serializer
+            Spree::V2::Tenant::ProductDynamicFieldSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/guest_dynamic_fields_manager.rb

@@ -0,0 +1,33 @@
+module SpreeCmCommissioner
+  class GuestDynamicFieldsManager < BaseInteractor
+    delegate :resource, :dynamic_fields_attributes, to: :context
+
+    def call
+      return if dynamic_fields_attributes.blank?
+
+      dynamic_fields_attributes.each { |attr| upsert_or_destroy_field(attr) }
+    end
+
+    private
+
+    def upsert_or_destroy_field(attr)
+      if attr[:_destroy] == '1' && attr[:id].present?
+        resource.guest_dynamic_fields.find_by(id: attr[:id])&.destroy!
+        return
+      end
+
+      return if attr[:dynamic_field_id].blank?
+
+      field = attr[:id].present? ? resource.guest_dynamic_fields.find(attr[:id]) : resource.guest_dynamic_fields.build
+      field.assign_attributes(attr.except(:id, :_destroy))
+      associate_dynamic_field_option(field)
+      field.save!
+    end
+
+    def associate_dynamic_field_option(field)
+      return unless field.value.to_s.match?(/\A\d+\z/)
+
+      field.dynamic_field_option = field.dynamic_field.dynamic_field_options.find_by(id: field.value.to_i)
+    end
+  end
+end

data/app/models/concerns/spree_cm_commissioner/user_identity.rb

@@ -39,8 +39,7 @@ module SpreeCmCommissioner
         login = login.downcase
         parser = PhoneNumberParser.call(phone_number: login)
 
-        scope = Spree.user_class.all
-        scope = scope.where(tenant_id: tenant_id) if tenant_id.present?
+        scope = tenant_id.present? ? Spree.user_class.by_tenant(tenant_id) : Spree.user_class.by_non_tenant
 
         if parser.intel_phone_number.present?
           scope.find_by(intel_phone_number: parser.intel_phone_number)

data/app/models/spree_cm_commissioner/guest.rb

@@ -40,7 +40,7 @@ module SpreeCmCommissioner
 
     has_many :state_changes, as: :stateful, class_name: 'Spree::StateChange'
     has_many :guest_dynamic_fields, dependent: :destroy, class_name: 'SpreeCmCommissioner::GuestDynamicField'
-    accepts_nested_attributes_for :guest_dynamic_fields, allow_destroy: true
+    accepts_nested_attributes_for :guest_dynamic_fields, allow_destroy: true, reject_if: :reject_guest_dynamic_field?
 
     belongs_to :event, class_name: 'Spree::Taxon'
 
@@ -402,6 +402,11 @@ module SpreeCmCommissioner
 
       required_fields.reject { |field| filled_ids.include?(field.id) }
     end
+
+    def reject_guest_dynamic_field?(attributes)
+      # Reject if dynamic_field_id is blank or if _destroy is true
+      attributes[:dynamic_field_id].blank? || ActiveModel::Type::Boolean.new.cast(attributes[:_destroy])
+    end
   end
 end
 # rubocop:enable Metrics/ClassLength

data/app/models/spree_cm_commissioner/guest_dynamic_field.rb

@@ -46,6 +46,10 @@ module SpreeCmCommissioner
       return if dynamic_field.blank? || dynamic_field_option.blank?
       return if dynamic_field_option.dynamic_field_id == dynamic_field_id
 
+      # Only validate if both dynamic_field and dynamic_field_option are persisted
+      # This prevents validation errors during creation when associations might not be fully loaded
+      return if dynamic_field.new_record? || dynamic_field_option.new_record?
+
       errors.add(:dynamic_field_option, 'must belong to the same dynamic field')
     end
 

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -32,6 +32,7 @@ module SpreeCmCommissioner
       base.has_secure_password :confirm_pin_code, validations: false
 
       base.multi_tenant :tenant, class_name: 'SpreeCmCommissioner::Tenant'
+
       base.scope :by_tenant, -> (tenant_id) { where(tenant_id: tenant_id) }
       base.scope :by_non_tenant, -> { where(tenant_id: nil) }
       base.scope :vendor_users, -> (vendor_id) { joins(:role_users => :role).where(spree_roles: { vendor_id: vendor_id }).distinct }

data/app/serializers/spree/v2/tenant/cart_serializer.rb

@@ -1,7 +1,30 @@
 module Spree
   module V2
     module Tenant
-      class CartSerializer < Spree::V2::Storefront::CartSerializer
+      class CartSerializer < BaseSerializer
+        attributes :number, :item_total, :total, :ship_total, :adjustment_total, :created_at,
+                   :updated_at, :completed_at, :included_tax_total, :additional_tax_total, :display_additional_tax_total,
+                   :display_included_tax_total, :tax_total, :currency, :state, :token, :email,
+                   :display_item_total, :display_ship_total, :display_adjustment_total, :display_tax_total,
+                   :promo_total, :display_promo_total, :item_count, :special_instructions, :display_total,
+                   :pre_tax_item_amount, :display_pre_tax_item_amount, :pre_tax_total, :display_pre_tax_total,
+                   :shipment_state, :payment_state, :public_metadata,
+                   :phone_number, :intel_phone_number, :country_code, :request_state, :channel
+
+        belongs_to :user, serializer: Spree::V2::Tenant::UserSerializer
+        belongs_to :billing_address,
+                   id_method_name: :bill_address_id,
+                   serializer: :address,
+                   record_type: :address
+
+        has_many :promotions, object_method_name: :valid_promotions, id_method_name: :valid_promotion_ids,
+                              serializer: Spree::V2::Storefront::PromotionSerializer
+
+        has_many :variants, serializer: Spree::V2::Tenant::VariantSerializer
+        has_many :products, serializer: Spree::V2::Tenant::ProductSerializer
+        has_many :line_items, serializer: Spree::V2::Tenant::LineItemSerializer
+        has_many :payments, serializer: Spree::V2::Storefront::PaymentSerializer
+        has_many :guests, serializer: Spree::V2::Tenant::GuestSerializer
       end
     end
   end

data/app/serializers/spree/v2/tenant/dynamic_field_option_serializer.rb

@@ -0,0 +1,9 @@
+module Spree
+  module V2
+    module Tenant
+      class DynamicFieldOptionSerializer < BaseSerializer
+        attributes :id, :value, :dynamic_field_id, :status, :position
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/tenant/dynamic_field_serializer.rb

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Tenant
+      class DynamicFieldSerializer < BaseSerializer
+        attributes :id, :label, :data_type, :vendor_id, :multiple_select, :position, :data_fill_stage
+
+        has_many :dynamic_field_options, serializer: Spree::V2::Tenant::DynamicFieldOptionSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/tenant/guest_dynamic_field_serializer.rb

@@ -0,0 +1,12 @@
+module Spree
+  module V2
+    module Tenant
+      class GuestDynamicFieldSerializer < BaseSerializer
+        attributes :id, :value, :guest_id, :dynamic_field_id, :dynamic_field_option_id, :created_at, :updated_at
+
+        belongs_to :dynamic_field, serializer: Spree::V2::Tenant::DynamicFieldSerializer
+        belongs_to :dynamic_field_option, serializer: Spree::V2::Tenant::DynamicFieldOptionSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/tenant/guest_serializer.rb

@@ -14,6 +14,7 @@ module Spree
         belongs_to :occupation, serializer: Spree::V2::Tenant::TaxonSerializer
         belongs_to :nationality, serializer: Spree::V2::Tenant::TaxonSerializer
         has_one :id_card, serializer: Spree::V2::Tenant::IdCardSerializer
+        has_many :guest_dynamic_fields, serializer: Spree::V2::Tenant::GuestDynamicFieldSerializer
 
         # allowed_checkout updates frequently
         cache_options store: nil

data/app/serializers/spree/v2/tenant/product_dynamic_field_serializer.rb

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Tenant
+      class ProductDynamicFieldSerializer < BaseSerializer
+        attributes :id, :product_id, :dynamic_field_id, :section
+
+        belongs_to :dynamic_field, serializer: Spree::V2::Tenant::DynamicFieldSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/tenant/product_serializer.rb

@@ -5,6 +5,9 @@ module Spree
         # This serializer extends the Storefront ProductSerializer
         # to include any additional attributes or relationships needed
         # for the Tenant context.
+
+        # Overrided dynamic fields relationship of the parent serializer(Storefront).
+        has_many :dynamic_fields, serializer: Spree::V2::Tenant::DynamicFieldSerializer
       end
     end
   end

data/config/routes.rb

@@ -507,6 +507,9 @@ Spree::Core::Engine.add_routes do
           resources :id_cards, only: %i[create update destroy]
         end
 
+        resources :product_dynamic_fields, only: :index
+        resources :dynamic_field_options, only: :index
+
         resource :checkout, controller: :checkout, only: %i[update] do
           patch  :next
           patch  :advance

data/db/migrate/20250902092904_add_section_to_cm_product_dynamic_fields.rb

@@ -0,0 +1,5 @@
+class AddSectionToCmProductDynamicFields < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_product_dynamic_fields, :section, :integer, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.1.5-pre3'.freeze
+  VERSION = '2.1.5-pre4'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.1.5.pre.pre3
+  version: 2.1.5.pre.pre4
 platform: ruby
 authors:
 - You
@@ -976,6 +976,7 @@ files:
 - app/controllers/spree/api/v2/tenant/checkout_controller.rb
 - app/controllers/spree/api/v2/tenant/cms_pages_controller.rb
 - app/controllers/spree/api/v2/tenant/customer_notifications_controller.rb
+- app/controllers/spree/api/v2/tenant/dynamic_field_options_controller.rb
 - 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
@@ -984,6 +985,7 @@ files:
 - app/controllers/spree/api/v2/tenant/order_histories_controller.rb
 - app/controllers/spree/api/v2/tenant/pin_code_checkers_controller.rb
 - app/controllers/spree/api/v2/tenant/pin_code_generators_controller.rb
+- app/controllers/spree/api/v2/tenant/product_dynamic_fields_controller.rb
 - app/controllers/spree/api/v2/tenant/products_controller.rb
 - app/controllers/spree/api/v2/tenant/profile_images_controller.rb
 - app/controllers/spree/api/v2/tenant/reset_passwords_controller.rb
@@ -1142,6 +1144,7 @@ files:
 - app/interactors/spree_cm_commissioner/firebase_email_fetcher_cron_executor.rb
 - app/interactors/spree_cm_commissioner/firebase_id_token_provider.rb
 - app/interactors/spree_cm_commissioner/google_places_fetcher.rb
+- app/interactors/spree_cm_commissioner/guest_dynamic_fields_manager.rb
 - app/interactors/spree_cm_commissioner/guest_id_card_manager.rb
 - app/interactors/spree_cm_commissioner/guest_seat_updater.rb
 - app/interactors/spree_cm_commissioner/host_matcher.rb
@@ -1741,7 +1744,10 @@ files:
 - app/serializers/spree/v2/tenant/cart_serializer.rb
 - app/serializers/spree/v2/tenant/customer_notification_serializer.rb
 - app/serializers/spree/v2/tenant/digital_link_serializer.rb
+- app/serializers/spree/v2/tenant/dynamic_field_option_serializer.rb
+- app/serializers/spree/v2/tenant/dynamic_field_serializer.rb
 - app/serializers/spree/v2/tenant/guest_card_class_serializer.rb
+- app/serializers/spree/v2/tenant/guest_dynamic_field_serializer.rb
 - app/serializers/spree/v2/tenant/guest_serializer.rb
 - app/serializers/spree/v2/tenant/homepage_section_relatable_serializer.rb
 - app/serializers/spree/v2/tenant/homepage_section_serializer.rb
@@ -1754,6 +1760,7 @@ files:
 - app/serializers/spree/v2/tenant/order_serializer.rb
 - app/serializers/spree/v2/tenant/payment_method_group_serializer.rb
 - app/serializers/spree/v2/tenant/payment_method_serializer.rb
+- app/serializers/spree/v2/tenant/product_dynamic_field_serializer.rb
 - app/serializers/spree/v2/tenant/product_serializer.rb
 - app/serializers/spree/v2/tenant/reset_password_serializer.rb
 - app/serializers/spree/v2/tenant/role_serializer.rb
@@ -2738,6 +2745,7 @@ files:
 - db/migrate/20250827022757_create_spree_cm_commissioner_check_in_rules.rb
 - db/migrate/20250827032901_add_check_in_session_to_check_ins.rb
 - db/migrate/20250827083828_add_unique_index_on_guest_id_check_in_session_id_to_cm_check_ins.rb
+- db/migrate/20250902092904_add_section_to_cm_product_dynamic_fields.rb
 - db/migrate/20250903085931_add_importable_to_cm_imports.rb
 - db/migrate/20250911100738_drop_cm_variant_blocks.rb
 - db/migrate/20250911100835_add_variant_id_to_cm_blocks.rb