spree_cm_commissioner 2.8.2.pre.pre.9 → 2.8.3.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a6cbf4bcbfda9acf942f2277a87416e5707f13347d94d270b765a4114d0a2e3
-  data.tar.gz: c86436b36caebf51514c677349c24ebd5a8c3a6aa1c1af6fe1b2eee26529f98e
+  metadata.gz: 6113b7370f204cdd539916ac0e1881763beec50c577ba5973160f10941015f99
+  data.tar.gz: 356ebf217c53946872067544869cec5695e063df4092ae8b05d3c5e6a5dbef4e
 SHA512:
-  metadata.gz: 35a9ee236c36a831a025b5298a62cc05df44ec4da598434f44c9e21cbf426c5cadbc9bf6291d877b60c90873b9fb2f63545f5e80636e915059392578867169a7
-  data.tar.gz: dc172fa7b298e79b55d5518d9887b268379225ec760b8e85f3cc63d9b31f428ed874db07e2ef31851aaf66c1e4a0e3811b6718733d8a4eb3a41e105928674f1c
+  metadata.gz: d99e1e40d83080a9487bc6929fedb7f3f0e2e847635fde43f5b96479e0f19386e17357e0bb798dae74f3302429e166d851a0247ab5b0c1a49bb62e38fc83a29f
+  data.tar.gz: 1560f7edd9efb1eb30351da6a44081f4eee124be109351d835631b0b1f82db176de3a8d4cdfa1112d1f2c96be55f7268dfa6a2c5ec617864146ecea5cd5d1c8b

