spree_cm_commissioner 2.8.15.pre.pre8 → 2.8.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f0d6bc194265bc170fa7f5d480c4c3aead23d86827c1f80896237f8c3864d6c
-  data.tar.gz: 7fb03f4121f2cdead7cbb774489c675663dc172bb62c9b6c3a7b06c67c52c08a
+  metadata.gz: ca0138759a1da40541b5d076fb9709847d44d88885593f5b69921993cfd26591
+  data.tar.gz: 79408535d56a9d4b62cac5154a316f6652d6d8664c04a030f00588b39f7ddd24
 SHA512:
-  metadata.gz: cb11254307ddad72b7941b7474ee8fc473474dac0abfaa95a3d6eb15c803fe86a7bafb60b8705d40a93c00e83d39836846ed6ed16bf45453e47301f5666ce058
-  data.tar.gz: 1880e96a3b09bc6fb3efcc72649221b0603ab1a87d1774dd13badf47ba38f57d94b875a9261f369ab839ada7c35d698ffe4230c1d6b327654ecec693e74cc41d
+  metadata.gz: 3e1a90b2f9115755fcd8cb777e0cd4d3c05b950a8a1b913ac526be4c5967d062533b5683bf48d3ca979e726347bb1945520b0701337872e7626d2fc3524d7952
+  data.tar.gz: 8b4813fe21cc8495e2a512ea1662e2105ba61994c1866794bd9da91ef5c805b1b49cc9d8ea5cdf53f35dd2fe6a96295491eea72853cfdaf899377264922e8a84

data/.env.example

@@ -20,11 +20,22 @@ 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
+WAITING_ROOM_MIN_WAIT_TO_ENTER_SECONDS=600 # Waiting Room step floor (10 min)
+WAITING_ROOM_MIN_QUEUE_TO_ENTER_SECONDS=300 # Queue step floor (5 min)
+WAITING_ROOM_MAX_WAIT_TO_DISPLAY_SECONDS=3600 # above this the ETA is hidden (1 h)
+WAITING_ROOM_CALLER_INTERVAL_SECONDS=60 # how often the caller runs; match the waiting_guests_caller cron
+WAITING_ROOM_MAX_ETA_BATCH_SIZE=50 # cap on batch size assumed when estimating the ETA
 
 # Vattanac Bank
 VATTANAC_AES_SECRET_KEY= ""
 VATTANAC_PUBLIC_KEY=""
 
+# Telegram OAuth (OpenID Connect) login client_id/client_secret are configured
+# per tenant (or on the default store for tenant-less logins) from the admin
+# under Telegram Authentication - see docs/authentication/telegram-login.md.
+
 # Organizer URL
 ORGANIZER_URL=http://127.0.0.1:4000/organizer
 
@@ -45,6 +56,9 @@ CACHE_DEFAULT_MAX_AGE=300 # Default for unlisted controllers - 5 minutes
 # Batch size for processing maintenance tasks in app/jobs/spree_cm_commissioner/maintenance_tasks/orchestrate_job.rb
 MAINTENANCE_TASKS_BATCH_SIZE=100
 
+# Batch size for slicing guest_ids when enqueuing RefinalizeGuestsBatchJob in app/models/spree_cm_commissioner/maintenance_tasks/event.rb
+MAINTENANCE_TASKS_REFINALIZE_GUESTS_BATCH_SIZE=300
+
 # Export related:
 OPERATOR_GUEST_JSON_GZIP_CACHE_HOURS=24
 EXPORT_PRESIGNED_URL_EXPIRATION_MINUTES=15
@@ -63,3 +77,9 @@ 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
+
+# See: app/jobs/spree_cm_commissioner/telegram_alerts/order_integrity_check_job.rb
+ORDER_INTEGRITY_TELEGRAM_ALERT_ENABLED="no"  # Set to yes to enable the order integrity Telegram alert job (off by default to avoid flooding Telegram rate limits during traffic spikes)

data/.github/workflows/test_and_build_gem.yml

@@ -163,8 +163,9 @@ jobs:
       - name: Security
         env:
           DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
