spree_cm_commissioner 2.8.2.pre.pre.9 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a6cbf4bcbfda9acf942f2277a87416e5707f13347d94d270b765a4114d0a2e3
-  data.tar.gz: c86436b36caebf51514c677349c24ebd5a8c3a6aa1c1af6fe1b2eee26529f98e
+  metadata.gz: cc101fbc1fb46a184c311e3cdf1827cd6515ae3b0399d77ca67c48560b3417bc
+  data.tar.gz: 5437f4e82b8c48ce55753432d2ce529935b0c63d472946f03153e817ba3c3038
 SHA512:
-  metadata.gz: 35a9ee236c36a831a025b5298a62cc05df44ec4da598434f44c9e21cbf426c5cadbc9bf6291d877b60c90873b9fb2f63545f5e80636e915059392578867169a7
-  data.tar.gz: dc172fa7b298e79b55d5518d9887b268379225ec760b8e85f3cc63d9b31f428ed874db07e2ef31851aaf66c1e4a0e3811b6718733d8a4eb3a41e105928674f1c
+  metadata.gz: 74c7a8c0fbb21ae704c905b4f14b8d878b701adf82fc569a0db9d3bb780cae702eb93303c29db6bd08f602e9270fb89caed7bf5ebdb3a21d474057cef17d2157
+  data.tar.gz: 981dc574b4b68c1fec6ed7a665ec47ef52bfb60ef89476ab119e72da1311c9e2ae01e78a69436a8663ba185b460df46c6fd5836ccc52531c5e4a13eeaa5c3209

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.2)
       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/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/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/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)

data/app/models/spree_cm_commissioner/taxonomy_decorator.rb

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
   module TaxonomyDecorator
-    def self.prepended(base) # rubocop:disable Metrics/MethodLength
+    def self.prepended(base)
       base.include SpreeCmCommissioner::TaxonKind
 
       base.belongs_to :vendor, class_name: 'Spree::Vendor', optional: true
@@ -15,15 +15,6 @@ module SpreeCmCommissioner
         end
       end
 
-      def base.shows
-        ActiveRecord::Base.connected_to(role: :writing) do
-          shows = Spree::Taxonomy.find_or_create_by(name: 'Shows', store: Spree::Store.default)
-          shows.kind = :event
-          shows.save if shows.changed?
-          shows
-        end
-      end
-
       def base.businesses
         ActiveRecord::Base.connected_to(role: :writing) do
           businesses = Spree::Taxonomy.find_or_create_by(name: 'Businesses', store: Spree::Store.default)

data/app/models/spree_cm_commissioner/tenant.rb

@@ -24,8 +24,6 @@ module SpreeCmCommissioner
 
     before_validation :generate_slug, if: -> { slug.blank? && name.present? }
 
-    validate :single_active_vendor
-
     def active_vendor
       vendors.where(state: :active).first
     end
@@ -45,12 +43,5 @@ module SpreeCmCommissioner
     def generate_slug
       self.slug = name.parameterize if slug.blank?
     end
-
-    # Add Guardrails to ensure data integrity and make system predictable.
-    def single_active_vendor
-      return unless vendors.where(state: :active).count > 1
-
-      errors.add(:base, 'must have at most one active vendor')
-    end
   end
 end

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -19,8 +19,6 @@ module SpreeCmCommissioner
       base.has_many :payments, as: :payable, class_name: 'Spree::Payment', dependent: :nullify
       base.has_many :role_permissions, through: :spree_roles, class_name: 'SpreeCmCommissioner::RolePermission'
       base.has_many :permissions, through: :role_permissions, class_name: 'SpreeCmCommissioner::Permission'
-      base.has_many :preview_spree_roles, -> { where(role_type: :preview) }, through: :role_users, source: :role, class_name: 'Spree::Role'
-      base.has_many :preview_roles, through: :preview_spree_roles, class_name: 'SpreeCmCommissioner::PreviewRole'
       base.has_many :line_items, through: :orders, source: :line_items
       base.has_many :check_ins, foreign_key: 'check_in_by_id', class_name: 'SpreeCmCommissioner::CheckIn'
       base.has_many :user_events, class_name: 'SpreeCmCommissioner::UserEvent'
@@ -37,9 +35,6 @@ module SpreeCmCommissioner
       base.has_many :user_agencies, class_name: 'SpreeCmCommissioner::UserAgency'
       base.has_many :user_places, class_name: 'SpreeCmCommissioner::UserPlace'
       base.has_many :places, through: :user_places, class_name: 'SpreeCmCommissioner::Place'