data/.gitignore

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

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.8.2.pre.pre.9)
+    spree_cm_commissioner (2.8.3.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
@@ -51,24 +50,6 @@ module Spree
         @taxon.build_home_banner(attachment: permitted_resource_params.delete(:home_banner)) if permitted_resource_params[:home_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/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/storefront/trip_search_controller.rb

@@ -64,8 +64,7 @@ module Spree
               'trips.vendor',
               'trips.vendor.logo',
               'trips.vehicle_type',
-              'trips.vehicle_type.vehicle_photos',
-              'trips.amenities'
+              'trips.vehicle_type.vehicle_photos'
             ]
           end
 
@@ -99,7 +98,11 @@ module Spree
 
           # override
           def serializer_params
-            params.permit(:include).to_hash
+            super.merge(
+              exclude_vendor_kind_option_types: true,
+              exclude_vendor_kind_option_values: true,
+              exclude_vehicle_type_amenities: true
+            )
           end
 
           # override

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/factory/spree_cm_commissioner/order_telegram_message_factory.rb

@@ -48,7 +48,7 @@ module SpreeCmCommissioner
     end
 
     def line_item_content(line_item)
-      return intercity_taxi_line_item_content(line_item) if intercity_taxi?(line_item)
+      return transit_line_item_content(line_item) if line_item.transit?
 
       text = []
 
@@ -64,8 +64,8 @@ module SpreeCmCommissioner
     def pretty_date_for(line_item)
       return nil unless line_item.date_present?
 
-      from_date = pretty_date(line_item.from_date)
-      to_date = pretty_date(line_item.to_date)
+      from_date = pretty_datetime(line_item.from_date)
+      to_date = pretty_datetime(line_item.to_date)
 
       if from_date == to_date
         "🗓️ #{from_date}"
@@ -84,7 +84,7 @@ module SpreeCmCommissioner
       text << "Email: #{inline_code(order.email)}" if order.email.present?
       text << "Delivery Address: #{formatted_shipping_address.presence || 'N/A'}" if order.delivery_required?
 
-      append_intercity_taxi_footer(text) if intercity_taxi_order?
+      append_transit_footer(text) if transit_order?
 
       if show_details_link && order.guests.any?
         text << ''
@@ -132,12 +132,12 @@ module SpreeCmCommissioner
 
     private
 
-    def intercity_taxi?(line_item)
-      trip_for(line_item)&.intercity_taxi?
+    def transit_order?
+      selected_line_items.any?(&:transit?)
     end
 
     def intercity_taxi_order?
-      selected_line_items.any? { |li| intercity_taxi?(li) }
+      selected_line_items.any? { |li| trip_for(li)&.intercity_taxi? }
     end
 
     def trip_for(line_item)
@@ -147,10 +147,10 @@ module SpreeCmCommissioner
       @trip_cache[line_item.trip_id] ||= SpreeCmCommissioner::Trip.find_by(id: line_item.trip_id)
     end
 
-    def intercity_taxi_line_item_content(line_item)
+    def transit_line_item_content(line_item)
       text = []
-      route_text = taxi_route_text(line_item)
-      departure_text = taxi_departure_text(line_item)
+      route_text = transit_route_text(line_item)
+      departure_text = transit_departure_text(line_item)
       text << bold('🚗 Trip Details')
       text << "Route: #{route_text}" if route_text.present?
       text << "Passengers: #{line_item.passenger_count || line_item.quantity}"
@@ -159,7 +159,7 @@ module SpreeCmCommissioner
       text.compact.join("\n")
     end
 
-    def taxi_route_text(line_item)
+    def transit_route_text(line_item)
       trip = trip_for(line_item)
       return line_item.product.name if trip.blank?
 
@@ -171,21 +171,35 @@ module SpreeCmCommissioner
       vehicle.present? ? "#{parts} (#{vehicle})" : parts
     end
 
-    def taxi_departure_text(line_item)
+    def transit_departure_text(line_item)
       return nil unless line_item.date_present?
 
       line_item.from_date.strftime('%b %d, %Y · %H:%M')
     end
 
     def nationality_text
-      values = order.saved_guests.map { |sg| sg.nationality&.name.presence || sg.nationality_group&.humanize }.compact.uniq
-      return nil if values.empty?
+      grouped = order.saved_guests.group_by { |sg| sg.nationality_group&.humanize }
+      grouped.delete(nil)
+      return nil if grouped.empty?
 
-      values.join(', ')
+      grouped.map { |nationality_group, guests| customer_type_summary(nationality_group, guests) }.join(', ')
     end
 
-    def append_intercity_taxi_footer(text)
-      text << "Nationality: #{nationality_text}" if nationality_text.present?
+    # e.g. "Local (Adult x1, Child x1)". age_group is NOT NULL, so it is always present.
+    def customer_type_summary(nationality_group, guests)
+      age_breakdown = guests
+                      .group_by { |sg| sg.age_group.humanize }
+                      .map { |age_group, age_guests| "#{age_group} x#{age_guests.count}" }
+                      .join(', ')
+
+      "#{nationality_group} (#{age_breakdown})"
+    end
+
+    def append_transit_footer(text)
+      nationality = nationality_text
+      text << "Nationality: #{nationality}" if nationality.present?
+
+      return unless intercity_taxi_order?
 
       pickup = selected_line_items.filter_map(&:pickup_map_place).first
       dropoff = selected_line_items.filter_map(&:dropoff_map_place).first

data/app/factory/spree_cm_commissioner/telegram_message_factory.rb

@@ -46,5 +46,11 @@ module SpreeCmCommissioner
 
       date.to_date.strftime('%b %d, %Y')
     end
+
+    def pretty_datetime(datetime)
+      return '' if datetime.blank?
+
+      datetime&.in_time_zone&.strftime('%b %d, %Y - %H:%M')
+    end
   end
 end

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/invalidate_cache_request.rb

@@ -19,13 +19,17 @@ module SpreeCmCommissioner
       context.response = client.create_invalidation(
         distribution_id: ENV.fetch('ASSETS_SYNC_CF_DIST_ID'),
         invalidation_batch: {
-          caller_reference: Time.now.to_i.to_s,
+          # Must be globally unique per distribution,
+          # Time.now.to_i collides when multiple jobs fire in the same second.
+          caller_reference: SecureRandom.uuid,
           paths: {
             quantity: patterns.size,
             items: patterns
           }
         }
       )
+    rescue Aws::CloudFront::Errors::TooManyInvalidationsInProgress => e
+      context.fail!(message: "Too many invalidations in progress: #{e}")
     end
   end
 end

data/app/jobs/spree_cm_commissioner/invalidate_cache_request_job.rb

@@ -1,7 +1,10 @@
 module SpreeCmCommissioner
   class InvalidateCacheRequestJob < ApplicationUniqueJob
+    queue_as :cache_invalidation
+
     def perform(options = {})
-      SpreeCmCommissioner::InvalidateCacheRequest.call(patterns: options[:patterns])
+      result = SpreeCmCommissioner::InvalidateCacheRequest.call(patterns: options[:patterns])
+      raise result.error if result.failure?
     end
   end
 end

data/app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_job.rb

@@ -1,13 +1,15 @@
 module SpreeCmCommissioner
   module InventoryItems
     class BulkAdjustQuantitiesJob < ApplicationUniqueJob
-      # :line_item_ids, :inventory_id_and_quantities
+      # :line_item_ids, :inventory_id_and_quantities, :caller_source
       #
       # :line_item_ids is included for unique job key generation to prevent duplicate jobs,
       # though it's not used in the perform method implementation.
+      # :caller_source is a string like "ClassName#method" identifying who enqueued the job.
       def perform(options = {})
         SpreeCmCommissioner::InventoryItems::BulkAdjustQuantities.call!(
-          inventory_id_and_quantities: options[:inventory_id_and_quantities]
+          inventory_id_and_quantities: options[:inventory_id_and_quantities],
+          caller_source: options[:caller_source]
         )
       end
     end

data/app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_on_hold_job.rb

@@ -3,16 +3,18 @@ module SpreeCmCommissioner
     class BulkAdjustQuantitiesOnHoldJob < ApplicationUniqueJob
       queue_as :default
 
-      # :order_id, :inventory_id_and_quantities
+      # :order_id, :inventory_id_and_quantities, :caller_source
       #
       # :order_id is included for unique job key generation to prevent duplicate jobs,
       # though it's not used in the perform method implementation.
+      # :caller_source is a string like "ClassName#method" identifying who enqueued the job.
       def perform(options = {})
         raise ArgumentError, 'order_id is required' if options[:order_id].blank?
         raise ArgumentError, 'inventory_id_and_quantities is required' if options[:inventory_id_and_quantities].blank?
 
         SpreeCmCommissioner::InventoryItems::BulkAdjustQuantitiesOnHold.call(
-          inventory_id_and_quantities: options[:inventory_id_and_quantities]
+          inventory_id_and_quantities: options[:inventory_id_and_quantities],
+          caller_source: options[:caller_source]
         )
       end
     end

data/app/jobs/spree_cm_commissioner/route_metrics/decrease_trip_count_job.rb

@@ -2,8 +2,14 @@ module SpreeCmCommissioner
   module RouteMetrics
     class DecreaseTripCountJob < ApplicationUniqueJob
       def perform(options = {})
-        trip = SpreeCmCommissioner::Trip.find(options[:trip_id])
-        SpreeCmCommissioner::RouteMetrics::DecreaseTripCount.call(trip: trip)
+        route_metric = SpreeCmCommissioner::RouteMetric.find_by(
+          origin_place_id: options[:origin_place_id],
+          destination_place_id: options[:destination_place_id],
+          route_type: options[:route_type]
+        )
+        return if route_metric.nil?
+
+        SpreeCmCommissioner::RouteMetrics::DecreaseTripCount.call(route_metric: route_metric)
       end
     end
   end

data/app/jobs/spree_cm_commissioner/route_metrics/increase_trip_count_job.rb

@@ -2,8 +2,11 @@ module SpreeCmCommissioner
   module RouteMetrics
     class IncreaseTripCountJob < ApplicationUniqueJob
       def perform(options = {})
-        trip = SpreeCmCommissioner::Trip.find(options[:trip_id])
-        SpreeCmCommissioner::RouteMetrics::IncreaseTripCount.call(trip: trip)
+        SpreeCmCommissioner::RouteMetrics::IncreaseTripCount.call(
+          origin_place_id: options[:origin_place_id],
+          destination_place_id: options[:destination_place_id],
+          route_type: options[:route_type]
+        )
       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/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/spree_cm_commissioner/order_decorator.rb

@@ -34,6 +34,7 @@ module SpreeCmCommissioner
       base.has_many :guests, through: :line_items, class_name: 'SpreeCmCommissioner::Guest'
 
       base.has_many :saved_guests,
+                    -> { reorder(nil).distinct },
                     through: :guests,
                     source: :saved_guest,
                     class_name: 'SpreeCmCommissioner::SavedGuest'

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -14,8 +14,6 @@ module SpreeCmCommissioner
 
       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
 
@@ -57,45 +55,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)
@@ -108,12 +69,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
 
