spree_cm_commissioner 2.8.1.pre.3 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8250d9a96dcceb058991c416ad4b91380fa42f5d43e301c366e74bfe9eb0e27b
-  data.tar.gz: a8c9301047c15f6ef760bdda1cc9087ac4f7a3539cd6aa86b43a99ab97fc6f16
+  metadata.gz: cc101fbc1fb46a184c311e3cdf1827cd6515ae3b0399d77ca67c48560b3417bc
+  data.tar.gz: 5437f4e82b8c48ce55753432d2ce529935b0c63d472946f03153e817ba3c3038
 SHA512:
-  metadata.gz: 87bba18fe41a801abf62fc7a83c444452f5b3780b23edaa44bbf86b98271b06877bc8c52bddfc5761b5fdee5953226201c52556cfba30405c1e1f95af2067861
-  data.tar.gz: 2a7fd81827d6be81291146d17f46ff54a61a59aa4194a552f89ccc59463dc93a4ccc742c0534fd5c18354136314b2e9db571e97b6e8822fff3bbc6c116f3114d
+  metadata.gz: 74c7a8c0fbb21ae704c905b4f14b8d878b701adf82fc569a0db9d3bb780cae702eb93303c29db6bd08f602e9270fb89caed7bf5ebdb3a21d474057cef17d2157
+  data.tar.gz: 981dc574b4b68c1fec6ed7a665ec47ef52bfb60ef89476ab119e72da1311c9e2ae01e78a69436a8663ba185b460df46c6fd5836ccc52531c5e4a13eeaa5c3209

data/.env.example

@@ -34,6 +34,7 @@ DISTANCE_SIGNING_KEY=hei********************VY
 
 # Cache durations (in seconds) for different content types
 # See: app/controllers/concerns/spree_cm_commissioner/content_cachable.rb
+CACHE_AUTO_INVALIDATION_DISABLED="" # Set to yes to disable CDN cache invalidation entirely (kill switch)
 CACHE_CDN_MAX_AGE=86400 # CDN/server-side cache duration for all responses
 CACHE_STATIC_MAX_AGE=86400 # Static content (countries, provinces, seat layouts, CMS pages) - 1 day
 CACHE_SEMI_STATIC_MAX_AGE=3600 # Semi-static content (menus, homepage backgrounds, routes) - 1 hour

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.1.pre.3)
+    spree_cm_commissioner (2.8.2)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

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

@@ -39,7 +39,6 @@ module Spree
               params[:date],
               params[:route_type],
               params[:vendor_id],
-              params[:featured],
               params[:number_of_guests],
               resource_includes&.sort&.join(','),
               sparse_fields&.sort&.join(','),

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

@@ -0,0 +1,68 @@
+# 🎉 ---[Event]---
+#
+# 📋 Event: {{event.name}}
+#
+# 👤 Organizer: {{vendor.name}}
+#
+# 🗓️ Start Date: {{from_date}}
+# 🗓️ End Date: {{to_date}}
+# 🔗 URL: ......
+#
+module SpreeCmCommissioner
+  class EventTelegramMessageFactory < TelegramMessageFactory
+    attr_reader :event
+
+    def initialize(event:)
+      @event = event
+
+      title = "✨ #{event.name} ✨"
+
+      super(title: title)
+    end
+
+    def body
+      [
+        event_name_line,
+        organizer_line,
+        [start_date_line, end_date_line].compact.join("\n"),
+        event_url_line
+      ].compact_blank.join("\n\n")
+    end
+
+    private
+
+    def event_name_line
+      "📋 Event: #{event.name}" if event.name.present?
+    end
+
+    def organizer_line
+      return if event.vendor&.name.blank?
+
+      "👤 Organizer: #{bold(event.vendor.name)}"
+    end
+
+    def start_date_line
+      return if event.from_date.blank?
+
+      "🗓️ Start Date: #{pretty_datetime(event.from_date)}"
+    end
+
+    def end_date_line
+      return if event.to_date.blank?
+
+      "🗓️ End Date: #{pretty_datetime(event.to_date)}"
+    end
+
+    def pretty_datetime(date)
+      return '' if date.blank?
+
+      date.strftime('%b %d, %Y · %H:%M')
+    end
+
+    def event_url_line
+      return if event.event_url.blank?
+
+      "🔗 URL: #{event.event_url}"
+    end
+  end
+end

data/app/finders/spree_cm_commissioner/accommodations/find_variant.rb

@@ -15,8 +15,8 @@ module SpreeCmCommissioner
           .joins(:inventory_items)
           .where(vendor_id: vendor_id)
           .where(inventory_items: { inventory_date: stay_dates })