-      base.has_many :voting_credits, class_name: 'SpreeCmCommissioner::VotingCredit', dependent: :destroy
-      base.has_many :votes, class_name: 'SpreeCmCommissioner::Vote', dependent: :destroy
-      base.has_many :voting_credit_transactions, through: :voting_credits, class_name: 'SpreeCmCommissioner::VotingCreditTransaction'
 
       base.has_one :profile, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::UserProfile'
       base.has_one :customer, class_name: 'SpreeCmCommissioner::Customer'

data/app/models/spree_cm_commissioner/variant_options.rb

@@ -146,10 +146,6 @@ module SpreeCmCommissioner
       @seat_type ||= option_value_name_for(option_type_name: 'seat-type')
     end
 
-    def vote_package_amount
-      @vote_package_amount ||= option_value_name_for(option_type_name: 'vote-package')&.to_i
-    end
-
     # can consider as customers.
     def number_of_guests
       number_of_adults + number_of_kids

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -33,10 +33,6 @@ module SpreeCmCommissioner
 
       base.has_many :taxon_vendors, class_name: 'SpreeCmCommissioner::TaxonVendor'
       base.has_many :taxons, through: :taxon_vendors
-      base.has_many :shows, -> { where(spree_taxons: { type: 'SpreeCmCommissioner::Show' }) },
-                    through: :taxon_vendors, source: :taxon, class_name: 'SpreeCmCommissioner::Show'
-
-      base.has_many :voting_sessions, class_name: 'SpreeCmCommissioner::VotingSession', dependent: :destroy
 
       base.has_many :promoted_option_types, -> { where(promoted: true).order(:position) },
                     through: :vendor_option_types, source: :option_type

data/app/serializers/spree/v2/storefront/homepage_section_serializer.rb

@@ -2,7 +2,7 @@ module Spree
   module V2
     module Storefront
       class HomepageSectionSerializer < BaseSerializer
-        attributes :id, :title, :segments, :description, :active, :position, :preview, :created_at, :updated_at
+        attributes :id, :title, :segments, :description, :active, :position, :created_at, :updated_at
         has_many :homepage_section_relatables
       end
     end

data/app/serializers/spree/v2/storefront/product_serializer_decorator.rb

@@ -13,7 +13,7 @@ module Spree
           base.has_one :venue, serializer: ::SpreeCmCommissioner::V2::Storefront::ProductPlaceSerializer
 
           base.attributes :need_confirmation, :product_type, :kyc, :kyc_fields, :allowed_upload_later, :allow_anonymous_booking, :use_video_as_default
-          base.attributes :reveal_description, :discontinue_on, :public_metadata, :purchasable_on, :preview
+          base.attributes :reveal_description, :discontinue_on, :public_metadata, :purchasable_on
 
           # Expose only the `event_id` here instead of the full event object.
           # This lets the client fetch event details separately (usually already cached),

data/app/serializers/spree/v2/storefront/role_serializer.rb

@@ -2,7 +2,7 @@ module Spree
   module V2
     module Storefront
       class RoleSerializer < BaseSerializer
-        attributes :name, :role_type
+        attributes :name
       end
     end
   end

data/app/serializers/spree/v2/storefront/taxon_serializer_decorator.rb

@@ -15,8 +15,7 @@ module Spree
 
           base.attributes :custom_redirect_url, :kind, :subtitle, :from_date, :to_date,
                           :background_color, :foreground_color, :show_badge_status,
-                          :purchasable_on, :vendor_id, :available_on, :hide_video_banner,
-                          :preview
+                          :purchasable_on, :vendor_id, :available_on, :hide_video_banner
 
           # To get full seat layout details, call the seat_layouts API with this ID.
           base.attribute :seat_layout_ids, &:preload_seat_layout_ids

data/app/serializers/spree/v2/tenant/homepage_section_serializer.rb

@@ -3,7 +3,7 @@ module Spree
     module Tenant
       class HomepageSectionSerializer < BaseSerializer
         attributes :id, :title, :segments, :description,
-                   :active, :position, :preview, :created_at, :updated_at
+                   :active, :position, :created_at, :updated_at
 
         has_many :homepage_section_relatables, serializer: ::Spree::V2::Tenant::HomepageSectionRelatableSerializer
       end

data/app/serializers/spree/v2/tenant/role_serializer.rb

@@ -2,7 +2,7 @@ module Spree
   module V2
     module Tenant
       class RoleSerializer < BaseSerializer
-        attributes :name, :presentation, :role_type
+        attributes :name
       end
     end
   end

data/app/services/spree_cm_commissioner/api_caches/invalidate.rb

@@ -66,19 +66,12 @@ module SpreeCmCommissioner
             '/api/v2/storefront/homepage_data*'
           ],
           'Spree::Taxon' => ['/api/v2/storefront/taxons/:id*'],
