spree_cm_commissioner 2.8.3.pre.pre13 → 2.8.4.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eedbddb863eb9f58dad73a83892a225e971a89736c37af047df757d76bcfc058
-  data.tar.gz: 59eaad5012be611640f1c27f6566bfb91cd7b5cea176d465be69c4230c8b9241
+  metadata.gz: 6b4cb4f14de6554d09bdd97872267ca1f23e73d144401b49a8969203e601b910
+  data.tar.gz: 454758bb34c6df3a4f1e2272b65bb19f57e7d829c06c045d7f748a72a56cb42f
 SHA512:
-  metadata.gz: aa9db90a1c39aaa74f66135c5034cb8762e09123edaad154fb5fe6e013609b5344d23910bd8449380030c5b3e391b3a3792c92b569f5fbe2271d6e78420e55e6
-  data.tar.gz: 80c51833f840ba8b4db0611309153c7a7723fd986f065113a06063ac7d5aee78cce2af29dd2eb591b64a90c57a75f1f4716b9d7daf2664903ff34ad031f663e4
+  metadata.gz: 3dea963b405471ddcf3a1b7819bab6d7ffca7b76f0567b6a0092262b5b8d980db83fc052c4913f06ff42921727bc4168c2c044beeeb38ddc65ef242071918f34
+  data.tar.gz: f9a841e7c01222124a041e65adf42b7e6d57b53fdc8e731c08e595dbceb601fb45fbe7ef6850df709d454b75220c4e58da2af1f8c2d0bb37d58ab00bc4c2031c

data/.github/workflows/test_and_build_gem.yml

@@ -164,8 +164,7 @@ jobs:
         env:
           DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
         run: |
-          # Using --no-threads to bypass a known Ruby 3.2.0 GC segmentation fault in CI.
-          bundle exec brakeman --no-threads --no-exit-on-warn
+          bundle exec brakeman --no-exit-on-warn
 
   test:
     needs: [setup]

data/.gitignore

@@ -34,9 +34,3 @@ vendor/bundle/
 # Cursor
 .cursor
 dump.rdb
-# Added by code-review-graph
-.code-review-graph/
-.cursorrules
-.claude
-CLAUDE.md
-AGENTS.md

data/Gemfile.lock

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

data/app/controllers/concerns/spree_cm_commissioner/content_cachable.rb

@@ -16,7 +16,6 @@ module SpreeCmCommissioner
       GuestCardClassesController
       SeatLayoutController
       CmsPagesController
-      AdvertisementsController
     ].freeze
 
     # Priority 2: Semi-Static (1 hour)
@@ -26,7 +25,6 @@ module SpreeCmCommissioner
       HomepageDataController
       PopularRoutesController
       RoutePlacesController
-      ShowsController
     ].freeze
 
     # Priority 3: Moderate Freshness (30 minutes)

data/app/controllers/spree/admin/homepage_section_controller.rb

@@ -51,10 +51,7 @@ module Spree
       def permitted_resource_params
         segment_value = helpers.calculate_segment_value(params[:spree_cm_commissioner_homepage_section])
 
-        params
-          .require(:spree_cm_commissioner_homepage_section)
-          .permit(:title, :description, :active, :tenant_id, :preview)
-          .merge(segment: segment_value)
+        params.require(:spree_cm_commissioner_homepage_section).permit(:title, :description, :active, :tenant_id).merge(segment: segment_value)
       end
 
       def load_tenants

data/app/controllers/spree/admin/taxons_controller_decorator.rb

@@ -3,7 +3,6 @@ module Spree
     module TaxonsControllerDecorator
       def self.prepended(base)
         base.before_action :build_assets, only: %i[create update]
-        base.before_action :normalize_sti_taxon_params, only: %i[create update]
       end
 
       # override
@@ -28,6 +27,10 @@ module Spree
         remove_asset(@taxon.home_banner)
       end
 
+      def remove_ad_banner
+        remove_asset(@taxon.ad_banner)
+      end
+
       def remove_video_banner
         remove_asset(@taxon.video_banner)
       end
@@ -49,26 +52,9 @@ module Spree
         @taxon.build_app_banner(attachment: permitted_resource_params.delete(:app_banner)) if permitted_resource_params[:app_banner]
         @taxon.build_web_banner(attachment: permitted_resource_params.delete(:web_banner)) if permitted_resource_params[:web_banner]
         @taxon.build_home_banner(attachment: permitted_resource_params.delete(:home_banner)) if permitted_resource_params[:home_banner]