+
+        # Using --no-threads to bypass a known Ruby 3.2.0 GC segmentation fault in CI.
         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
 
   test:

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.8.15.pre.pre8)
+    spree_cm_commissioner (2.8.15)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -886,7 +886,7 @@ GEM
       spree_backend (>= 4.3.0.rc1)
       spree_emails (>= 4.3.0.rc1)
       spree_extension
-    spree_vpago (2.0.5.pre.beta)
+    spree_vpago (2.3.4)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)

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

@@ -27,6 +27,13 @@ module SpreeCmCommissioner
       PopularRoutesController
       RoutePlacesController
       ShowsController
+      EpisodesController
+      ShowPeopleController
+      ShowPersonAssignmentsController
+      ShowContestantsController
+      VotePackagesController
+      ShowEliminationSessionsController
+      PaymentMethodsController
     ].freeze
 
     # Priority 3: Moderate Freshness (30 minutes)
@@ -46,6 +53,7 @@ module SpreeCmCommissioner
     HIGH_FRESHNESS_CONTROLLERS = %w[
       TripsController
       TripSearchController
+      VotingContestantsController
     ].freeze
 
     def shared_max_age

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

@@ -0,0 +1,80 @@
+module SpreeCmCommissioner
+  module LoadTestAccountManagement
+    extend ActiveSupport::Concern
+
+    include SpreeCmCommissioner::LoadTestAccountScope
+
+    included do
+      before_action :authorize_load_testing!, only: %i[create bulk_destroy]
+    end
+
+    # Ensures N load-test accounts exist (idempotent) for `load_test_tenant` (nil = platform).
+    def create
+      result = SpreeCmCommissioner::LoadTest::CreateAccounts.call(**pool_params)
+
+      if result.success?
+        flash[:success] = "#{result.value[:created]} load-test accounts created."
+      else
+        flash[:error] = result.error.value
+      end
+
+      redirect_to manage_accounts_redirect_path
+    rescue StandardError => e
+      flash[:error] = e.message
+      redirect_to manage_accounts_redirect_path
+    end
+
+    def bulk_destroy
+      result = SpreeCmCommissioner::LoadTest::DestroyAccounts.call(**pool_params)
+
+      if result.success?
+        flash[:success] = "#{result.value[:destroyed]} destroyed, #{result.value[:not_found]} not found (already removed)."
+      else
+        flash[:error] = result.error.value
+      end
+
+      redirect_to manage_accounts_redirect_path
+    rescue StandardError => e
+      flash[:error] = e.message
+      redirect_to manage_accounts_redirect_path
+    end
+
+    private
+
+    # Default: cancancan's `authorize!`. Override in the including controller if it doesn't use
+    # cancancan (e.g. the organizer dashboard, which authorizes via RoleAuthorization/can_manage?).
+    def authorize_load_testing!
+      authorize! :manage, :load_testing
+    end
+
+    # Where create/bulk_destroy redirect back to. Must be implemented by the including controller
+    # (points at its own Load Test Accounts page).
+    def manage_accounts_redirect_path
+      raise NotImplementedError, "#{self.class} must implement #manage_accounts_redirect_path"
+    end
+
+    def pool_params
+      {
+        client_id: resolve_client_id,
+        count: params[:count].presence&.to_i || 20,
+        email_prefix: params[:email_prefix].presence || 'loadtest',
+        email_domain: params[:email_domain].presence
+      }
+    end
+
+    # Carries the form field values through the redirect so the index page re-renders with the
+    # same count/prefix/domain/page/per_page the admin/organizer just submitted with.
+    def redirect_params
+      params.slice(:count, :email_prefix, :email_domain, :page, :per_page).permit!
+    end
+
+    def resolve_client_id
+      return nil if load_test_tenant.nil?
+
+      application = Spree::OauthApplication.where(tenant_id: load_test_tenant.id).order(:id).first
+      raise "No OAuth application found for tenant #{load_test_tenant.name}" unless application
+
+      application.uid
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+module SpreeCmCommissioner
+  module LoadTestAccountScope
+    extend ActiveSupport::Concern
+
+    private
+
+    # The tenant these accounts are scoped to. nil means the platform (no tenant). Must be
+    # implemented by the including controller.
+    def load_test_tenant
+      raise NotImplementedError, "#{self.class} must implement #load_test_tenant"
+    end
+
+    DEFAULT_EXPORT_PER_PAGE = 10
+
+    # Queried fresh from the DB every time, so it's always in sync with the current pool rather than
+    # a stashed file or session state.
+    #
+    # Filters the `load_test_account` flag in SQL via the model's `load_test_accounts` scope (see
+    # UserDecorator), so only the tenant's load-test accounts are considered — never the whole users
+    # table. Unlike the old `order(:id).limit(2000).select(&:...)` approach, there's no scan cap:
+    # newly created accounts (highest ids, ordered first below) always show up even on tenants with
+    # far more than 2,000 users.
+    #
+    # Kaminari pages on the relation itself, so the DB only ever loads the current page's rows
+    # (`LIMIT`/`OFFSET`) — never the full pool into memory — via the same `page`/`per_page` params
+    # and `paginate` view helper every other index page in this app uses.
+    #
+    # Shared between LoadTestAccountManagement (lists/mutates the pool) and
+    # LoadTestLoginTokenGeneration (mints tokens for exactly the page shown), so both controllers
+    # resolve the same page the same way.
+    def export_accounts
+      Spree::User.where(tenant_id: load_test_tenant&.id)
+                 .load_test_accounts
+                 .order(id: :desc)
+                 .page(params[:page])
+                 .per(params[:per_page] || DEFAULT_EXPORT_PER_PAGE)
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module SpreeCmCommissioner
+  # Sets Current.load_test_bypass when the request carries the correct X-Request-Verify secret, so
+  # anti-abuse services (e.g. InventoryHolds::ValidateLimits) can skip their checks for trusted
+  # load tests. No-op unless LOAD_TEST_BYPASS_KEY is set. Include in any controller that can
+  # trigger such a check.
+  module LoadTestBypassable
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :set_load_test_bypass_current
+    end
+
+    private
+
+    # Always assigns the flag (false unless the request carries the correct
+    # secret), so its value never leaks from a previous request.
+    def set_load_test_bypass_current
+      SpreeCmCommissioner::Current.load_test_bypass = load_test_bypass_requested?
+    end
+
+    def load_test_bypass_requested?
+      key = ENV.fetch('LOAD_TEST_BYPASS_KEY', nil)
+      return false if key.blank?
+
+      provided = request.headers.fetch('X-Request-Verify', nil).to_s
+      ActiveSupport::SecurityUtils.secure_compare(provided, key)
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+module SpreeCmCommissioner
+  module LoadTestLoginTokenGeneration
+    extend ActiveSupport::Concern
+
+    include SpreeCmCommissioner::LoadTestAccountScope
+
+    included do
+      before_action :authorize_load_testing!, only: %i[create]
+    end
+
+    # Mints a fresh, stateless login-token JWT for each account on the requested page (same
+    # page/per_page as the Load Test Accounts index) and returns them as JSON. Nothing is
+    # persisted — the tokens are self-contained and verified by signature + expiry alone (see
+    # SpreeCmCommissioner::LoadTest::LoginToken).
+    def create
+      render json: login_tokens_payload(export_accounts)
+    rescue StandardError => e
+      render json: { error: e.message }, status: :unprocessable_entity
+    end
+
+    private
+
+    # Default: cancancan's `authorize!`. Override in the including controller if it doesn't use
+    # cancancan (e.g. the organizer dashboard, which authorizes via RoleAuthorization/can_manage?).
+    def authorize_load_testing!
+      authorize! :manage, :load_testing
+    end
+
+    # aud claim: the admin/organizer who minted the tokens. No fallback — both hosting controllers
+    # already require an authenticated user for every action here, so spree_current_user being
+    # absent would be a bug worth raising on, not silently mislabeling as 'system'.
+    def token_audience
+      spree_current_user.id
+    end
+
+    # user_id + the user_id_token are all k6 needs (email and expiry are already claims inside the
+    # JWT itself — sub / exp — and the token alone identifies + authenticates the account via
+    # UserPasswordAuthenticator's token-only path). expires_at is included too, purely so the
+    # generated-tokens list can show it to a human without decoding the JWT. Named `user_id_token`
+    # (not `id_token`) so UserAuthenticator can route on the params key alone, without decoding
+    # every request's `id_token` to check whether it's a load-test token.
+    def login_tokens_payload(accounts)
+      accounts.map do |user|
+        generated = SpreeCmCommissioner::LoadTest::LoginToken.generate(user: user, audience: token_audience)
+        {
+          user_id: user.id,
+          user_id_token: generated[:token],
+          expires_at: generated[:expires_at]
+        }
+      end
+    end
+  end
+end

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

