spree_cm_commissioner 2.0.0.pre.pre → 2.0.1.pre.pre

data/app/controllers/spree_cm_commissioner/well_known_controller.rb

@@ -3,18 +3,42 @@ module SpreeCmCommissioner
     before_action :identify_request_source
     rescue_from StandardError, with: :handle_error
 
-    def show
-      case params[:id]
-      when 'assetlinks.json'
-        render_preference(:preferred_assetlinks)
-      when 'apple-app-site-association'
-        render_preference(:preferred_apple_app_site_association)
+    def assetlinks_json
+      render_platform_link(:android)
+    end
+
+    def apple_app_site_association
+      render_platform_link(:ios)
+    end
+
+    private
+
+    def render_platform_link(platform)
+      fetcher_class = platform_link_finder(platform)
+
+      result = fetcher_class.call(
+        store: @store,
+        tenant: @tenant,
+        refreshed: params[:_refreshed].present?
+      )
+
+      if result.success? && result.contents.present?
+        render json: result.contents
       else
         render_not_found
       end
     end
 
-    private
+    def platform_link_finder(platform)
+      case platform
+      when :android
+        SpreeCmCommissioner::AssetLinksFetcher
+      when :ios
+        SpreeCmCommissioner::AppleAppSiteAssociationFetcher
+      else
+        render_not_found
+      end
+    end
 
     def identify_request_source
       host = params[:original_host].presence || request.host.downcase
@@ -25,16 +49,6 @@ module SpreeCmCommissioner
       @tenant = result.tenant
     end
 
-    def render_preference(preference_key)
-      if @store&.send(preference_key).present?
-        render json: @store.send(preference_key)
-      elsif @tenant&.send(preference_key).present?
-        render json: @tenant.send(preference_key)
-      else
-        render_not_found
-      end
-    end
-
     def render_not_found
       render json: { error: 'Not found' }, status: :not_found
     end

data/app/interactors/spree_cm_commissioner/apple_app_site_association_fetcher.rb

@@ -0,0 +1,27 @@
+module SpreeCmCommissioner
+  class AppleAppSiteAssociationFetcher < BaseInteractor
+    delegate :store, :tenant, :refreshed, to: :context
+
+    def call
+      key = cache_key
+
+      CmAppLogger.log(label: 'LOOKING_UP_CACHE', data: { cache_key: key })
+
+      Rails.cache.delete(key) if refreshed
+
+      context.contents = Rails.cache.fetch(key) do
+        CmAppLogger.log(label: 'CACHE_MISS', data: { cache_key: key })
+        resource.preferred_apple_app_site_association
+      end
+    end
+
+    def cache_key
+      updated_at = tenant&.updated_at || store&.updated_at
+      "well_known:apple-app-site-association:#{resource.class.name}:#{resource.id}:#{updated_at}"
+    end
+
+    def resource
+      tenant || store
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/asset_links_fetcher.rb

@@ -0,0 +1,27 @@
+module SpreeCmCommissioner
+  class AssetLinksFetcher < BaseInteractor
+    delegate :store, :tenant, :refreshed, to: :context
+
+    def call
+      key = cache_key
+
+      CmAppLogger.log(label: 'LOOKING_UP_CACHE', data: { cache_key: key })
+
+      Rails.cache.delete(key) if refreshed
+
+      context.contents = Rails.cache.fetch(key) do
+        CmAppLogger.log(label: 'CACHE_MISS', data: { cache_key: key })
+        resource.preferred_assetlinks
+      end
+    end
+
+    def cache_key
+      updated_at = tenant&.updated_at || store&.updated_at
+      "well_known:assetlinks.json:#{resource.class.name}:#{resource.id}:#{updated_at}"
+    end
+
+    def resource
+      tenant || store
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/crew_invite_link_handler.rb