-          'SpreeCmCommissioner::Show' => ['/api/v2/storefront/taxons/:id*'],
           'Spree::Product' => [
             '/api/v2/tenant/products/:id*',
             '/api/v2/tenant/products/:slug*',
             '/api/v2/storefront/products/:id*',
             '/api/v2/storefront/products/:slug*'
           ],
-          'SpreeCmCommissioner::ShowEpisode' => [
-            '/api/v2/tenant/products/:id*',
-            '/api/v2/tenant/products/:slug*',
-            '/api/v2/storefront/products/:id*',
-            '/api/v2/storefront/products/:slug*'
-          ],
           'Spree::Vendor' => [
             '/api/v2/tenant/vendors/:id*',
             '/api/v2/storefront/vendors/:id*',
@@ -94,15 +87,10 @@ module SpreeCmCommissioner
           'SpreeCmCommissioner::HomepageBackground' => homepage_background_patterns,
           'Spree::Menu' => ['/api/v2/storefront/menus/*'],
           'Spree::Taxon' => ['/api/v2/storefront/taxons/*'],
-          'SpreeCmCommissioner::Show' => ['/api/v2/storefront/taxons/*'],
           'Spree::Product' => [
             '/api/v2/tenant/products/*',
             '/api/v2/storefront/products/*'
           ],
-          'SpreeCmCommissioner::ShowEpisode' => [
-            '/api/v2/tenant/products/*',
-            '/api/v2/storefront/products/*'
-          ],
           'Spree::Vendor' => [
             '/api/v2/tenant/vendors/*',
             '/api/v2/storefront/vendors/*',

data/app/services/spree_cm_commissioner/oauth_access_tokens/cleanup_expired.rb

@@ -3,28 +3,22 @@ module SpreeCmCommissioner
     class CleanupExpired
       prepend ::Spree::ServiceModule::Base
 
-      BATCH_SIZE = 500
-
-      # The access tokens set by doorkeeper to expire in 1 day (cm-market-server/config/initializers/doorkeeper.rb),
-      # so we set the threshold to 90 days to make sure all expired tokens are cleaned up.
+      BATCH_SIZE = 1000
       EXPIRATION_THRESHOLD_DAYS = 90
 
       def call
-        cutoff_time = EXPIRATION_THRESHOLD_DAYS.days.ago
+        cutoff_date = EXPIRATION_THRESHOLD_DAYS.days.ago
         total_deleted = 0
 
-        # oauth_access_tokens is a standalone table with no foreign keys or associations
-        # pointing to it (checked cm-market-server/db/schema.rb), so it is safe to use
-        # delete_all here for faster bulk cleanup.
         Spree::OauthAccessToken
-          .where('created_at < ?', cutoff_time)
+          .where('revoked_at IS NOT NULL OR (expires_in IS NOT NULL AND created_at + make_interval(secs => expires_in) < ?)', cutoff_date)
           .in_batches(of: BATCH_SIZE) do |relation|
           deleted_count = relation.delete_all
           total_deleted += deleted_count
         end
 
-        log_cleanup_result(total_deleted, cutoff_time)
-        success(total_deleted: total_deleted, cutoff_time: cutoff_time, batch_size: BATCH_SIZE, expiration_threshold_days: EXPIRATION_THRESHOLD_DAYS)
+        log_cleanup_result(total_deleted, cutoff_date)
+        success(total_deleted: total_deleted, cutoff_date: cutoff_date, batch_size: BATCH_SIZE, expiration_threshold_days: EXPIRATION_THRESHOLD_DAYS)
       rescue StandardError => e
         log_error(e)
         failure(nil, e.message)
@@ -32,12 +26,12 @@ module SpreeCmCommissioner
 
       private
 
-      def log_cleanup_result(total_deleted, cutoff_time)
+      def log_cleanup_result(total_deleted, cutoff_date)
         CmAppLogger.log(
           label: 'SpreeCmCommissioner::OauthAccessTokens::CleanupExpired completed',
           data: {
             total_deleted: total_deleted,
-            cutoff_time: cutoff_time,
+            cutoff_date: cutoff_date,
             batch_size: BATCH_SIZE,
             expiration_threshold_days: EXPIRATION_THRESHOLD_DAYS
           }

data/app/views/spree/admin/homepage_section/_form.html.erb

@@ -32,11 +32,6 @@
             <%= f.label :active %>
             <%= f.check_box :active %>
           <% end %>
-          <%= f.field_container :preview, class: ['custom-control', 'custom-checkbox', 'my-4'] do %>
-            <%= f.check_box :preview, class: 'custom-control-input' %>
-            <%= f.label :preview, 'Preview (internal team only)', class: 'custom-control-label' %>
-            <%= f.error_message_on :preview %>
-          <% end %>
         </div>
       </div>
     </div>