spree_cm_commissioner 1.21.0 → 2.0.0.pre.pre

data/app/interactors/spree_cm_commissioner/user_id_token_authenticator.rb

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
   class UserIdTokenAuthenticator < BaseInteractor
-    # :id_token, :tenant_id (optional)
+    # :id_token
     def call
       context.user = if checker.user.nil?
                        register_user
@@ -14,11 +14,7 @@ module SpreeCmCommissioner
     end
 
     def register_user
-      register_context = SpreeCmCommissioner::UserRegistrationWithIdToken.call(
-        id_token: context.id_token,
-        tenant_id: context.tenant_id
-      )
-
+      register_context = SpreeCmCommissioner::UserRegistrationWithIdToken.call(id_token: context.id_token)
       register_context.user
     end
 
@@ -31,7 +27,7 @@ module SpreeCmCommissioner
     end
 
     def checker
-      @checker ||= SpreeCmCommissioner::UserIdTokenChecker.call(id_token: context.id_token, tenant_id: context.tenant_id)
+      @checker ||= SpreeCmCommissioner::UserIdTokenChecker.call(id_token: context.id_token)
       @checker
     end
   end

data/app/interactors/spree_cm_commissioner/user_id_token_checker.rb

@@ -1,9 +1,6 @@
 module SpreeCmCommissioner
   class UserIdTokenChecker < BaseInteractor
-    # expects:
-    #   context.id_token
-    #   context.tenant_id (optional)
-
+    # :id_token
     def call
       firebase_id_token_context = SpreeCmCommissioner::FirebaseIdTokenProvider.call(id_token: context.id_token)
 
@@ -14,14 +11,9 @@ module SpreeCmCommissioner
       end
     end
 
-    # :identity_type, :sub, :tenant_id
+    # :identity_type, :sub
     def validate_user_by_provider(provider)
-      identity_checker = SpreeCmCommissioner::UserIdentityChecker.call(
-        identity_type: provider[:identity_type],
-        sub: provider[:sub],
-        tenant_id: context.tenant_id
-      )
-
+      identity_checker = SpreeCmCommissioner::UserIdentityChecker.call(provider)
       if identity_checker.success?
         context.user = identity_checker.user
       else

data/app/interactors/spree_cm_commissioner/user_identity_checker.rb

@@ -1,10 +1,6 @@
 module SpreeCmCommissioner
   class UserIdentityChecker < BaseInteractor
-    # expects:
-    #   context.identity_type
-    #   context.sub
-    #   context.tenant_id (optional)
-
+    # :identity_type, :sub
     def call
       load_user
 
@@ -15,14 +11,12 @@ module SpreeCmCommissioner
     end
 
     def load_user
-      return if context.sub.blank? || context.identity_type.blank?
-
-      user_identity_provider = UserIdentityProvider.joins(:user)
-                                                   .where(identity_type: context.identity_type, sub: context.sub)
-                                                   .where(spree_users: { tenant_id: context.tenant_id })
-                                                   .first
+      user_identity_provider = UserIdentityProvider.where(
+        identity_type: context.identity_type,
+        sub: context.sub
+      ).first
 
-      context.user = user_identity_provider&.user
+      context.user = (user_identity_provider.user if user_identity_provider.present?)
     end
   end
 end

data/app/interactors/spree_cm_commissioner/user_registration_with_id_token.rb

@@ -15,13 +15,7 @@ module SpreeCmCommissioner
     end
 
     def register_user!(name, email)
-      user = Spree.user_class.new(
-        password: SecureRandom.base64(16),
-        email: email,
-        tenant_id: context.tenant_id,
-        **name_attributes(name)
-      )
-
+      user = Spree.user_class.new(password: SecureRandom.base64(16), email: email, **name_attributes(name))
       if user.save(validate: false)
         context.user = user
       else

data/app/interactors/spree_cm_commissioner/vattanac_bank_initiator.rb

@@ -93,10 +93,6 @@ module SpreeCmCommissioner
       context.fail!(message: "User creation failed: #{context.user.errors.full_messages.join(', ')}")
     end
 
-    def disable_services
-      'bus,ferry'
-    end
-
     def construct_data
       user = context.user
 
