spree_cm_commissioner 1.17.0.pre.pre7 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a00e3ade6665258924af6b63276add5be49a3b887d193942c41b8ba4a1fa573
-  data.tar.gz: c30315d4d2f4313a342f94be21cf567cab1dbc4bac07cd754542d61d5de17990
+  metadata.gz: 9270cf6464159655e0c794de5c2cfd928bb6a696707676f4166a5062d80810d1
+  data.tar.gz: e5039d47fd725c87a214187184f9610fd7be488b1d0e5b75925ec382088d0fc0
 SHA512:
-  metadata.gz: 30c14950496e7a3df59fd8a5e3233572a30437f750d0d546d4ec87cc405a8d24850912b161ca74eab4530d1d7cf27e3cb333625b0b4915e63102e3b45f1a3e94
-  data.tar.gz: 3062f419e60420e2e9a87c57b8720051292ebdbff63b4308bc739e32309b4aef55498b06c1b2134ee3761b9c4fca5cea8d0ecf912d3bf928701292123a23e11b
+  metadata.gz: 22b9ab443f30d5214daa18cb51b487c7bbce4764af5a4c27afe3d65b20102c11536a75122167b58bd9b12030b0e9cd737e89f6b3424a2894a746d07917baa154
+  data.tar.gz: 4bc00907e7fe3afe5d7266fcb0b40cde518d3b9c9f9bd343ef7b0e80caaa958e76f127028d87292a53e7204fc50b7d4e9e56e48a1c81d7500bcd53bc4275e9ab

data/Gemfile.lock

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

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

@@ -38,24 +38,7 @@ module Spree
           def update
             spree_authorize! :update, spree_current_order, order_token
 
-            if guest_params[:guest_dynamic_fields_attributes]
-              resource.guest_dynamic_fields.destroy_all
-
-              guest_params[:guest_dynamic_fields_attributes].each do |attr|
-                field = resource.guest_dynamic_fields.build(attr.except(:id))
-
-                if field.dynamic_field.requires_dynamic_field_options?
-                  option = field.dynamic_field.dynamic_field_options.find_by(id: field.value)
-                  field.dynamic_field_option = option if option
-                end
-
-                field.save!
-              end
-            end
-
-            resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
-
-            if resource.save
+            if resource.update(guest_params)
               render_serialized_payload { serialize_resource(resource) }
             else
               render_error_payload(resource, 400)
@@ -93,7 +76,7 @@ module Spree
               :upload_later,
               :country_code,
               :contact,
-              guest_dynamic_fields_attributes: %i[id dynamic_field_id dynamic_field_option_id value _destroy]
+              guest_dynamic_fields_attributes: %i[id dynamic_field_id value _destroy]
             )
           end
         end

data/app/models/spree_cm_commissioner/dynamic_field.rb

@@ -6,27 +6,15 @@ module SpreeCmCommissioner
     has_many :guest_dynamic_fields, class_name: 'SpreeCmCommissioner::GuestDynamicField', dependent: :destroy
     has_many :product_dynamic_fields, class_name: 'SpreeCmCommissioner::ProductDynamicField', dependent: :destroy
 
-    enum data_type: { text: 0, number: 1, boolean: 2, checkbox: 3, radio: 4, selection: 5, textarea: 6 }
+    enum data_type: { string: 0, integer: 1, boolean: 2, checkbox: 3, radio: 4 }
 
     accepts_nested_attributes_for :dynamic_field_options, allow_destroy: true, reject_if: :all_blank
 
     validates :label, presence: true
     validates :data_type, presence: true
-    validates :configurations, presence: true, allow_blank: false
 
-    def requires_dynamic_field_options?
-      checkbox? || radio? || selection?
-    end
-
-    def multiple_select
-      return nil unless selection?
-
-      configurations['multiple_select'] == true
-    end
-
-    def multiple_select=(value)
-      self.configurations ||= {}
-      self.configurations['multiple_select'] = ActiveModel::Type::Boolean.new.cast(value)
+    def selection?
+      checkbox? || radio?
     end
   end
 end

data/app/models/spree_cm_commissioner/dynamic_field_option.rb

@@ -1,12 +1,8 @@
 module SpreeCmCommissioner
   class DynamicFieldOption < SpreeCmCommissioner::Base
     belongs_to :dynamic_field, class_name: 'SpreeCmCommissioner::DynamicField', optional: false
-    has_many :guest_dynamic_fields, class_name: 'SpreeCmCommissioner::GuestDynamicField', dependent: :restrict_with_error
-
-    enum status: { active: 0, draft: 1, archived: 2 }
 
     validates :value, presence: true, uniqueness: { scope: :dynamic_field_id }
-    validates :status, presence: true
     validate :parent_field_must_be_selection_type
 
     private
@@ -14,7 +10,7 @@ module SpreeCmCommissioner
     def parent_field_must_be_selection_type
       return unless dynamic_field
 
-      return if dynamic_field.requires_dynamic_field_options?
+      return if dynamic_field.selection?
 
       errors.add(:dynamic_field, 'must be a selection type field')
     end

data/app/models/spree_cm_commissioner/guest_dynamic_field.rb