@@ -0,0 +1,48 @@
+module SpreeCmCommissioner
+  class CrewInviteLinkHandler < BaseInteractor
+    delegate :params, to: :context
+
+    def call
+      validate_data
+      assign_role_to_user
+      create_user_event
+    end
+
+    private
+
+    def validate_data
+      if invite.nil?
+        context.fail!(message: I18n.t('invite.url_not_found'))
+      else
+        context.invite = invite
+      end
+    end
+
+    def assign_role_to_user
+      return if user.operator?
+
+      role = Spree::Role.find_by(name: 'operator')
+      role_user = Spree::RoleUser.new(user_id: user.id, role_id: role.id)
+      role_user.save
+    end
+
+    def create_user_event
+      @user_event = SpreeCmCommissioner::UserEvent.new(
+        taxon_id: invite.taxon_id,
+        user_id: user.id
+      )
+
+      return if @user_event.save
+
+      context.fail!(message: I18n.t('invite.already_invited'))
+    end
+
+    def invite
+      @invite ||= SpreeCmCommissioner::Invite.find_by(token: params[:id])
+    end
+
+    def user
+      @user ||= Spree::User.find(params[:user_id])
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/telegram_chats_auto_finder.rb

@@ -0,0 +1,144 @@
+module SpreeCmCommissioner
+  class TelegramChatsAutoFinder < BaseInteractor
+    delegate :contact, :pin_code, to: :context
+
+    def call
+      context.chats = []
+      context.verified_chat_ids = []
+
+      updates = fetch_updates
+
+      if updates['result'].any?
+        updates['result'].sort_by { |u| u['update_id'] }.reverse.each do |update|
+          handle_message_update(update) if update['message']
+          handle_channel_post_update(update) if update['channel_post']
+          handle_chat_member_update(update) if update['my_chat_member']
+        end
+      end
+      context.fail!(message: 'No pin codes verified') if context.verified_chat_ids.empty?
+    end
+
+    private
+
+    def handle_chat_member_update(update)
+      chat = update.dig('my_chat_member', 'chat')
+      return unless chat
+
+      chat_data = {
+        id: chat['id'],
+        title: chat['title'] || 'Unnamed Chat',
+        type: chat['type']
+      }
+
+      return if context.chats.any? { |c| c[:id] == chat_data[:id] }
+
+      db_chat = SpreeCmCommissioner::TelegramChat.find_or_initialize_by(chat_id: chat_data[:id])
+      is_new_chat = db_chat.new_record?
+      db_chat.update(chat_title: chat_data[:title], chat_type: chat_data[:type])
+      context.chats << chat_data
+      message = "👋Hello! This is Bookme+ bot.\n\nPlease enter the 6-digit PIN code displayed in your portal."
+      send_message(chat_data[:id], message) if is_new_chat
+    end
+
+    def handle_channel_post_update(update)
+      message = update['channel_post']
+      process_pin_code_message(message)
+    end
+
+    def handle_message_update(update)
+      message = update['message']
+      process_pin_code_message(message)
+    end
+
+    def process_pin_code_message(message)
+      chat_id = message.dig('chat', 'id')
+      text = message['text']&.strip
+
+      return unless valid_pin_code?(text, chat_id)
+
+      pin_code_record = find_pin_code_record
+      return unless pin_code_record
+
+      vendor = find_vendor
+      return unless vendor
+
+      chat = update_telegram_chat(message, chat_id)
+      return unless chat
+
+      handle_successful_verification(chat, vendor, pin_code_record)
+    end
+
+    def valid_pin_code?(text, chat_id)
+      text && chat_id && text == pin_code
+    end
+
+    def find_pin_code_record
+      pin_code_record = SpreeCmCommissioner::PinCodeTelegram.find_by(code: pin_code, contact: contact)
+      unless pin_code_record
+        context.fail!(message: "Pin code #{pin_code} not found for contact #{contact}")
+        return nil
+      end
+      pin_code_record
+    end
+
+    def find_vendor
+      vendor = Spree::Vendor.find_by(id: contact)
+      unless vendor
+        context.fail!(message: "Vendor not found for contact #{contact}")
+        return nil
+      end
+      vendor
+    end
+
+    def update_telegram_chat(message, chat_id)
+      chat = SpreeCmCommissioner::TelegramChat.find_or_initialize_by(chat_id: chat_id)
+      unless chat.update(
+        chat_title: message.dig('chat', 'title') || 'Unnamed Chat',
+        chat_type: message.dig('chat', 'type')
+      )
+        context.fail!(message: "Failed to update chat: #{chat.errors.full_messages.join(', ')}")
+        return nil
+      end
+
+      context.chats << { id: chat.chat_id, title: chat.chat_title, type: chat.chat_type }
+      chat
+    end
+
+    def handle_successful_verification(chat, vendor, pin_code_record)
+      return if chat.vendor && chat.vendor != vendor
+
+      update_vendor_preferences(vendor, chat)
+      chat.update(active: true, vendor: vendor)
+      expire_pin_code(pin_code_record)
+      send_success_message(chat.chat_id, vendor.name)
+      context.verified_chat_ids << chat.chat_id
+    end
+
+    def update_vendor_preferences(vendor, chat)
+      vendor.update(
+        preferred_telegram_chat_id: chat.chat_id,
+        preferred_telegram_chat_name: chat.chat_title,
+        preferred_telegram_chat_type: chat.chat_type
+      )
+    end
+
+    def expire_pin_code(pin_code_record)
+      pin_code_record.expire
+      pin_code_record.save
+    end
+
+    def send_success_message(chat_id, vendor_name)
+      message = "✅ PIN code verified successfully! This chat is now connected to <b>#{vendor_name}</b>.\n\n" \
+                'All completed orders will be sent to this chat.'
+      send_message(chat_id, message)
+    end
+
+    def fetch_updates
+      ::Telegram.bot.get_updates
+    end
+
+    def send_message(chat_id, text)
+      ::Telegram.bot.send_message(chat_id: chat_id, text: text, parse_mode: 'HTML')
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/vattanac_bank_initiator.rb