+        @taxon.build_ad_banner(attachment: permitted_resource_params.delete(:ad_banner)) if permitted_resource_params[:ad_banner]
         @taxon.build_video_banner(attachment: permitted_resource_params.delete(:video_banner)) if permitted_resource_params[:video_banner]
       end
-
-      # Some admin forms submit STI records under their class key
-      # (e.g. :spree_cm_commissioner_show) while Spree update reads :taxon.
-      # Merge both into :taxon so all edited fields are persisted.
-      def normalize_sti_taxon_params
-        return unless @taxon
-
-        sti_key = @taxon.class.model_name.param_key.to_sym
-        sti_params = params[sti_key]
-        return unless sti_params.is_a?(::ActionController::Parameters)
-
-        base_params = params[:taxon]
-        base_hash = base_params.is_a?(::ActionController::Parameters) ? base_params.to_unsafe_h : {}
-        sti_hash = sti_params.to_unsafe_h
-        merged_params = ::ActionController::Parameters.new(base_hash.merge(sti_hash))
-
-        params[:taxon] = merged_params
-      end
     end
   end
 end

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

@@ -31,13 +31,15 @@ module Spree
           def create
             spree_authorize! :update, spree_current_order, order_token
 
-            resource = scope.new(guest_params)
+            result = SpreeCmCommissioner::Cart::CreateGuest.call(
+              line_item: parent,
+              options: guest_params
+            )
 
-            if resource.save
-              resource.save_and_move_to_next_stage
-              render_serialized_payload(201) { serialize_resource(resource) }
+            if result.success?
+              render_serialized_payload(201) { serialize_resource(result.value) }
             else
-              render_error_payload(resource.errors, 422)
+              render_error_payload(result.value.errors, 422)
             end
           end
 

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

@@ -19,7 +19,6 @@ module Spree
             @collection ||= model_class.filter_by_segment(params[:homepage_id] || :general)
                                        .active
                                        .where(tenant_id: nil)
-                                       .where(preview: false)
                                        .order(position: :asc)
           end
         end

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

@@ -16,10 +16,6 @@ module Spree
             set_current_tenant(@tenant)
           end
 
-          def current_vendor
-            @current_vendor ||= @tenant.active_vendor
-          end
-
           def render_serialized_payload(status = 200)
             render json: yield, status: status, content_type: content_type
           end

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

@@ -5,7 +5,6 @@ module Spree
         class HomepageSectionsController < BaseController
           def collection
             @collection ||= scope.filter_by_segment(params[:homepage_id] || :general)
-                                 .where(preview: false)
                                  .active
                                  .order(position: :asc)
           end

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

@@ -21,7 +21,7 @@ module Spree
 
           def scope
             MultiTenant.with(@tenant) do
-              model_class.where(tenant_id: MultiTenant.current_tenant_id, preview: false)
+              model_class.where(tenant_id: MultiTenant.current_tenant_id)
             end
           end
 

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

@@ -31,7 +31,7 @@ module Spree
 
           def scope
             MultiTenant.with(@tenant) do
-              model_class.where(preview: false)
+              model_class
             end
           end
 

data/app/controllers/spree_cm_commissioner/admin/products_controller_decorator.rb

@@ -6,7 +6,6 @@ module SpreeCmCommissioner
         base.around_action :set_writing_role, only: %i[index]
         base.after_action :set_tenant_after_update, only: %i[update]
         base.before_action :merge_industry_taxons_into_taxons, only: [:update]
-        base.before_action :normalize_sti_product_params, only: %i[create update]
       end
 
       # Override
@@ -52,24 +51,6 @@ module SpreeCmCommissioner
 
       protected
 
-      # Some admin forms submit STI records under their class key while
-      # Spree update reads :product. Merge both into :product so all edited
-      # fields are persisted for STI product subclasses.
-      def normalize_sti_product_params
-        return unless @product
-
-        sti_key = @product.class.model_name.param_key.to_sym
-        sti_params = params[sti_key]
-        return unless sti_params.is_a?(::ActionController::Parameters)
-
-        base_params = params[:product]
-        base_hash = base_params.is_a?(::ActionController::Parameters) ? base_params.to_unsafe_h : {}
-        sti_hash = sti_params.to_unsafe_h
-        merged_params = ::ActionController::Parameters.new(base_hash.merge(sti_hash))
-
-        params[:product] = merged_params
-      end
-
       def merge_industry_taxons_into_taxons
         return if params[:product].blank?
 