@@ -2,11 +2,9 @@ module SpreeCmCommissioner
   class GuestDynamicField < SpreeCmCommissioner::Base
     belongs_to :guest, class_name: 'SpreeCmCommissioner::Guest', optional: false
     belongs_to :dynamic_field, class_name: 'SpreeCmCommissioner::DynamicField', optional: false
-    belongs_to :dynamic_field_option, class_name: 'SpreeCmCommissioner::DynamicFieldOption', optional: true
 
     validates :value, presence: true
     validate :validate_value_format, if: -> { value.present? && dynamic_field.present? }
-    validate :validate_option_reference, if: -> { dynamic_field_option.present? }
 
     private
 
@@ -14,30 +12,14 @@ module SpreeCmCommissioner
       return if dynamic_field.blank?
 
       case dynamic_field.data_type.to_s
-      when 'number'
+      when 'integer'
         errors.add(:value, 'must be a number') unless value.to_s.match?(/\A\d+\z/)
       when 'boolean'
-        errors.add(:value, 'must be true or false') unless %w[true false].include?(value.to_s.downcase)
-      when 'checkbox', 'radio', 'selection'
-        validate_option_value
-      end
-    end
-
-    def validate_option_value
-      if dynamic_field_option.present?
-        self.value ||= dynamic_field_option.value
-      else
+        errors.add(:value, 'must be true or false') unless %w[true false 1 0].include?(value.to_s.downcase)
+      when 'checkbox', 'radio'
         valid_options = dynamic_field.dynamic_field_options.pluck(:id).map(&:to_s)
         errors.add(:value, 'is not a valid option') unless valid_options.include?(value)
       end
     end
-
-    def validate_option_reference
-      return if dynamic_field.blank? || dynamic_field_option.blank?
-
-      return if dynamic_field_option.dynamic_field_id == dynamic_field_id
-
-      errors.add(:dynamic_field_option, 'must belong to the same dynamic field')
-    end
   end
 end

data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_option_serializer.rb

@@ -2,7 +2,9 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldOptionSerializer < BaseSerializer
-        attributes :id, :value, :dynamic_field_id, :status, :created_at, :updated_at
+        set_type :dynamic_field_option
+
+        attributes :id, :value, :dynamic_field_id, :created_at, :updated_at
       end
     end
   end

data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_serializer.rb

@@ -2,7 +2,9 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldSerializer < BaseSerializer
-        attributes :id, :label, :data_type, :vendor_id, :multiple_select, :created_at, :updated_at
+        set_type :dynamic_field
+
+        attributes :id, :label, :data_type, :vendor_id, :created_at, :updated_at
 
         has_many :dynamic_field_options, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end

data/app/serializers/spree_cm_commissioner/v2/storefront/guest_dynamic_field_serializer.rb

@@ -4,10 +4,9 @@ module SpreeCmCommissioner
       class GuestDynamicFieldSerializer < BaseSerializer
         set_type :guest_dynamic_field
 
-        attributes :id, :value, :guest_id, :dynamic_field_id, :dynamic_field_option_id, :created_at, :updated_at
+        attributes :id, :value, :guest_id, :dynamic_field_id, :created_at, :updated_at
 
         belongs_to :dynamic_field, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldSerializer
-        belongs_to :dynamic_field_option, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end
     end
   end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.17.0-pre7'.freeze
+  VERSION = '1.17.0'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.17.0.pre.pre7
+  version: 1.17.0
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-04 00:00:00.000000000 Z
+date: 2025-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -2517,9 +2517,6 @@ files:
 - db/migrate/20250611023548_add_country_code_to_guests.rb
 - db/migrate/20250612035937_add_intel_phone_number_to_guests.rb
 - db/migrate/20250616084219_add_description_to_cm_vendor_place.rb
-- db/migrate/20250701093203_add_configurations_to_cm_dynamic_field.rb
-- db/migrate/20250702091305_add_dynamic_field_option_to_guest_dynamic_field.rb
-- db/migrate/20250702091935_add_status_to_dynamic_field_option.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem
@@ -2672,9 +2669,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/db/migrate/20250701093203_add_configurations_to_cm_dynamic_field.rb

@@ -1,6 +0,0 @@
-class AddConfigurationsToCmDynamicField < ActiveRecord::Migration[7.0]
-  def change
-    add_column :cm_dynamic_fields, :configurations, :jsonb, default: {}, null: false, if_not_exists: true
-    add_index :cm_dynamic_fields, :configurations, if_not_exists: true
-  end
-end

data/db/migrate/20250702091305_add_dynamic_field_option_to_guest_dynamic_field.rb

@@ -1,5 +0,0 @@
-class AddDynamicFieldOptionToGuestDynamicField < ActiveRecord::Migration[7.0]
-  def change
-    add_reference :cm_guest_dynamic_fields, :dynamic_field_option, index: true, foreign_key: { to_table: :cm_dynamic_field_options }, if_not_exists: true
-  end
-end

data/db/migrate/20250702091935_add_status_to_dynamic_field_option.rb

@@ -1,5 +0,0 @@
-class AddStatusToDynamicFieldOption < ActiveRecord::Migration[7.0]
-  def change
-    add_column :cm_dynamic_field_options, :status, :integer, default: 0, if_not_exists: true
-  end
-end