@@ -12,6 +12,7 @@ module SpreeCmCommissioner
       end
 
       @spree_current_order.last_ip_address = request.remote_ip
+      @spree_current_order.device_id = device_id if device_id.present?
       @spree_current_order
     end
 
@@ -25,5 +26,9 @@ module SpreeCmCommissioner
         state: params[:state]
       )
     end
+
+    def device_id
+      params[:device_id].presence
+    end
   end
 end

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

@@ -27,13 +27,15 @@ module SpreeCmCommissioner
       return unless result.failure?
 
       render json: {
-        errors: [{
-          status: '403',
-          error_code: 'human_verification_failed',
-          title: I18n.t('turnstile.verification_failed'),
-          detail: result.message
-        }
-]
+        errors: [
+          {
+            status: '403',
+            error_code: 'human_verification_failed',
+            title: I18n.t('turnstile.verification_failed'),
+            detail: result.message,
+            turnstile_error_code: result.respond_to?(:error_code) ? result.error_code : nil
+          }
+        ]
       }, status: :forbidden
     end
 

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

@@ -80,8 +80,10 @@ module Spree
 
       def permitted_resource_params
         params.require(object_name).permit(:first_name, :last_name, :gender, :dob, :occupation_id,
-                                           :nationality_id, :age, :emergency_contact, :line_item_id,
-                                           :seat_number, :phone_number
+                                           :nationality_id, :age, :emergency_contact,
+                                           :line_item_id, :seat_number, :phone_number, :contact,
+                                           :other_organization, :expectation, :address,
+                                           :social_contact_platform, :social_contact
         )
       end
 

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