@@ -105,7 +101,7 @@ module SpreeCmCommissioner
         name: user.full_name,
         phone: user.phone_number,
         email: user.email,
-        webUrl: "#{Spree::Store.default.formatted_url}/vattanac_bank_web_app?session_id=#{session_id}&ds=#{CGI.escape(disable_services)}"
+        webUrl: "#{Spree::Store.default.formatted_url}/vattanac_bank_web_app?session_id=#{session_id}"
       }
 
       json_data = raw_data.to_json

data/app/jobs/spree_cm_commissioner/application_job.rb

@@ -1,5 +1,25 @@
 module SpreeCmCommissioner
   class ApplicationJob < ::ApplicationJob
     queue_as :default
+
+    around_perform :log_exceptions
+
+    private
+
+    def log_exceptions
+      yield
+    rescue StandardError => e
+      CmAppLogger.log(
+        label: "#{self.class.name} failed",
+        data: {
+          error_class: e.class.name,
+          error_message: e.message,
+          arguments: arguments.inspect,
+          backtrace: e.backtrace&.first(5)&.join("\n")
+        }
+      )
+
+      raise # Re-raise the exception to let Sidekiq handle retries or failure
+    end
   end
 end

data/app/jobs/spree_cm_commissioner/application_unique_job.rb

@@ -2,5 +2,25 @@
 module SpreeCmCommissioner
   class ApplicationUniqueJob < ::ApplicationUniqueJob
     queue_as :default
+
+    around_perform :log_exceptions
+
+    private
+
+    def log_exceptions
+      yield
+    rescue StandardError => e
+      CmAppLogger.log(
+        label: "#{self.class.name} failed",
+        data: {
+          error_class: e.class.name,
+          error_message: e.message,
+          arguments: arguments.inspect,
+          backtrace: e.backtrace&.first(5)&.join("\n")
+        }
+      )
+
+      raise # Re-raise the exception to let Sidekiq handle retries or failure
+    end
   end
 end

data/app/jobs/spree_cm_commissioner/ensure_correct_product_type_job.rb

@@ -0,0 +1,7 @@
+module SpreeCmCommissioner
+  class EnsureCorrectProductTypeJob < ApplicationJob
+    def perform
+      SpreeCmCommissioner::EnsureCorrectProductType.call
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/inventory_item_syncer_job.rb

@@ -0,0 +1,7 @@
+module SpreeCmCommissioner
+  class InventoryItemSyncerJob < ApplicationUniqueJob
+    def perform(inventory_id_and_quantities:)
+      InventoryItemSyncer.call(inventory_id_and_quantities:)
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/sms_pin_code_job.rb

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
   class SmsPinCodeJob < SpreeCmCommissioner::SmsJob
-    # options = { to: xxxx, body: xxxx }
+    # options = { from: xxx, to: xxxx, body: xxxx }
     def perform(options)
       SpreeCmCommissioner::Sms.call(options)
     end

data/app/jobs/spree_cm_commissioner/stock/inventory_items_adjuster_job.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  module Stock
+    class InventoryItemsAdjusterJob < ApplicationUniqueJob
+      def perform(variant_id:, quantity:)
+        variant = Spree::Variant.find(variant_id)
+
+        SpreeCmCommissioner::Stock::InventoryItemsAdjuster.call(variant: variant, quantity: quantity)
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/stock/inventory_items_generator_job.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  module Stock
+    class InventoryItemsGeneratorJob < ApplicationUniqueJob
+      def perform(variant_id:)
+        variant = Spree::Variant.find(variant_id)
+
+        SpreeCmCommissioner::Stock::InventoryItemsGenerator.call(variant: variant)
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/stock/permanent_inventory_items_generator_job.rb

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  module Stock
+    class PermanentInventoryItemsGeneratorJob < ApplicationUniqueJob
+      def perform
+        SpreeCmCommissioner::Stock::PermanentInventoryItemsGenerator.call
+      end
+    end
+  end
+end

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

@@ -18,29 +18,23 @@ module SpreeCmCommissioner
     def date_unit
       return nil unless permanent_stock?
 
-      date_range_excluding_checkout.size if accommodation?
+      date_range.size
     end
 