@@ -93,6 +93,10 @@ 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
 
@@ -101,7 +105,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}"
+        webUrl: "#{Spree::Store.default.formatted_url}/vattanac_bank_web_app?session_id=#{session_id}&ds=#{CGI.escape(disable_services)}"
       }
 
       json_data = raw_data.to_json

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

@@ -0,0 +1,30 @@
+module SpreeCmCommissioner
+  module EventCheckInFlowable
+    extend ActiveSupport::Concern
+
+    included do
+      preference :group_check_in_enabled, :boolean, default: true
+      preference :individual_check_in_enabled, :boolean, default: true
+
+      before_validation :validate_at_least_one_check_in_flow_presence
+    end
+
+    def check_in_flows
+      flows = []
+      flows << 'group' if group_check_in_enabled?
+      flows << 'individual' if individual_check_in_enabled?
+      flows
+    end
+
+    def group_check_in_enabled? = preferred_group_check_in_enabled
+    def individual_check_in_enabled? = preferred_individual_check_in_enabled
+
+    private
+
+    def validate_at_least_one_check_in_flow_presence
+      return if check_in_flows.any?
+
+      errors.add(:check_in_flows, 'must have at least one flow selected')
+    end
+  end
+end

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

@@ -40,7 +40,8 @@ module SpreeCmCommissioner
       'bib-zerofill' => 'integer',
       'bib-display-prefix' => 'boolean',
       'bib-pre-generation-on-create' => 'boolean',
-      'seat-number-positions' => 'array'
+      'seat-number-positions' => 'array',
+      'seat-type' => 'string'
     }.freeze
 
     included do

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

@@ -5,6 +5,10 @@ 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/blazer_queryable.rb

@@ -0,0 +1,8 @@
+module SpreeCmCommissioner
+  class BlazerQueryable < SpreeCmCommissioner::Base
+    belongs_to :queryable, polymorphic: true
+    belongs_to :blazer_query, class_name: 'Blazer::Query'
+
+    validates :queryable_id, uniqueness: { scope: %i[queryable_type blazer_query_id], message: I18n.t('event_blazer_queries.fail') }
+  end
+end

data/app/models/spree_cm_commissioner/crew_invite_link.rb

@@ -0,0 +1,4 @@
+module SpreeCmCommissioner
+  class CrewInviteLink < Invite
+  end
+end

data/app/models/spree_cm_commissioner/dynamic_field.rb

@@ -1,20 +1,34 @@
 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: { string: 0, integer: 1, boolean: 2, checkbox: 3, radio: 4 }
+    enum data_type: { text: 0, number: 1, boolean: 2, checkbox: 3, radio: 4, selection: 5, textarea: 6 }
 
     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 selection?