@@ -23,6 +23,31 @@ module Spree
           end
         end
       end
+
+      # POST: /admin/orders/import_new_orders/:id/cancel
+      def cancel
+        import = model_class.find(params[:id])
+        show_url = spree.admin_import_new_order_url(import.id)
+
+        unless import.cancellable?
+          flash[:error] = 'These orders cannot be canceled.' # rubocop:disable Rails/I18nLocaleTexts
+          redirect_to show_url and return
+        end
+
+        if params[:confirm_name].to_s.strip != import.name.to_s.strip
+          flash[:error] = 'Import name did not match. Cancellation aborted.' # rubocop:disable Rails/I18nLocaleTexts
+          redirect_to show_url and return
+        end
+
+        SpreeCmCommissioner::CancelImportOrderJob.perform_later(
+          import_order_id: import.id,
+          canceled_by_user_id: spree_current_user.id,
+          cancellation_reason: params[:cancellation_reason].to_s.strip.presence
+        )
+
+        flash[:success] = "Canceling orders from \"#{import.name}\". This runs in the background."
+        redirect_to show_url
+      end
     end
   end
 end

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

@@ -9,6 +9,7 @@ module Spree
         q['s'] ||= 'created_at desc'
         q['created_at_gt'] = parse_time_or_nil(q['created_at_gt'], :beginning_of_day) if q['created_at_gt'].present?
         q['created_at_lt'] = parse_time_or_nil(q['created_at_lt'], :end_of_day) if q['created_at_lt'].present?
+        normalize_enum_filters!(q)
 
         @search = scope.ransack(q)
         result_scope = @search.result(distinct: true)
@@ -18,7 +19,11 @@ module Spree
                  .page(params[:page])
                  .per(params[:per_page] || Spree::Backend::Config[:admin_orders_per_page])
 
-        @status_counts = result_scope.reorder(nil).group(:status).count
+        # Status tab counts must reflect every other filter but NOT the status filter, so
+        # each tab shows how many holds it would return (otherwise selecting one status
+        # zeroes out all the other tabs).
+        @status_counts = scope.ransack(q.except('status_eq')).result(distinct: true)
+                              .reorder(nil).group(:status).count
       end
 
       def release
