spree_cm_commissioner 2.8.4.pre.pre3 → 2.8.4.pre.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d158fca1113f118470b6600ed6f324b99914f972e698064d7856fcdb224356c
-  data.tar.gz: 879b3914b641f94ad83f85614fa663281781f509c85a8bdb4d2629edb38d710d
+  metadata.gz: 20f0a180f0ca53b77ce1c80dd3dc41e0d3049321aa02567ae35f23421828020c
+  data.tar.gz: 52f68c03ee83f7b0863ebcda54c301be0f13f1584f026a6f46d574933e0f368e
 SHA512:
-  metadata.gz: 0ac785c46ebf44942bd86bac29fd17556bc8a6555bee9531f2814057018d46e66c17ba947c74a49d11feecd6edd62fea9b1ca77e589ca63c3a2710ff9b82fdd6
-  data.tar.gz: 1e557a5f15d19153b8f2f4a917094f45767be18eb57aa491542c907f8017eba1af700e550b837142b77005c7681e75b33c752ac45a5cbd913ab4eb47a91ed473
+  metadata.gz: 64e7b779a99ea18dfc44ecd1953f4e7878087754c55fe13fe741304ca4566b027e301638d2954ebdd19d1dc0e014b5119bb2ca7e73e0a36be05570db66c2eae0
+  data.tar.gz: bf170f7c4fdba381ff89bd02393df9b5e8baad1d765d5542804beca8fef87f03088ac0a6903fd62e1017eba367d8653d1f44ad89b7396c91ed9fb1bc5f6c2f68

data/.env.example

@@ -20,6 +20,8 @@ WAITING_ROOM_SESSION_SIGNATURE="e6b2********************26e3"
 WAITING_ROOM_SESSION_EXPIRE_DURATION_IN_SECOND=
 WAITING_ROOM_MIN_SESSIONS_COUNT=5
 WAITING_ROOM_DISABLED=no
+WAITING_ROOM_POSITION_STAMP_LIMIT=1000
+WAITING_ROOM_FIRESTORE_BATCH_SIZE=500
 
 # Vattanac Bank
 VATTANAC_AES_SECRET_KEY= ""
@@ -63,3 +65,6 @@ PAYMENT_LOCK_MIN_DURATION_IN_MINUTES=5      # Minimum remaining hold time requir
 MAX_ACTIVE_HOLDS_PER_USER=3                 # Max concurrent active holds allowed per user across all orders
 MAX_HOLDS_PER_IP_PER_HOUR=5                 # Max hold attempts per IP address within a rolling 1-hour window (abuse prevention)
 HOLD_COOLDOWN_AFTER_EXPIRY_IN_MINUTES=2     # Cooldown period before a user can re-acquire a hold after one expired on them
+
+# See: app/models/spree_cm_commissioner/payment_decorator.rb
+PAYMENT_INCOMPLETE_NOTIFICATION_DELAY_IN_MINUTES=5  # Delay before notifying a customer that their order is still unpaid after payment is created

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.4.pre.pre3)
+    spree_cm_commissioner (2.8.4.pre.pre4)
       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
@@ -56,24 +55,6 @@ module Spree
         @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/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/payment_incomplete_notification_sender.rb

@@ -0,0 +1,25 @@
+module SpreeCmCommissioner
+  class PaymentIncompleteNotificationSender < BaseInteractor
+    def call
+      order = context.notificable
+      return if order.user.blank?
+      return if order.reload.payment_fulfilled?
+
+      SpreeCmCommissioner::OrderGeneralNotification.with(
+        notificable: order,
+        title: title,
+        message: message(order)
+      ).deliver_later(order.user)
+    end
+
+    private
+
+    def title
+      I18n.t('notifications.spree_cm_commissioner.payment_incomplete_notification.title')
+    end
+
+    def message(order)
+      I18n.t('notifications.spree_cm_commissioner.payment_incomplete_notification.message', order_number: order.number)
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/release_inventory_item_notification_sender.rb

@@ -0,0 +1,24 @@
+module SpreeCmCommissioner
+  class ReleaseInventoryItemNotificationSender < BaseInteractor
+    def call
+      order = context.notificable
+      return if order.user.blank?
+
+      SpreeCmCommissioner::OrderGeneralNotification.with(
+        notificable: order,
+        title: title,
+        message: message(order)
+      ).deliver_later(order.user)
+    end
+
+    private
+
+    def title
+      I18n.t('notifications.spree_cm_commissioner.release_inventory_item_notification.title')
+    end
+
+    def message(order)
+      I18n.t('notifications.spree_cm_commissioner.release_inventory_item_notification.message', order_number: order.number)
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/waiting_room_session_creator.rb

@@ -4,13 +4,20 @@ module SpreeCmCommissioner
   class WaitingRoomSessionCreator < BaseInteractor
     delegate :remote_ip, :waiting_guest_firebase_doc_id, :page_path, :tenant_id, to: :context
 
+    SESSION_CREATION_LOCK_KEY = 7_331_001
+
     def call
       return context.fail!(message: 'must_provide_waiting_guest_firebase_doc_id') if waiting_guest_firebase_doc_id.blank?
       return context.fail!(message: 'must_provide_remote_ip') if remote_ip.blank?
-      return context.fail!(message: 'sessions_reach_it_maximum') if full?
 
-      generate_jwt_token
-      assign_token_and_create_session_to_db
+      # Advisory lock ensures the capacity check and session creation are atomic across all app instances.
+      with_session_creation_lock do
+        return context.fail!(message: 'sessions_reach_it_maximum') if full?
+
+        generate_jwt_token
+        assign_token_and_create_session_to_db
+      end
+
       log_to_firebase
 
       # commented because of following bug: https://github.com/channainfo/commissioner/issues/2185