data/app/finders/spree_cm_commissioner/events/find_matches.rb

@@ -7,7 +7,6 @@ module SpreeCmCommissioner
       def execute
         scope.joins(:integration_mappings).where(
           kind: :event,
-          preview: false,
           integration_mappings: { status: :active }
         ).distinct
       end

data/app/helpers/spree_cm_commissioner/admin/homepage_segment_helper.rb

@@ -15,8 +15,6 @@ module SpreeCmCommissioner
           'badge badge-success text-uppercase'
         when :football
           'badge badge-dark text-uppercase'
-        when :show
-          'badge badge-danger text-uppercase'
         else
           'badge'
         end

data/app/interactors/spree_cm_commissioner/waiting_guests_caller.rb

@@ -3,6 +3,9 @@ require 'google/cloud/firestore'
 # TODO: alert when available_slots is negative.
 module SpreeCmCommissioner
   class WaitingGuestsCaller < BaseInteractor
+    MIN_WAIT_TO_ENTER_SECONDS = 120 # 2 min floor — Waiting Room step (full journey, more uncertainty)
+    MIN_QUEUE_TO_ENTER_SECONDS = 60 # 1 min floor — Queue step (position assigned, one caller cycle minimum)
+
     def call
       available_slots = fetch_available_slots
       return unless available_slots.positive?
@@ -10,7 +13,12 @@ module SpreeCmCommissioner
       long_waiting_guests = fetch_long_waiting_guests(available_slots)
       calling_all(long_waiting_guests)
 
-      mark_as(full: long_waiting_guests.size >= available_slots, available_slots: available_slots - long_waiting_guests.size)
+      mark_as(
+        full: long_waiting_guests.size >= available_slots,
+        available_slots: available_slots - long_waiting_guests.size,
+        avg_wait_to_enter_seconds: compute_avg_wait_to_enter_seconds(long_waiting_guests),
+        avg_queue_to_enter_seconds: compute_avg_queue_to_enter_seconds(long_waiting_guests)
+      )
     end
 
     def fetch_available_slots
@@ -78,10 +86,36 @@ module SpreeCmCommissioner
       1.day.ago.strftime('%Y-%m-%d')
     end
 
-    # When open app, app request to check whether room is full or not via Firebase instead of server to minimize server requests.
     # merge: true so we preserve the published `waiting_guests_records_path` on the lobby doc.
-    def mark_as(full:, available_slots:)
-      lobby_document.set({ full: full, available_slots: available_slots }, merge: true)
+    def mark_as(full:, available_slots:, avg_wait_to_enter_seconds: nil, avg_queue_to_enter_seconds: nil)
+      data = { full: full, available_slots: available_slots }
+      data[:avg_wait_to_enter_seconds] = avg_wait_to_enter_seconds if avg_wait_to_enter_seconds
+      data[:avg_queue_to_enter_seconds] = avg_queue_to_enter_seconds if avg_queue_to_enter_seconds
+      lobby_document.set(data, merge: true)
+    end
+
+    # Average total wait (queued_at → allow_to_enter_room_at) for just-called guests.
+    # Used for the Waiting Room step ETA: how long until I get in from when I joined.
+    def compute_avg_wait_to_enter_seconds(guests)
+      return nil if guests.empty?
+
+      now = Time.zone.now
+      total = guests.sum { |doc| (now - doc.data[:queued_at].to_time).to_f }
+      [(total / guests.size).round, MIN_WAIT_TO_ENTER_SECONDS].max
+    end
+
+    # Average queue wait (position_set_at → allow_to_enter_room_at) for just-called guests.
+    # Used for the Queue step ETA: how long after getting a position until I actually enter.
+    # Returns nil when none of the called guests had position_set_at (first run, or no prior stamp).
+    def compute_avg_queue_to_enter_seconds(guests)
+      return nil if guests.empty?
+
+      now = Time.zone.now
+      positioned = guests.select { |doc| doc.data[:position_set_at] }
+      return nil if positioned.empty?
+
+      total = positioned.sum { |doc| (now - doc.data[:position_set_at].to_time).to_f }
+      [(total / positioned.size).round, MIN_QUEUE_TO_ENTER_SECONDS].max
     end
 
     def lobby_data