-          .where('CAST(spree_variants.public_metadata->\'cm_options\'->>\'number-of-adults\' AS INTEGER) +
-                  CAST(spree_variants.public_metadata->\'cm_options\'->>\'number-of-kids\' AS INTEGER) >= ?', number_of_guests
+          .where('CAST(public_metadata->\'cm_options\'->>\'number-of-adults\' AS INTEGER) +
+                  CAST(public_metadata->\'cm_options\'->>\'number-of-kids\' AS INTEGER) >= ?', number_of_guests
           )
           .where('inventory_items.quantity_available > 0')
           .distinct

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/jobs/spree_cm_commissioner/event_creation_telegram_alert_sender_job.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  class EventCreationTelegramAlertSenderJob < ApplicationUniqueJob
+    queue_as :telegram_bot
+
+    def perform(options = {})
+      event = Spree::Taxon.find(options[:event_id])
+      SpreeCmCommissioner::TelegramAlerts::EventCreation.call(event: event)
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/oauth_access_tokens/cleanup_expired_job.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  module OauthAccessTokens
+    class CleanupExpiredJob < SpreeCmCommissioner::ApplicationJob
+      queue_as :default
+
+      def perform
+        SpreeCmCommissioner::OauthAccessTokens::CleanupExpired.new.call
+      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_transitable.rb

@@ -23,6 +23,8 @@ module SpreeCmCommissioner
     TripKey = Struct.new(:trip_id, :direction, :boarding_trip_stop_id, :drop_off_trip_stop_id)
 
     included do
+      include SpreeCmCommissioner::ServiceOrigin
+
       validates :direction, inclusion: { in: DIRECTION }, allow_nil: true
       validates :trip_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
       validates :service_origin_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
@@ -125,6 +127,12 @@ module SpreeCmCommissioner
 
     private
 
+    def resolve_service_origin_id
+      return nil if trip_id.blank?
+
+      SpreeCmCommissioner::Trip.find_by(id: trip_id)&.service_origin_id
+    end
+
     def validate_trip_stops_for_scheduled_trips
       return if trip_id.blank? || trip_id.zero?
 

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].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/service_origin.rb

@@ -0,0 +1,22 @@
+module SpreeCmCommissioner
+  # Defaults service_origin (nationality) from parent associations during validation (on create).
+  # Vendor → Route → Trip → LineItem.
+  # Pricing rules use this to determine local vs foreigner rates.
+  module ServiceOrigin
+    extend ActiveSupport::Concern
+
+    included do
+      before_validation :assign_service_origin_id, on: :create
+    end
+
+    private
+
+    def assign_service_origin_id
+      self.service_origin_id ||= resolve_service_origin_id
+    end
+
+    def resolve_service_origin_id
+      nil
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ module SpreeCmCommissioner
       preference :telegram_order_alert_chat_id, :string
       preference :telegram_order_request_alert_chat_id, :string
       preference :telegram_new_vendor_alert_chat_id, :string
+      preference :telegram_new_event_alert_chat_id, :string
       preference :assetlinks, :string, default: ''
       preference :apple_app_site_association, :string, default: ''
     end

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

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   module VehicleKind
     extend ActiveSupport::Concern
 
-    VEHICLE_KINDS = %i[suv sedan minivan van sleeping_bus luxury_van air_bus bus ferry boat].freeze
+    VEHICLE_KINDS = %i[suv sedan minivan van sleeping_bus luxury_van air_bus bus ferry].freeze
 
     included do
       enum kind: VEHICLE_KINDS if table_exists? && column_names.include?('kind')

data/app/models/spree_cm_commissioner/integration.rb

@@ -25,36 +25,5 @@ module SpreeCmCommissioner
     def unstock_external_inventory!(_order, _line_items)
       raise NotImplementedError, 'Subclasses must implement the unstock_external_inventory! method'
     end
-
-    def sync_item_availability!(_options = {})
-      raise NotImplementedError, 'Subclasses must implement the sync_item_availability! method'
-    end
-
-    def hold_inventory!(_order, _line_items)
-      raise NotImplementedError, 'Subclasses must implement the hold_inventory! method'
-    end
-
-    # Integrations that manage external inventory reservations should override this to return true
-    def supports_external_inventory_holding?
-      false
-    end
-
-    # Integrations that support automatically releasing external inventory
-    # after reservation expiration or order cancellation should override this to return true
-    def supports_auto_release_inventory?
-      false
-    end
-
-    def release_inventory!(_order, _line_items)
-      raise NotImplementedError, 'Subclasses must implement the release_inventory! method'
-    end
-
-    def external_inventory_items(_order)
-      raise NotImplementedError, 'Subclasses must implement the external_inventory_items method'
-    end
-
-    def external_inventory_item_status(_order, _options)
-      raise NotImplementedError, 'Subclasses must implement the external_inventory_item_status method'
-    end
   end
 end

data/app/models/spree_cm_commissioner/integrations/stadium_x_v1.rb

@@ -5,7 +5,10 @@ class SpreeCmCommissioner::Integrations::StadiumXV1 < SpreeCmCommissioner::Integ
 
   # override
   def sync_manager
-    SpreeCmCommissioner::Integrations::StadiumXV1::SyncManager.new(integration: self)
+    SpreeCmCommissioner::Integrations::StadiumXV1::SyncManager.new(
+      integration: self,
+      client: client
+    )
   end
 
   # override
@@ -15,6 +18,7 @@ class SpreeCmCommissioner::Integrations::StadiumXV1 < SpreeCmCommissioner::Integ
       order: order,
       line_items: line_items
     )
+
     raise SpreeCmCommissioner::Integrations::SyncError, result.error unless result.success?
   end
 
@@ -23,9 +27,11 @@ class SpreeCmCommissioner::Integrations::StadiumXV1 < SpreeCmCommissioner::Integ
     raise SpreeCmCommissioner::Integrations::SyncError, 'Ticket cannot be cancelled'
   end
 
-  def sync_item_availability!(_options = {}); end
-
   def client
-    @client ||= SpreeCmCommissioner::Integrations::StadiumXV1::ExternalClient::Client.new(integration: self)
+    SpreeCmCommissioner::Integrations::StadiumXV1::ExternalClient::Client.new(
+      public_key: public_key,
+      private_key: private_key,
+      base_url: base_url
+    )
   end
 end

data/app/models/spree_cm_commissioner/inventory_item.rb

@@ -1,15 +1,9 @@
 module SpreeCmCommissioner
   class InventoryItem < Base
     include SpreeCmCommissioner::ProductType
-    include SpreeCmCommissioner::StoreMetadata
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
 
     MAX_DISPLAY_STOCK = 20
 
-    store_public_metadata :last_synced_at, :datetime
-    store_public_metadata :original_price, :integer
-    store_public_metadata :currency, :string
-
     # Association
     belongs_to :variant, class_name: 'Spree::Variant', optional: false
 
@@ -29,8 +23,23 @@ module SpreeCmCommissioner
 
     before_save -> { self.product_type = variant.product_type }, if: -> { product_type.nil? }
 
-    # Create maintaining task to purge product related caches
-    after_commit { SpreeCmCommissioner::MaintenanceTasks::CacheInvalidation.pending.create_or_find_by(maintainable: variant.product) }
+    after_commit :schedule_product_cache_invalidation
+
+    # Only for ecommerce: the app uses product.in_stock? (derived from quantity_available) for product cards.
+    # Other types (e.g. accommodation, bus) have many inventory items (including daily-generated ones),
+    # so invalidating per item would flood the task queue.
+    #
+    # This is temporary until we have a more robust cache invalidation strategy in place.
+    def schedule_product_cache_invalidation
+      return unless ecommerce?
+      return unless saved_change_to_quantity_available?
+
+      # Only fires on in_stock status transition (0 ↔ N); non-zero to non-zero changes are skipped.
+      old_val, new_val = saved_change_to_quantity_available
+      return if old_val.to_i.positive? && new_val.to_i.positive?
+
+      SpreeCmCommissioner::MaintenanceTasks::CacheInvalidation.pending.create_or_find_by(maintainable: variant.product)
+    end
 
     def public_quantity_available
       [quantity_available, MAX_DISPLAY_STOCK].min

data/app/models/spree_cm_commissioner/maintenance_tasks/cache_invalidation.rb

@@ -3,6 +3,8 @@ module SpreeCmCommissioner
   module MaintenanceTasks
     class CacheInvalidation < MaintenanceTask
       def maintain
+        return if ENV['CACHE_AUTO_INVALIDATION_DISABLED'] == 'yes'
+
         if maintainable.is_a?(SpreeCmCommissioner::HomepageBackground) || maintainable.is_a?(Spree::Menu)
           SpreeCmCommissioner::HomepageDataLoader.clear_cache
         end

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -42,7 +42,6 @@ module SpreeCmCommissioner
       base.has_many :reserved_blocks, through: :guests, class_name: 'SpreeCmCommissioner::ReservedBlock'
       base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variants
       base.has_many :product_completion_steps, class_name: 'SpreeCmCommissioner::ProductCompletionStep', through: :line_items
-      base.has_many :audit_events, class_name: 'SpreeCmCommissioner::AuditEvent', as: :auditable
 
       base.delegate :customer, to: :user, allow_nil: true
 

data/app/models/spree_cm_commissioner/place.rb

@@ -1,7 +1,5 @@
 module SpreeCmCommissioner
   class Place < Base
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
-
     acts_as_nested_set
 
     validates :reference, presence: true, if: :validate_reference?

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)

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