@@ -19,10 +26,20 @@ module SpreeCmCommissioner
     end
 
     def full?
-      fetcher = SpreeCmCommissioner::WaitingRoomSystemMetadataFetcher.new(firestore: firestore)
-      fetcher.load_document_data
+      max = Rails.cache.fetch('waiting_room/max_sessions_count', expires_in: 1.hour) do
+        fetcher = SpreeCmCommissioner::WaitingRoomSystemMetadataFetcher.new(firestore: firestore)
+        fetcher.load_document_data
+        fetcher.max_sessions_count_with_min
+      end
+
+      SpreeCmCommissioner::WaitingRoomSession.active.count >= max
+    end
 
-      SpreeCmCommissioner::WaitingRoomSession.active.size >= fetcher.max_sessions_count_with_min
+    def with_session_creation_lock
+      SpreeCmCommissioner::WaitingRoomSession.transaction do
+        SpreeCmCommissioner::WaitingRoomSession.connection.execute("SELECT pg_advisory_xact_lock(#{SESSION_CREATION_LOCK_KEY})")
+        yield
+      end
     end
 
     def generate_jwt_token

data/app/jobs/spree_cm_commissioner/payment_incomplete_notification_job.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  class PaymentIncompleteNotificationJob < ApplicationUniqueJob
+    queue_as :default
+
+    def perform(options = {})
+      order = Spree::Order.find_by(id: options[:order_id])
+      return unless order
+
+      SpreeCmCommissioner::PaymentIncompleteNotificationSender.call(notificable: order)
+    end
+  end
+end

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

@@ -7,6 +7,9 @@ module SpreeCmCommissioner
 
       STAMP_LIMIT = (ENV['WAITING_ROOM_POSITION_STAMP_LIMIT'] || 1000).to_i
 
+      # Firestore bounds a batch update by payload size (10 MiB); this batch size leaves 500/commit far under that.
+      FIRESTORE_BATCH_SIZE = (ENV['WAITING_ROOM_FIRESTORE_BATCH_SIZE'] || 500).to_i
+
       def perform
         paths = stamp_paths
         avg_queue_to_enter = lobby_data[:avg_queue_to_enter_seconds].to_i
@@ -21,16 +24,32 @@ module SpreeCmCommissioner
           break if remaining <= 0
 
           docs = waiting_query(path).order('queued_at').limit(remaining).get.to_a
-          docs.each_slice(500) do |slice|
+
+          # Stamp the docs in chunks: each_slice splits them into groups of at most
+          # FIRESTORE_BATCH_SIZE, and each group is written in one firestore.batch commit
+          # (so e.g. 1000 docs = 2 commits, not 1000 round-trips).
+          docs.each_slice(FIRESTORE_BATCH_SIZE) do |slice|
             firestore.batch do |b|
               slice.each do |doc|
                 global += 1
+
+                # The app shows a progress bar via (queue_total - position + 1) / queue_total.
+                # `position` only ever counts down toward 1, so we keep `queue_total` from ever
+                # going down either (max of its old value and the current position) — it becomes
+                # the guest's starting depth. That keeps the bar moving only forward, reaching
+                # 100% at position 1, instead of jumping as the live waiting count shrinks.
+                #
+                # Example — a guest who started 8th, with the line draining from 8 to 4 people:
+                #   live total:  position 6 / total 8 = 38%, then position 4 / total 4 = 25% (drops!) ❌
+                #   this fix:    position 6 / total 8 = 38%, then position 4 / total 8 = 63% (climbs) ✅
+                #                ...continuing to position 1 / total 8 = 100% at the front.
                 data = {
                   position: global,
-                  queue_total: total,
+                  queue_total: [doc.data[:queue_total].to_i, global].max,
                   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

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

@@ -12,6 +12,7 @@ module SpreeCmCommissioner
       where(
         type: %w[
           order_complete_notification
+          order_general_notification
           customer_notification
           guest_dynamic_field_notification
           ticket_transfer_received_notification

data/app/models/spree_cm_commissioner/payment_decorator.rb

@@ -12,6 +12,7 @@ module SpreeCmCommissioner
       # a real payment record permanently exists in the DB. Multiple payments for the
       # same order (retries) each refresh the 5-minute window — LockForPayment is idempotent.
       base.after_commit :lock_holds_for_payment, on: :create
+      base.after_commit :schedule_payment_incomplete_notification, on: :create
 
       base.whitelisted_ransackable_attributes |= %w[payable_id]
     end
@@ -56,6 +57,15 @@ module SpreeCmCommissioner
       order.lock_order_holds_for_payment
     end
 
+    def schedule_payment_incomplete_notification
+      # Delay gives the user time to finish paying; the job only notifies if the
+      # order is still unpaid by then.
+      delay = ENV.fetch('PAYMENT_INCOMPLETE_NOTIFICATION_DELAY_IN_MINUTES', '5').to_i.minutes
+      SpreeCmCommissioner::PaymentIncompleteNotificationJob
+        .set(wait: delay)
+        .perform_later(order_id: order.id)
+    end
+
     def ticket_transfer_completable?
       completed? && order.ticket_transfer? && order.complete? && order.payment_fulfilled?
     end

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_decorator.rb

@@ -84,29 +84,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.scope :ad_campaigns, -> { where(taxonomy_id: Spree::Taxonomy.ads.id, depth: 1) }
-
-      base.has_many :advertisements,
-                    -> { where(product_type: :advertisement, deleted_at: nil) },
-                    through: :classifications,
-                    class_name: 'Spree::Product',
-                    source: :product
-
       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) }
@@ -119,7 +97,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)