data/app/jobs/spree_cm_commissioner/waiting_room/stamp_queue_positions_job.rb

@@ -0,0 +1,84 @@
+require 'google/cloud/firestore'
+
+module SpreeCmCommissioner
+  module WaitingRoom
+    class StampQueuePositionsJob < ApplicationJob
+      queue_as :waiting_room
+
+      STAMP_LIMIT = (ENV['WAITING_ROOM_POSITION_STAMP_LIMIT'] || 1000).to_i
+
+      def perform
+        paths = stamp_paths
+        avg_queue_to_enter = lobby_data[:avg_queue_to_enter_seconds].to_i
+        total = paths.sum { |p| waiting_count(p) }
+        return if total.zero?
+
+        stamped_at = Time.zone.now
+        global = 0
+
+        paths.each do |path|
+          remaining = STAMP_LIMIT - global
+          break if remaining <= 0
+
+          docs = waiting_query(path).order('queued_at').limit(remaining).get.to_a
+          docs.each_slice(500) do |slice|
+            firestore.batch do |b|
+              slice.each do |doc|
+                global += 1
+                data = {
+                  position: global,
+                  queue_total: total,
+                  estimated_wait_seconds: avg_queue_to_enter,
+                  status_updated_at: stamped_at
+                }
+                data[:position_set_at] = stamped_at unless doc.data[:position_set_at]
+                b.update(doc.ref, data)
+              end
+            end
+          end
+        end
+      end
+
+      private
+
+      def stamp_paths
+        [previous_records_path, records_path]
+      end
+
+      def records_path
+        default_records_path(Time.zone.now.strftime('%Y-%m-%d'))
+      end
+
+      def previous_records_path
+        default_records_path(1.day.ago.strftime('%Y-%m-%d'))
+      end
+
+      def default_records_path(date)
+        "waiting_guests/#{date}/records"
+      end
+
+      def waiting_count(path)
+        waiting_query(path).aggregate_query.add_count.get.first.get.to_i
+      end
+
+      def waiting_query(path)
+        firestore.col(path).where('allow_to_enter_room_at', '==', nil)
+      end
+
+      def lobby_data
+        @lobby_data ||= firestore.col('waiting_rooms').doc('lobby').get.data || {}
+      end
+
+      def firestore
+        @firestore ||= Google::Cloud::Firestore.new(
+          project_id: service_account[:project_id],
+          credentials: service_account
+        )
+      end
+
+      def service_account
+        @service_account ||= Rails.application.credentials.cloud_firestore_service_account
+      end
+    end
+  end
+end

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

@@ -8,8 +8,7 @@ module SpreeCmCommissioner
       tour: 0b00100,
       accommodation: 0b01000,
       things_to_do: 0b10000,
-      football: 0b100000,
-      show: 0b1000000
+      football: 0b100000
     }.freeze
 
     BIT_SEGMENT.each do |segment, bit_value|

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

@@ -14,8 +14,8 @@ module SpreeCmCommissioner
       validate :validate_total_kids, if: -> { valid_integer_metadata?('number_of_kids') }
     end
 
-    def number_of_adults = public_metadata['number_of_adults']&.to_i || (variant.number_of_adults * quantity)
-    def number_of_kids = public_metadata['number_of_kids']&.to_i || (variant.number_of_kids * quantity)
+    def number_of_adults = metadata_guest_count('number_of_adults') || (variant.number_of_adults * quantity)
+    def number_of_kids = metadata_guest_count('number_of_kids') || (variant.number_of_kids * quantity)
     def number_of_guests = number_of_adults + number_of_kids
 
     def allowed_extra_adults = variant.allowed_extra_adults * quantity
@@ -26,6 +26,10 @@ module SpreeCmCommissioner
 
     def remaining_total_guests = [number_of_guests - guests.size, 0].max
 
+    # True when the guest count is set via the public_metadata override (accommodation/transit),
+    # i.e. decoupled from quantity rather than derived from variant.number_of_guests * quantity.
+    def custom_guest_count? = public_metadata['number_of_adults'].to_i.positive? || public_metadata['number_of_kids'].to_i.positive?
+
     def generate_remaining_guests
       return if remaining_total_guests.zero?
 
@@ -82,6 +86,16 @@ module SpreeCmCommissioner
       value.present? && value.to_s.match?(/\A-?\d+\z/)
     end
 