-    def date_range_excluding_checkout
+    def date_range
       return [] unless date_present?
 
-      date_range = (from_date.to_date..to_date.to_date).to_a
-      date_range.pop if date_range.size > 1
-      date_range
+      (from_date.to_date..to_date.to_date).to_a
     end
 
-    def date_range_including_checkout
-      return [] unless date_present?
-
-      (from_date.to_date..to_date.to_date).to_a
+    def checkin_date
+      from_date&.to_date
     end
 
-    def date_range
-      if accommodation?
-        date_range_excluding_checkout
-      else
-        date_range_including_checkout
-      end
+    def checkout_date
+      return to_date ? to_date.to_date - 1.day : nil if accommodation?
+
+      to_date&.to_date
     end
 
     private

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

@@ -14,13 +14,6 @@ module SpreeCmCommissioner
       state_selection
       payment_option
       delivery_option
-      amenity
-      departure_time
-      duration
-      vehicle_id
-      origin
-      destination
-      place_id
     ].freeze
 
     RESERVED_OPTIONS = {
@@ -47,12 +40,7 @@ module SpreeCmCommissioner
       'bib-zerofill' => 'integer',
       'bib-display-prefix' => 'boolean',
       'bib-pre-generation-on-create' => 'boolean',
-      'seat-number-positions' => 'array',
-      'origin' => 'place_id',
-      'destination' => 'place_id',
-      'departure-time' => 'time',
-      'vehicle' => 'vehicle_id',
-      'allow-seat-selection' => 'boolean'
+      'seat-number-positions' => 'array'
     }.freeze
 
     included do

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

@@ -0,0 +1,44 @@
+module SpreeCmCommissioner
+  module OrderSeatable
+    def should_manage_blocks?
+      preload_block_ids.any?
+    end
+
+    def hold_blocks!
+      return unless should_manage_blocks?
+
+      CmAppLogger.log(label: "#{self.class.name}#hold_blocks!", data: { order_id: id }) do
+        SpreeCmCommissioner::Seats::BlocksHolder.new(line_item_ids: line_item_ids, hold_by: user).hold_blocks!
+      end
+    end
+
+    def cancel_blocks!
+      return unless should_manage_blocks?
+
+      CmAppLogger.log(label: "#{self.class.name}#cancel_blocks!", data: { order_id: id }) do
+        SpreeCmCommissioner::Seats::BlocksCanceler.new(order_id: id, cancel_by: user).cancel_blocks!
+      end
+    end
+
+    def reserve_blocks!
+      return unless should_manage_blocks?
+
+      CmAppLogger.log(label: "#{self.class.name}#reserve_blocks!", data: { order_id: id }) do
+        SpreeCmCommissioner::Seats::BlocksReserver.new(line_item_ids: line_item_ids, reserve_by: user).reserve_blocks!
+      end
+    end
+
+    # Calling `.block_ids` directly can cause many slow database queries (N+1 problem)
+    # every time `.should_manage_blocks?` or `.preload_block_ids` runs.
+    # To avoid this, we store a precomputed list of block IDs in `private_metadata`.
+    # This list is updated whenever a guest’s block is saved or destroy.
+    def preload_block_ids=(preload_block_ids = [])
+      self.private_metadata ||= {}
+      self.private_metadata['preload_block_ids'] = preload_block_ids
+    end
+
+    def preload_block_ids
+      self.private_metadata&.fetch('preload_block_ids', []) || []
+    end
+  end
+end

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

@@ -5,6 +5,8 @@ module SpreeCmCommissioner
     extend ActiveSupport::Concern
 
     included do
+      state_machine.before_transition to: :payment, do: :hold_blocks!
+
       state_machine.before_transition to: :complete, do: :request, if: :need_confirmation?
       state_machine.before_transition to: :complete, do: :generate_bib_number
 
@@ -14,10 +16,14 @@ module SpreeCmCommissioner
       state_machine.after_transition to: :complete, do: :send_order_complete_telegram_alert_to_vendors, unless: :need_confirmation?
       state_machine.after_transition to: :complete, do: :send_order_complete_telegram_alert_to_store, unless: :need_confirmation?
 