@@ -44,8 +49,23 @@ module Spree
 
       private
 
+      # `status` and `release_reason` are integer-backed enums. Ransack casts a string
+      # value for an integer column with String#to_i, so "payment_locked" becomes 0
+      # (== :pending) and every label silently filters to the wrong status. Translate
+      # enum labels to their stored integer before searching.
+      def normalize_enum_filters!(query)
+        {
+          'status_eq' => SpreeCmCommissioner::InventoryHold.statuses,
+          'release_reason_eq' => SpreeCmCommissioner::InventoryHold.release_reasons
+        }.each do |key, mapping|
+          value = query[key]
+          query[key] = mapping[value.to_s] if value.present? && mapping.key?(value.to_s)
+        end
+      end
+
       def back_params
         raw_params = params[:back_params].presence || params
+        raw_params = raw_params.to_unsafe_h if raw_params.respond_to?(:to_unsafe_h)
         ActionController::Parameters.new(raw_params).permit(:page, :per_page, q: {})
       end
 

data/app/controllers/spree/admin/system/load_test_accounts_controller.rb

@@ -0,0 +1,24 @@
+module Spree
+  module Admin
+    module System
+      class LoadTestAccountsController < Spree::Admin::BaseController
+        include SpreeCmCommissioner::LoadTestAccountManagement
+
+        def index
+          @export_accounts = export_accounts
+        end
+
+        private
+
+        # nil = platform. Admin load testing never operates on a tenant.
+        def load_test_tenant
+          nil
+        end
+
+        def manage_accounts_redirect_path
+          admin_system_load_test_accounts_path(**redirect_params)
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/system/load_test_flows_controller.rb

@@ -0,0 +1,11 @@
+module Spree
+  module Admin
+    module System
+      class LoadTestFlowsController < Spree::Admin::BaseController
+        def index
+          @load_test_flows = SpreeCmCommissioner::LoadTest::FlowRegistry.for_workflow('platform')
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/system/load_test_login_tokens_controller.rb

@@ -0,0 +1,16 @@
+module Spree
+  module Admin
+    module System
+      class LoadTestLoginTokensController < Spree::Admin::BaseController
+        include SpreeCmCommissioner::LoadTestLoginTokenGeneration
+
+        private
+
+        # nil = platform. Admin load testing never operates on a tenant.
+        def load_test_tenant
+          nil
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/system/load_testing_controller.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Admin
+    module System
+      class LoadTestingController < Spree::Admin::BaseController
+        def index; end
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/system/maintenance_tasks_controller.rb

@@ -0,0 +1,64 @@
+module Spree
+  module Admin
+    module System
+      class MaintenanceTasksController < Spree::Admin::BaseController
+        def index
+          authorize! :manage, SpreeCmCommissioner::MaintenanceTask
+
+          @search = scope.ransack(params[:q])
+          @tasks = @search.result(distinct: true)
+                          .order(created_at: :desc)
+                          .page(params[:page])
+                          .per(params[:per_page] || Spree::Backend::Config[:admin_orders_per_page])
+        end
+
+        def run_now
+          authorize! :manage, SpreeCmCommissioner::MaintenanceTask
+
+          task = SpreeCmCommissioner::MaintenanceTask.find(params[:id])
+
+          if task.completed_at.present?
+            flash[:error] = "Task ##{task.id} is already completed."
+          else
+            task.update!(manually_triggered: true)
+            task.execute
+
+            if task.completed_at.present?
+              flash[:success] = "Task ##{task.id} (#{task.type.demodulize}) ran successfully."
+            else
+              flash[:error] = "Task ##{task.id} (#{task.type.demodulize}) failed: #{task.last_error}"
+            end
+          end
+
+          redirect_to admin_system_maintenance_tasks_path(back_params)
+        end
+
+        def destroy
+          authorize! :manage, SpreeCmCommissioner::MaintenanceTask
+
+          task = SpreeCmCommissioner::MaintenanceTask.find(params[:id])
+
+          if task.destroy
+            flash[:success] = "Task ##{task.id} has been deleted."
+          else
+            flash[:error] = task.errors.full_messages.to_sentence.presence || "Failed to delete task ##{task.id}."
+          end
+
+          redirect_to admin_system_maintenance_tasks_path(back_params)
+        end
+
+        private
+
+        def scope
+          SpreeCmCommissioner::MaintenanceTask.accessible_by(current_ability, :manage)
+        end
+
+        def back_params
+          raw_params = params[:back_params].presence || params
+          raw_params = raw_params.to_unsafe_h if raw_params.respond_to?(:to_unsafe_h)
+          ActionController::Parameters.new(raw_params).permit(:page, :per_page, q: {})
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/system/waiting_room_controller.rb