+    # public_metadata override for a guest count, only when it's a non-negative integer;
+    # nil otherwise so callers fall back to the variant default. Keeps number_of_guests >= 0
+    # (a negative would make custom_guest_count? false and spin the bump loop in Cart::CreateGuest).
+    def metadata_guest_count(key)
+      return nil unless valid_integer_metadata?(key)
+
+      value = public_metadata[key].to_i
+      value.negative? ? nil : value
+    end
+
     def validate_total_adults
       errors.add(:quantity, 'exceed_total_adults') if public_metadata['number_of_adults'].to_i > allowed_total_adults
     end

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

@@ -45,8 +45,7 @@ module SpreeCmCommissioner
       'color' => 'color',
       'ticket-type' => 'string',
       'seat-type' => 'string',
-      'intercity-taxi' => 'string',
-      'vote-package' => 'integer'
+      'intercity-taxi' => 'string'
     }.freeze
 
     included do

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

@@ -26,10 +26,8 @@ module SpreeCmCommissioner
 
       state_machine.after_transition to: :canceled, do: :precalculate_conversion
       state_machine.after_transition to: :canceled, do: :restock_inventory!
-      state_machine.after_transition to: :canceled, do: :de_allocate_resources
 
       state_machine.after_transition to: :complete, do: :increment_route_fulfilled_order_count
-      state_machine.after_transition to: :complete, do: :allocate_resources
 
       scope :accepted, -> { where(request_state: 'accepted') }
 
@@ -330,13 +328,5 @@ module SpreeCmCommissioner
       factory = OrderTelegramMessageFactory.new(title: title, order: self)
       TelegramNotificationSenderJob.perform_later(chat_id: chat_id, message: factory.message, parse_mode: factory.parse_mode)
     end
-
-    def allocate_resources
-      SpreeCmCommissioner::VotingCreditAllocationJob.perform_later(order_id: id)
-    end
-
-    def de_allocate_resources
-      SpreeCmCommissioner::VotingCreditDeAllocationJob.perform_later(order_id: id)
-    end
   end
 end

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

@@ -5,7 +5,7 @@ module SpreeCmCommissioner
   module ProductType
     extend ActiveSupport::Concern
 
-    PRODUCT_TYPES = %i[accommodation service ecommerce transit show_episode vote_package advertisement].freeze
+    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
 

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

@@ -3,9 +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, industry: 7, agency_category: 8,
-                   ads: 9
-}
+      enum kind: { category: 0, cms: 1, event: 2, occupation: 3, nationality: 4, organization: 5, transit: 6, industry: 7, agency_category: 8 }
     end
   end
 end

data/app/models/spree_cm_commissioner/import.rb

@@ -3,7 +3,7 @@ module SpreeCmCommissioner
     extend FriendlyId
 
     enum :status, { :queue => 0, :progress => 1, :done => 2, :failed => 3 }
-    enum :import_type, { :new_order => 0, :existing_order => 1, :aba_payment_reference => 2, :contestant_import => 3 }
+    enum :import_type, { :new_order => 0, :existing_order => 1, :aba_payment_reference => 2 }
     has_one_attached :imported_file
     friendly_id :name, use: :slugged
 

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -12,10 +12,6 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::StoreMetadata
       base.include SpreeCmCommissioner::HomepageSectionRelatableConcern
 
-      base.delegate :is_open_dated, :is_open_dated?, to: :trip, allow_nil: true
-
-      base.has_many :voting_sessions, class_name: 'SpreeCmCommissioner::VotingSession', foreign_key: :episode_id, dependent: :destroy
-
       base.has_many :variant_kind_option_types, -> { where(kind: :variant).order(:position) },
                     through: :product_option_types, source: :option_type
 
@@ -63,45 +59,8 @@ module SpreeCmCommissioner
 
       base.belongs_to :event, class_name: 'Spree::Taxon', optional: true
 
-      base.has_many :preview_roles, class_name: 'SpreeCmCommissioner::PreviewRole', as: :previewable
       base.has_many :industry_classifications, -> { joins(:taxon).where(spree_taxons: { kind: :industry }) }, class_name: 'Spree::Classification'
       base.has_many :industry_taxons, through: :industry_classifications, source: :taxon