+      state_machine.around_transition to: :complete, do: :unstock_inventory!
+
       state_machine.after_transition to: :complete, do: :send_transaction_email_to_user, if: :user_has_email?
       state_machine.after_transition to: :resumed, do: :precalculate_conversion
+      state_machine.around_transition to: :resumed, do: :unstock_inventory!
 
       state_machine.after_transition to: :canceled, do: :precalculate_conversion
+      state_machine.after_transition to: :canceled, do: :restock_inventory!
 
       scope :accepted, -> { where(request_state: 'accepted') }
 
@@ -67,6 +73,39 @@ module SpreeCmCommissioner
       end
     end
 
+    def unstock_inventory!
+      ActiveRecord::Base.transaction do
+        yield # Equal to block.call
+
+        # After the transition is complete, the following code will execute first before proceeding to other `after_transition` callbacks.
+        # This ensures that if `reserve_blocks!` or `unstock_inventory_in_redis!` fails, the state will be rolled back,
+        # and neither the `finalize!` method nor any notifications will be triggered.
+        # The payment will be reversed in vPago gem, and `Spree::Checkout::Complete` will be called, which checks `order.reload.complete?`.
+        # This is critical because if the order state is complete, the payment will be marked as paid.
+
+        reserve_blocks!
+        unstock_inventory_in_redis!
+
+        # We rollback only order state, and we keep payment state as it is.
+        # We implement payment in vPago gem, and it will be reversed in the gem.
+        # Some bank has api for refund, but some don't have the api to refund yet. So we keep the payment state as it is and refund manually.
+      end
+    rescue StandardError => e
+      CmAppLogger.log(
+        label: 'SpreeCmCommissioner::OrderStateMachine#reserve_inventory failed',
+        data: { order_id: id, error: e.message, type: e.class.name, backtrace: e.backtrace&.first(5)&.join("\n") }
+      )
+
+      raise e
+    end
+
+    def restock_inventory!
+      ActiveRecord::Base.transaction do
+        cancel_blocks!
+        restock_inventory_in_redis!
+      end
+    end
+
     def generate_bib_number
       line_items.find_each(&:generate_remaining_guests)
 

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

@@ -3,12 +3,10 @@ module SpreeCmCommissioner
     extend ActiveSupport::Concern
 
     included do
-      delegate :product_type,
-               :subscribable?,
+      delegate :subscribable?,
                :allowed_upload_later?,
                :need_confirmation?, :need_confirmation,
                :allow_anonymous_booking,
-               :accommodation?, :service?, :ecommerce?,
                :allow_self_check_in,
                :allow_self_check_in?,
                :required_self_check_in_location,

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

@@ -6,10 +6,20 @@ module SpreeCmCommissioner
     extend ActiveSupport::Concern
 
     PRODUCT_TYPES = %i[accommodation service ecommerce transit].freeze
+    PERMANENT_STOCK_PRODUCT_TYPES = %w[accommodation service transit].freeze
+    PRE_INVENTORY_DAYS = { 'transit' => 90, 'accommodation' => 365, 'service' => 30 }.freeze
 
     included do
       enum product_type: PRODUCT_TYPES if table_exists? && column_names.include?('product_type')
       enum primary_product_type: PRODUCT_TYPES if table_exists? && column_names.include?('primary_product_type')
     end
+
+    def permanent_stock?
+      PERMANENT_STOCK_PRODUCT_TYPES.include?(product_type)
+    end
+
+    def pre_inventory_days
+      PRE_INVENTORY_DAYS[product_type]
+    end
   end
 end

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

@@ -3,7 +3,7 @@ module SpreeCmCommissioner
     extend ActiveSupport::Concern
 
     included do
-      enum kind: { category: 0, cms: 1, event: 2, occupation: 3, nationality: 4, organization: 5, transit: 6 }
+      enum kind: { category: 0, cms: 1, event: 2, occupation: 3, nationality: 4, organization: 5 }
     end
   end
 end

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

@@ -5,10 +5,6 @@ module SpreeCmCommissioner
     included do
       preference :assetlinks, :string, default: ''
       preference :apple_app_site_association, :string, default: ''