-      checkbox? || radio?
+    def multiple_select=(value)
+      self.configurations ||= {}
+      self.configurations['multiple_select'] = ActiveModel::Type::Boolean.new.cast(value)
     end
   end
 end

data/app/models/spree_cm_commissioner/dynamic_field_option.rb

@@ -1,8 +1,14 @@
 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
@@ -10,7 +16,7 @@ module SpreeCmCommissioner
     def parent_field_must_be_selection_type
       return unless dynamic_field
 
-      return if dynamic_field.selection?
+      return if dynamic_field.requires_dynamic_field_options?
 
       errors.add(:dynamic_field, 'must be a selection type field')
     end

data/app/models/spree_cm_commissioner/guest.rb

@@ -61,7 +61,7 @@ module SpreeCmCommissioner
     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]
+    self.whitelisted_ransackable_associations = %w[id_card event line_item]
     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

data/app/models/spree_cm_commissioner/guest_dynamic_field.rb

@@ -2,9 +2,11 @@ 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
 
@@ -12,14 +14,30 @@ module SpreeCmCommissioner
       return if dynamic_field.blank?
 
       case dynamic_field.data_type.to_s
-      when 'integer'
+      when 'number'
         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 1 0].include?(value.to_s.downcase)
-      when 'checkbox', 'radio'
+        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
         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/models/spree_cm_commissioner/invite.rb

@@ -5,16 +5,14 @@ module SpreeCmCommissioner
     has_many :invite_user_events, class_name: 'SpreeCmCommissioner::InviteUserEvent', dependent: :destroy
     scope :active, -> { where('expires_at > ?', Time.current) }
 
-    after_create :set_expiration
-
-    def set_expiration
-      update(expires_at: 3.days.from_now)
-    end
-
     def invite_url
       "#{Spree::Store.default.formatted_url}/invite/#{token}?utm_source=email"
     end
 
+    def invite_crew_link
+      "#{Spree::Store.default.formatted_url}/invite_crews/#{token}"
+    end
+
     def url_valid?
       expires_at.present? && expires_at > Time.current
     end

data/app/models/spree_cm_commissioner/invite_team.rb

@@ -1,5 +1,7 @@
 module SpreeCmCommissioner
   class InviteTeam < SpreeCmCommissioner::Base
+    validates :email, presence: true, uniqueness: { scope: :vendor_id, message: I18n.t('invite.already_invited') }
+
     belongs_to :user, class_name: 'Spree::User', optional: true
     belongs_to :inviter, class_name: 'Spree::User'
     belongs_to :vendor, class_name: 'Spree::Vendor'
@@ -34,7 +36,7 @@ module SpreeCmCommissioner
     end
 
     def invitation_link
-      "http://#{ENV.fetch('APP_HOST')}/organizer/invite_teams/#{token}?utm_source=email"
+      "#{ENV.fetch('ORGANIZER_URL')}/invite_teams/#{token}?utm_source=email"
     end
 
     def url_valid?

data/app/models/spree_cm_commissioner/pin_code.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   class PinCode < SpreeCmCommissioner::Base
     has_secure_token
 
-    enum contact_type: { 'phone_number' => 0, 'email' => 1 }
+    enum contact_type: { 'phone_number' => 0, 'email' => 1, 'telegram' => 2 }
 
     validates :code, length: { maximum: 6 }
     validates :contact, presence: true
@@ -130,7 +130,8 @@ module SpreeCmCommissioner
         'SpreeCmCommissioner::PinCodeMobileConfirm' => I18n.t('pincode.readable_type.confirmation_code'),
         'SpreeCmCommissioner::PinCodeUpdateUserLogin' => I18n.t('pincode.readable_type.update_user_login'),
         'SpreeCmCommissioner::PinCodeEmailConfirm' => I18n.t('pincode.readable_type.confirmation_code'),
-        'SpreeCmCommissioner::OtpCode' => I18n.t('pincode.readable_type.otp_code')
+        'SpreeCmCommissioner::OtpCode' => I18n.t('pincode.readable_type.otp_code'),
+        'SpreeCmCommissioner::PinCodeTelegram' => I18n.t('pincode.readable_type.telegram_verification')
       }
     end
 

data/app/models/spree_cm_commissioner/pin_code_telegram.rb