@@ -4,7 +4,10 @@ module Spree
       class WaitingRoomController < Spree::Admin::BaseController
         def show
           @fetcher = SpreeCmCommissioner::WaitingRoomSystemMetadataFetcher.new
+          @lobby_fetcher = SpreeCmCommissioner::WaitingRoomLobbyMetadataFetcher.new
+
           @fetcher.load_document_data
+          @lobby_fetcher.load_document_data
 
           @active_sesions_count = SpreeCmCommissioner::WaitingRoomSession.active.count
         end
@@ -23,12 +26,31 @@ module Spree
           redirect_back fallback_location: admin_system_waiting_room_path
         end
 
+        def modify_max_sessions_count_cap
+          modifier = params[:max_sessions_count_cap]&.to_i || 0
+          SpreeCmCommissioner::WaitingRoomSystemMetadataSetter.new.modify_max_sessions_count_cap(modifier)
+
+          redirect_back fallback_location: admin_system_waiting_room_path
+        end
+
         def force_pull
           SpreeCmCommissioner::WaitingRoomLatestSystemMetadataPullerJob.perform_now
           SpreeCmCommissioner::WaitingGuestsCallerJob.perform_now
 
           redirect_back fallback_location: admin_system_waiting_room_path
         end
+
+        def publish_lobby_path
+          result = SpreeCmCommissioner::WaitingRoom::PublishLobbyPath.call
+
+          if result.success?
+            flash[:success] = "Published waiting guests records path: #{result.value[:records_path]}"
+          else
+            flash[:error] = result.error.to_s
+          end
+
+          redirect_back fallback_location: admin_system_waiting_room_path
+        end
       end
     end
   end

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

@@ -28,6 +28,10 @@ module Spree
         remove_asset(@taxon.home_banner)
       end
 
+      def remove_ad_banner
+        remove_asset(@taxon.ad_banner)
+      end
+
       def remove_video_banner
         remove_asset(@taxon.video_banner)
       end
@@ -49,6 +53,7 @@ module Spree
         @taxon.build_app_banner(attachment: permitted_resource_params.delete(:app_banner)) if permitted_resource_params[:app_banner]
         @taxon.build_web_banner(attachment: permitted_resource_params.delete(:web_banner)) if permitted_resource_params[:web_banner]
         @taxon.build_home_banner(attachment: permitted_resource_params.delete(:home_banner)) if permitted_resource_params[:home_banner]
+        @taxon.build_ad_banner(attachment: permitted_resource_params.delete(:ad_banner)) if permitted_resource_params[:ad_banner]
         @taxon.build_video_banner(attachment: permitted_resource_params.delete(:video_banner)) if permitted_resource_params[:video_banner]
       end
 

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

@@ -20,8 +20,26 @@ module Spree
         end
       end
 
+      # override
+      def update
+        preserve_non_form_roles
+        super
+      end
+
       private
 
+      # Role types the user form doesn't render (assigned in organizer dashboards), e.g. check-in groups and preview.
+      NON_FORM_ROLE_TYPES = %i[check_in preview].freeze
+
+      # spree_role_ids= replaces the whole role set, so a submit that omits these would drop them. Merge
+      # the user's existing ones back in so they survive. Skip when the form didn't submit roles at all.
+      def preserve_non_form_roles
+        return if params.dig(:user, :spree_role_ids).nil?
+
+        preserved_ids = @user.spree_roles.where(role_type: NON_FORM_ROLE_TYPES).pluck(:id).map(&:to_s)
+        params[:user][:spree_role_ids] = (params[:user][:spree_role_ids] + preserved_ids).uniq
+      end
+
       def build_profile
         return unless permitted_resource_params[:profile]