-      preference :payment_checkout_image, :string, default: ''
-      preference :payment_failed_image, :string, default: ''
-      preference :payment_success_image, :string, default: ''
-      preference :payment_loader, :string, default: ''
     end
   end
 end

data/app/models/spree_cm_commissioner/block.rb

@@ -0,0 +1,23 @@
+module SpreeCmCommissioner
+  class Block < Base
+    belongs_to :seat_section, class_name: 'SpreeCmCommissioner::SeatSection', optional: true
+    belongs_to :seat_layout, class_name: 'SpreeCmCommissioner::SeatLayout', optional: false
+
+    validates :label, presence: true
+
+    has_many :variant_blocks, class_name: 'SpreeCmCommissioner::VariantBlock', dependent: :destroy
+    has_many :variants, class_name: 'Spree::Variant', through: :variant_blocks
+
+    validates :width, presence: true, numericality: { greater_than: 0 }
+    validates :height, presence: true, numericality: { greater_than: 0 }
+    validates :x, presence: true, numericality: true
+    validates :y, presence: true, numericality: true
+    validates :rotation, presence: true, numericality: { greater_than_or_equal_to: -360, less_than_or_equal_to: 360 }
+
+    before_validation :assign_layout_from_section, if: -> { seat_layout.nil? && seat_section.present? }
+
+    def assign_layout_from_section
+      self.seat_layout = seat_section.seat_layout
+    end
+  end
+end

data/app/models/spree_cm_commissioner/dynamic_field.rb

@@ -1,34 +1,20 @@
 module SpreeCmCommissioner
   class DynamicField < SpreeCmCommissioner::Base
-    acts_as_list column: :position, scope: :vendor_id
-
     belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
 
     has_many :dynamic_field_options, class_name: 'SpreeCmCommissioner::DynamicFieldOption', dependent: :destroy
     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,14 +1,8 @@
 module SpreeCmCommissioner
   class DynamicFieldOption < SpreeCmCommissioner::Base
-    acts_as_list column: :position, scope: :dynamic_field_id
-
     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
@@ -16,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.rb

@@ -24,10 +24,16 @@ module SpreeCmCommissioner
     scope :none_bib, -> { where(bib_prefix: [nil, '']) }
 
     belongs_to :line_item, class_name: 'Spree::LineItem'
+
     has_one :variant, class_name: 'Spree::Variant', through: :line_item
+
     belongs_to :user, class_name: 'Spree::User'
     belongs_to :occupation, class_name: 'Spree::Taxon'
     belongs_to :nationality, class_name: 'Spree::Taxon'
+    belongs_to :block, class_name: 'SpreeCmCommissioner::Block', optional: true
+
+    has_one :reserved_block, class_name: 'SpreeCmCommissioner::ReservedBlock'
+
     scope :checked_ins, -> { joins(:check_in) }
     scope :no_show, -> { left_outer_joins(:check_in).where(cm_check_ins: { id: nil }) }
 
@@ -48,10 +54,14 @@ module SpreeCmCommissioner
 
     before_create :generate_bib, if: -> { line_item.reload && variant.bib_pre_generation_on_create? }
 
+    after_create :preload_order_block_ids, if: -> { block_id.present? }
+    after_update :preload_order_block_ids, if: :saved_change_to_block_id?
+    after_destroy :preload_order_block_ids
+
     validates :seat_number, uniqueness: { scope: :event_id }, allow_nil: true, if: -> { event_id.present? }
     validates :bib_index, uniqueness: true, allow_nil: true
 
-    self.whitelisted_ransackable_associations = %w[id_card event line_item]
+    self.whitelisted_ransackable_associations = %w[id_card event]
     self.whitelisted_ransackable_attributes = %w[first_name last_name phone_number gender contact occupation_id card_type created_at check_in_status]
 
     def self.csv_importable_columns
@@ -227,6 +237,14 @@ module SpreeCmCommissioner
         filled_bib_number
       end
     end
+
+    def preload_order_block_ids
+      return if line_item.blank?
+      return if line_item.order.blank?
+
+      block_ids = line_item.order.blocks.pluck(:id)
+      line_item.order.update(preload_block_ids: block_ids)
+    end
   end
 end
 # rubocop:enable Metrics/ClassLength

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