@@ -0,0 +1,28 @@
+module SpreeCmCommissioner
+  class PinCodeTelegram < PinCode
+    before_validation :set_telegram_attrs, on: :create
+    validates :contact, presence: true, numericality: { only_integer: true }, if: :telegram?
+
+    belongs_to :vendor, class_name: 'Spree::Vendor', foreign_key: 'contact', primary_key: 'id'
+
+    def telegram?
+      true
+    end
+
+    def expires_in_seconds
+      5 * 60
+    end
+
+    def expired?
+      expired_at < Time.zone.now
+    end
+
+    private
+
+    def set_telegram_attrs
+      self.contact_type = :telegram
+      self.type = 'SpreeCmCommissioner::PinCodeTelegram'
+      self.expired_at = Time.zone.now + expires_in_seconds unless expired_at
+    end
+  end
+end

data/app/models/spree_cm_commissioner/place.rb

@@ -15,7 +15,6 @@ module SpreeCmCommissioner
     has_many :products, through: :product_places
 
     has_many :children, -> { order(:lft) }, class_name: 'SpreeCmCommissioner::Place', foreign_key: :parent_id, dependent: :destroy
-    has_many :vendor_stops, class_name: 'SpreeCmCommissioner::VendorStop', dependent: :destroy, foreign_key: :stop_id
 
     has_many :taxon_places, class_name: 'SpreeCmCommissioner::TaxonPlace', dependent: :destroy
     has_many :taxons, through: :taxon_places

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -75,8 +75,6 @@ module SpreeCmCommissioner
 
       base.enum purchasable_on: { both: 0, web: 1, app: 2 }
 
-      base.accepts_nested_attributes_for :trip, allow_destroy: true
-
       base.multi_tenant :tenant, class_name: 'SpreeCmCommissioner::Tenant'
       base.before_save :set_tenant
     end

data/app/models/spree_cm_commissioner/promotion_category_decorator.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  module PromotionCategoryDecorator
+    def self.prepended(base)
+      base.belongs_to :vendor, class_name: 'Spree::Vendor', optional: true
+    end
+  end
+end
+
+unless Spree::PromotionCategory.included_modules.include?(SpreeCmCommissioner::PromotionCategoryDecorator)
+  Spree::PromotionCategory.prepend(SpreeCmCommissioner::PromotionCategoryDecorator)
+end

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -3,6 +3,7 @@ module SpreeCmCommissioner
     def self.prepended(base) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       base.include SpreeCmCommissioner::TaxonKind
       base.include SpreeCmCommissioner::ParticipationTypeBitwise
+      base.include SpreeCmCommissioner::EventCheckInFlowable
 
       base.preference :background_color, :string
       base.preference :foreground_color, :string
@@ -55,14 +56,16 @@ module SpreeCmCommissioner
       base.has_many :crew_invites, class_name: 'SpreeCmCommissioner::CrewInvite', dependent: :destroy
       base.has_many :invite_user_events, through: :user_events, class_name: 'SpreeCmCommissioner::InviteUserEvent'
 
+      base.has_many :crew_invite_links, class_name: 'SpreeCmCommissioner::CrewInviteLink', dependent: :destroy
+
       base.has_many :invite_guests, class_name: 'SpreeCmCommissioner::InviteGuest', foreign_key: :event_id
 
       base.has_many :line_items, through: :products
       base.has_many :event_line_items, class_name: 'Spree::LineItem', foreign_key: :event_id
       base.has_many :event_products, class_name: 'Spree::Product', foreign_key: :event_id
 
-      base.has_many :event_blazer_queries, class_name: 'SpreeCmCommissioner::TaxonBlazerQuery'
-      base.has_many :blazer_queries, through: :event_blazer_queries, class_name: 'Blazer::Query'
+      base.has_many :event_blazer_queries, as: :queryable, class_name: 'SpreeCmCommissioner::BlazerQueryable'
+      base.has_many :blazer_queries, through: :event_blazer_queries, source: :blazer_query, class_name: 'Blazer::Query'
 
       base.has_many :taxon_option_types, class_name: 'SpreeCmCommissioner::TaxonOptionType'
       base.has_many :taxon_option_values, class_name: 'SpreeCmCommissioner::TaxonOptionValue'