@@ -127,10 +82,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 :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_decorator.rb

@@ -83,21 +83,7 @@ module SpreeCmCommissioner
 
       base.has_many :import_orders, as: :importable, class_name: 'SpreeCmCommissioner::Imports::ImportOrder', dependent: :destroy
 
-      base.scope :shows, -> { where(taxonomy_id: Spree::Taxonomy.shows.id, depth: 1) }
-      base.scope :events,     -> { where(taxonomy_id: Spree::Taxonomy.events.id, depth: 1) }
       base.has_many :agencies, class_name: 'SpreeCmCommissioner::Agency', foreign_key: :agency_category_id
-      base.has_many :preview_roles, class_name: 'SpreeCmCommissioner::PreviewRole', as: :previewable
-
-      base.scope :visible_to, lambda { |user|
-        publicly_available = where(preview: false)
-
-        if user
-          allowed_ids = user.preview_roles.where(previewable_type: polymorphic_name).select(:previewable_id)
-          publicly_available.or(where(preview: true, id: allowed_ids))
-        else
-          publicly_available
-        end
-      }
 
       # Create maintaining task to purge taxon related caches
       base.after_save { SpreeCmCommissioner::MaintenanceTasks::CacheInvalidation.pending.create_or_find_by(maintainable: self) }
@@ -110,7 +96,6 @@ module SpreeCmCommissioner
           .joins('INNER JOIN cm_homepage_sections ON cm_homepage_section_relatables.homepage_section_id = cm_homepage_sections.id')
           .where(cm_homepage_sections: { tenant_id: nil, active: true })
           .where(kind: :event)
-          .where(preview: false)
       end
 
       def base.find_event(id)