-      base.scope :visible_to, lambda { |user|
-        publicly_available = where(status: :active, preview: false)
-
-        if user
-          # Resolved through associations — avoids hardcoding class names.
-          taxon_type = reflect_on_association(:taxons).klass.polymorphic_name
-
-          # IDs of products that have been explicitly assigned their own PreviewRole.
-          products_with_own_roles = SpreeCmCommissioner::PreviewRole
-                                    .where(previewable_type: polymorphic_name)
-                                    .select(:previewable_id)
-
-          # Path A: product has its own PreviewRole → user must hold that role directly.
-          # Taxon membership is irrelevant for these products.
-          via_product_role = where(status: :active, preview: true)
-                             .where(id: products_with_own_roles)
-                             .where(id: user.preview_roles.where(previewable_type: polymorphic_name).select(:previewable_id))
-
-          # Path B: product has no own PreviewRole → inherit access from its event or taxons.
-          # Accessible if the user holds a preview role for the product's event_id or any
-          # taxon the product belongs to via the classifications join table.
-          allowed_taxon_ids = user.preview_roles.where(previewable_type: taxon_type).select(:previewable_id)
-          preview_no_own = where(status: :active, preview: true).where.not(id: products_with_own_roles)
-
-          via_event_id = preview_no_own.where(event_id: allowed_taxon_ids)
-          via_taxon_join = preview_no_own.joins(:taxons).where(spree_taxons: { id: allowed_taxon_ids })
-
-          publicly_available
-            .or(via_product_role)
-            .or(where(id: via_event_id.select(:id)))
-            .or(where(id: via_taxon_join.select(:id)))
-        else
-          publicly_available
-        end
-      }
-
       base.scope :min_price, lambda { |vendor|
         joins(:prices_including_master)
           .where(vendor_id: vendor.id, product_type: vendor.primary_product_type)
@@ -114,12 +73,6 @@ module SpreeCmCommissioner
           .maximum('spree_prices.price').to_f
       }
       base.scope :subscribable, -> { where(subscribable: 1) }
-      base.scope :advertisements, lambda {
-        advertisement
-          .available
-          .where('spree_products.available_on IS NULL OR spree_products.available_on <= CURRENT_TIMESTAMP')
-          .where('spree_products.discontinue_on IS NULL OR spree_products.discontinue_on > CURRENT_TIMESTAMP')
-      }
 
       base.before_validation :set_event_id
 
@@ -133,11 +86,6 @@ module SpreeCmCommissioner
       base.store_public_metadata :open_dated_validity_days, :integer, default: 90
       base.store_public_metadata :enable_inventory_hold, :boolean, default: false
 
-      base.store_private_metadata :advertise_weight, :integer, default: 1
-      base.store_private_metadata :video_url, :string
-      base.store_private_metadata :skip_after_seconds, :integer, default: 5
-      base.store_private_metadata :duration_seconds, :integer, default: 30
-
       base.after_update :update_variants_vendor_id, if: :saved_change_to_vendor_id?
       base.after_update :sync_event_id_to_children, if: :saved_change_to_event_id?
 

data/app/models/spree_cm_commissioner/role_decorator.rb

@@ -1,11 +1,10 @@
 module SpreeCmCommissioner
   module RoleDecorator
     def self.prepended(base)
-      base.enum role_type: { internal: 0, external: 1, preview: 2 }
+      base.enum role_type: { internal: 0, external: 1 }
 
       base.has_many :role_permissions, class_name: 'SpreeCmCommissioner::RolePermission'
       base.has_many :permissions, through: :role_permissions, class_name: 'SpreeCmCommissioner::Permission'
-      base.has_many :preview_roles, class_name: 'SpreeCmCommissioner::PreviewRole'
 
       base.belongs_to :vendor, optional: true
 
@@ -14,8 +13,6 @@ module SpreeCmCommissioner
         where(vendor_id: vendor)
       }
       base.scope :filter_external, -> { where(role_type: :external) }
-      base.scope :filter_internal, -> { where(role_type: :internal) }
-      base.scope :filter_preview, -> { where(role_type: :preview) }
 
       base.accepts_nested_attributes_for :role_permissions, allow_destroy: true
 

data/app/models/spree_cm_commissioner/taxon_ad_banner.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  class TaxonAdBanner < Asset
+    # 3x1
+    def asset_styles
+      {
+        small: '480x160>',
+        medium: '960x320>',
+        large: '1200x400>'
+      }
+    end
+  end
+end