spree_cm_commissioner 2.8.7.pre.pre2 → 2.8.8

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

@@ -14,8 +14,7 @@ module Spree
 
           base.attributes :need_confirmation, :product_type, :kyc, :kyc_fields, :allowed_upload_later, :allow_anonymous_booking,
                           :use_video_as_default, :allow_transfer, :allow_gift_transfer
-
-          base.attributes :reveal_description, :discontinue_on, :public_metadata, :purchasable_on, :preview,
+          base.attributes :reveal_description, :discontinue_on, :public_metadata, :purchasable_on,
                           :enable_inventory_hold
 
           # Expose only the `event_id` here instead of the full event object.

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

@@ -17,8 +17,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/waiting_room/publish_lobby_path.rb

@@ -17,8 +17,17 @@ module SpreeCmCommissioner
       extend SpreeCmCommissioner::ServiceModuleThrowable
 
       def call
-        # merge: true so we never clobber the lobby's `full` / `available_slots` fields.
-        lobby_document.set({ waiting_guests_records_path: records_path }, merge: true)
+        # merge: true so we never clobber the lobby's `full` / `available_slots` fields, and it
+        # deep-merges the nested `logs` map so each job keeps its own namespaced key.
+        # logs.publish_lobby_path_job.last_published_at is a point-in-time heartbeat: it confirms
+        # the 5-min publisher cron is alive and (with the path above) shows the date partition.
+        lobby_document.set(
+          {
+            waiting_guests_records_path: records_path,
+            logs: { publish_lobby_path_job: { last_published_at: Time.zone.now } }
+          },
+          merge: true
+        )
 
         success(records_path: records_path)
       rescue StandardError => e

data/app/services/spree_cm_commissioner/waiting_room/stamp_queue_positions.rb

@@ -23,7 +23,7 @@ module SpreeCmCommissioner
       CALLER_INTERVAL_SECONDS = (ENV['WAITING_ROOM_CALLER_INTERVAL_SECONDS'] || 60).to_i
 
       # Caps the batch size assumed when estimating the ETA (not a release limit). The lobby's
-      # slots_per_call is a single run's available_slots, which spikes on cold starts / lulls
+      # recent_slots_per_call is a single run's available_slots, which spikes on cold starts / lulls
       # (active_sessions low → available_slots ≈ max_sessions). An uncapped spike collapses hundreds
       # of positions into batch 1 and under-promises the wait, so we bound it to keep ETAs
       # conservative. Tune to roughly the real per-minute release capacity.
@@ -39,11 +39,11 @@ module SpreeCmCommissioner
       private
 
       def stamp_positions
+        started_at = Time.zone.now
         paths = stamp_paths
         total = paths.sum { |path| waiting_count(path) }
-        return if total.zero?
 
-        @slots_per_call = lobby_data[:slots_per_call].to_i
+        @recent_slots_per_call = lobby_data[:recent_slots_per_call].to_i
         @flat_wait = lobby_data[:avg_queue_to_enter_seconds].to_i
         @stamped_at = Time.zone.now
         @stamped = 0
@@ -60,6 +60,31 @@ module SpreeCmCommissioner
             firestore.batch { |batch| slice.each { |doc| stamp_doc(batch, doc) } }
           end
         end
+
+        publish_logs(started_at: started_at, waiting_total: total)
+      end
+
+      # Point-in-time heartbeat for the position-stamper cron, mirroring the caller/publisher writers.
+      # Written every run (even when nobody is waiting) so a stale timestamp signals a dead cron rather
+      # than an empty queue. merge: true deep-merges into the shared lobby `logs` map, so this job's
+      # key sits alongside the caller's and publisher's without clobbering them.
+      def publish_logs(started_at:, waiting_total:)
+        finished_at = Time.zone.now
+        lobby_document.set(
+          {
+            logs: {
+              stamp_queue_positions_job: {
+                stamped_count: @stamped,
+                waiting_total: waiting_total,
+                stamp_limit_reached: waiting_total > STAMP_LIMIT,
+                last_started_at: started_at,
+                last_finished_at: finished_at,
+                last_duration_ms: ((finished_at - started_at) * 1000).round
+              }
+            }
+          },
+          merge: true
+        )
       end
 
       def stamp_doc(batch, doc)
@@ -98,16 +123,16 @@ module SpreeCmCommissioner
       end
 
       # Groups positions into batches that enter together, so everyone in a batch gets the same ETA.
-      # The batch size is slots_per_call, capped by MAX_ETA_BATCH_SIZE to keep a spiking release rate
-      # from under-promising. nil when slots_per_call is unknown (cold start) → falls back to the
+      # The batch size is recent_slots_per_call, capped by MAX_ETA_BATCH_SIZE to keep a spiking release rate
+      # from under-promising. nil when recent_slots_per_call is unknown (cold start) → falls back to the
       # flat lobby average. e.g. batch size 50, 1 call/min:
       #   flat estimate:  position 1 and position 50 both see ~20 min ❌
       #   batch estimate: positions  1–50  → batch 1 → ~10 min
       #                   positions 51–100 → batch 2 → ~20 min  ✅
       def batch_wait(position)
-        return nil unless @slots_per_call.positive?
+        return nil unless @recent_slots_per_call.positive?
 
-        batch_size = [@slots_per_call, MAX_ETA_BATCH_SIZE].min
+        batch_size = [@recent_slots_per_call, MAX_ETA_BATCH_SIZE].min
         batch_number = ((position - 1) / batch_size) + 1
         [batch_number * CALLER_INTERVAL_SECONDS, min_queue_floor].max
       end
@@ -141,7 +166,11 @@ module SpreeCmCommissioner
       end
 
       def lobby_data
-        @lobby_data ||= firestore.col('waiting_rooms').doc('lobby').get.data || {}
+        @lobby_data ||= lobby_document.get.data || {}
+      end
+
+      def lobby_document
+        @lobby_document ||= firestore.col('waiting_rooms').doc('lobby')
       end
 
       def firestore

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>

data/config/initializers/spree_permitted_attributes.rb

@@ -50,10 +50,6 @@ module Spree
       available_on
       hide_video_banner
       vendor_id
-      type
-      voting_config
-      fraud_config
-      preview
     ]
 
     @@store_attributes += [
@@ -111,9 +107,5 @@ module Spree
       route_stops
       terms_and_conditions
     ]
-
-    @@product_attributes += %i[
-      preview
-    ]
   end
 end

data/config/locales/en.yml

@@ -216,10 +216,7 @@ en:
     riel: "៛"
 
   spree:
-    voting_contestant_advancer:
-      reversion_error: "Cannot eliminate here yet. This contestant appears in a later session."
-    is_open_dated: "Is Open Dated Trip?"
-    description: "Description"
+    description: Description
     enable_telegram_alert: Enable Telegram Alert
     registered_by:
       system_registered: "System Registered"
@@ -538,10 +535,6 @@ en:
           attributes:
             exception_rules:
               invalid_json: "is not a valid format"
-        spree_cm_commissioner/show_contestant:
-          attributes:
-            video_highlights:
-              invalid_json: "is not a valid format"
         spree_cm_commissioner/customer:
           attributes:
             base:
@@ -553,20 +546,6 @@ en:
           attributes:
             place_id:
               taken: "has already existed with this place type"
-        spree_cm_commissioner/voting_session:
-          attributes:
-            closes_at:
-              must_be_after_opens_at: "must be after opens_at"
-              must_not_exceed_parent: "cannot be after parent session closes_at"
-            parent_id:
-              must_have_contestants: '"%{name}" must have contestants assigned'
-        spree_cm_commissioner/voting_contestant:
-          attributes:
-            base:
-              last_contestant_in_parent_session: 'cannot remove the last contestant from "%{session_name}" because child sessions depend on it'
-              advanced_from_session: 'was advanced from a previous session and cannot be removed directly. Clear the advancement in the source session instead.'
-              pre_vote_session: 'cannot be removed from a pre-vote session.'
-              has_advanced_to_session: 'has been assigned to advance to another session. Clear the advancement first before removing this contestant.'
         spree_cm_commissioner/tenant:
           attributes:
             host:
@@ -726,10 +705,6 @@ en:
       FPS_TWEENTY_FOUR: "24 (Cinematic Mode)"
       FPS_THIRTY: "30 (TV Show or Online Video)"
       FPS_SIXTY: "60 (Sport and Gaming)"
-  import_contestants:
-    missing_file: "Please select a file to import."
-    queued: "Import queued. Contestants will be created in the background."
-
   import_orders:
     invalid_file: "Invalid File upload"
     invalid_json_format: "Invalid JSON format for orders"
@@ -806,25 +781,7 @@ en:
     token_missing: "Verification token is missing"
     verification_failed: "Human verification failed"
     service_unavailable: "Verification service is temporarily unavailable"
-  spree_cm_commissioner:
-    voting_contestants:
-      assigner:
-        not_eliminated: "Only eliminated contestants can be added to a Save Contestants session. %{name} is %{status}."
-    voting_leaderboards:
-      combined_result:
-        pre_vote_not_finalized: "Cannot combine results: Pre-Vote sessions not yet finalized: %{names}"
-
-  voting:
-    errors:
-      rate_limit_user: "You're voting too fast. Please wait a moment before voting again."
-      rate_limit_ip: "Too many votes from your network. Please try again shortly."
-      device_account_limit: "This device has been used by too many accounts."
-      vpn_blocked: "Voting is not allowed from VPN or proxy connections."
-      contestant_vote_cap_exceeded: "You have reached the maximum number of votes allowed for this contestant."
-      no_winners_confirmed: "No winners confirmed"
-      all_contestants_must_be_ranked: "All non-eliminated contestants must be ranked"
-      save_advance_to_session_required: "A target voting session must be selected to advance saved contestants"
-      advance_to_session_not_found: "The selected target session could not be found"
+
   ticket_transfer:
     rules:
       rule_already_exists_for_scope: "An active transfer fee rule already exists for %{scope_type} with currency %{currency}"
@@ -870,3 +827,4 @@ en:
     cooldown_active: "Please wait %{hours_remaining} hour(s) before attempting another transfer"
     max_transfers_reached: "This ticket has reached the maximum number of transfers (%{limit})"
     event_cutoff_reached: "Transfers are no longer allowed less than %{hours} hour(s) before the event starts"
+

data/config/locales/km.yml

@@ -200,8 +200,6 @@ km:
     riel: "៛"
 
   spree:
-    voting_contestant_advancer:
-      reversion_error: "មិនអាចដកចេញនៅវគ្គនេះបានទេ។ បេក្ខជននេះមាននៅវគ្គបោះឆ្នោតក្រោយ។"
     registered_by:
       system_registered: "ចុះឈ្មោះដោយប្រព័ន្ធ"
       self_registered: "ចុះឈ្មោះដោយខ្លួនឯង"
@@ -409,24 +407,6 @@ km:
           attributes:
             exception_rules:
               invalid_json: "Format មិនត្រឹមត្រូវ"
-        spree_cm_commissioner/show_contestant:
-          attributes:
-            video_highlights:
-              invalid_json: "Format មិនត្រឹមត្រូវ"
-        spree_cm_commissioner/voting_session:
-          attributes:
-            closes_at:
-              must_be_after_opens_at: "ត្រូវតែក្រោយ opens_at"
-              must_not_exceed_parent: "មិនអាចក្រោយ closes_at របស់ session មេ"
-            parent_id:
-              must_have_contestants: '"%{name}" ត្រូវតែមានអ្នកចូលប្រកួត'
-        spree_cm_commissioner/voting_contestant:
-          attributes:
-            base:
-              last_contestant_in_parent_session: 'មិនអាចដកអ្នកចូលប្រកួតចុងក្រោយពី "%{session_name}" ព្រោះ session កូនពឹងផ្អែកលើវា'
-              advanced_from_session: 'ត្រូវបានដំឡើងពី session មុន ហើយមិនអាចដកចេញដោយផ្ទាល់បានទេ។ សូមលុបការដំឡើងនៅក្នុង session ប្រភពជំនួសវិញ។'
-              pre_vote_session: 'មិនអាចដកចេញពី pre-vote session បានទេ។'
-              has_advanced_to_session: 'ត្រូវបានកំណត់ឱ្យដំឡើងទៅ session មួយទៀត។ សូមលុបការដំឡើងជាមុនសិន មុននឹងដកអ្នកចូលប្រកួតនេះចេញ។'
         spree_cm_commissioner/tenant:
           attributes:
             host:
@@ -653,17 +633,7 @@ km:
   turnstile:
     token_missing: "សញ្ញាណផ្ទៀងផ្ទាត់គឺបាត់"
     service_unavailable: "សេវាកម្មពេលនេះមិនមានការផ្ទៀងផ្ទាត់"
-
-  spree_cm_commissioner:
-    voting_contestants:
-      assigner:
-        not_eliminated: "តែអ្នកចូលប្រកួតដែលត្រូវបានលុបចោលប៉ុណ្ណោះអាចបន្ថែមទៅ Save Contestants session បាន។ %{name} មានស្ថានភាព %{status}។"
-  voting:
-    errors:
-      no_winners_confirmed: "មិនមានអ្នកឈ្នះត្រូវបានបញ្ជាក់"
-      all_contestants_must_be_ranked: "អ្នកចូលរួមទាំងអស់ដែលមិនត្រូវបានលុបចោលត្រូវតែមានចំណាត់ថ្នាក់"
-      save_advance_to_session_required: "ត្រូវតែជ្រើសរើសសម័យបោះឆ្នោតគោលដៅដើម្បីជំរុញអ្នកចូលរួមដែលបានជ្រើស"
-      advance_to_session_not_found: "រកមិនឃើញសម័យគោលដៅដែលបានជ្រើស"
+    verification_failed: "ការផ្ទៀងផ្ទាត់មនុស្សបានបរាជ័យ។ សូមព្យាយាមម្តងទៀត។"
 
   ticket_transfer:
     transfer_not_found: "រកមិនឃើញការផ្ទេរ"
@@ -707,4 +677,3 @@ km:
     cooldown_active: "សូមរង់ចាំ %{hours_remaining} ម៉ោងមុនពេលព្យាយាមផ្ទេរម្តងទៀត"
     max_transfers_reached: "សំបុត្រនេះបានឈានដល់ចំនួនផ្ទេរអតិបរមា (%{limit})"
     event_cutoff_reached: "ការផ្ទេរមិនត្រូវបានអនុញ្ញាតឡើយក្នុងរយៈពេល %{hours} ម៉ោងមុនពេលព្រឹត្តិការណ៍ចាប់ផ្តើម"
-    verification_failed: "ការផ្ទៀងផ្ទាត់មនុស្សបានបរាជ័យ។ សូមព្យាយាមម្តងទៀត។"

data/config/routes.rb

@@ -511,7 +511,6 @@ Spree::Core::Engine.add_routes do
         resources :vendors
         resources :products
         resources :taxons, only: %i[index show], id: /.+/
-        resources :ad_campaigns, only: [:index]
 
         resources :account_checker
         resource :pin_code_checkers, only: [:update]
@@ -521,7 +520,6 @@ Spree::Core::Engine.add_routes do
 
         resources :homepage, only: [] do
           resources :homepage_sections, only: [:index]
-          resources :preview_sections, only: %i[index]
         end
 
         resource :account, controller: :account, only: %i[show update]
@@ -600,29 +598,6 @@ Spree::Core::Engine.add_routes do
         resources :cms_pages, only: %i[index show]
         resources :waiting_room_sessions, only: :create
 
-        resources :shows, only: [:show] do
-          resources :episodes, only: %i[index show]
-          resources :people, controller: :show_people, only: %i[index] do
-            resources :assignments, controller: :show_person_assignments, only: %i[index]
-          end
-          resources :contestants, controller: :show_contestants, only: %i[show]
-          resources :elimination_sessions, controller: :show_elimination_sessions, only: %i[index]
-          resources :free_vote_claims, only: :create
-        end
-
-        resources :voting_sessions, only: [] do
-          resources :voting_contestants, only: :index
-          resources :voting_credits, only: :index
-          resources :votes, only: %i[create index]
-        end
-
-        resources :voting_credit_transactions, only: :index
-        resources :votes, only: :index
-
-        resources :preview_taxons, only: %i[index show], id: /.+/
-        resources :preview_products, only: %i[index show]
-        resources :preview_shows, only: %i[show]
-
         resources :order_histories, only: %i[index] do
           member do
             patch :archive
@@ -734,7 +709,6 @@ Spree::Core::Engine.add_routes do
         resources :homepage, only: [] do
           resources :homepage_sections, only: [:index]
           resource :homepage_background, controller: :homepage_background, only: [:show]
-          resources :preview_sections, only: %i[index]
         end
         resources :active_homepage_events, only: [:index]
 
@@ -758,8 +732,6 @@ Spree::Core::Engine.add_routes do
         resources :inventory_items, only: %i[index]
         resources :event_matches, only: %i[index]
         resources :invite_guests, only: %i[show update]
-        resources :preview_taxons, only: %i[index show], id: /.+/
-        resources :preview_products, only: %i[index show]
         resources :ticket_transfers do
           collection do
             get :preview_rule

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.8.7.pre.pre2'.freeze
+  VERSION = '2.8.8'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -69,22 +69,16 @@ require 'byebug' if Rails.env.development? || Rails.env.test?
 module SpreeCmCommissioner
   class << self
     # Allows overriding the default Redis connection pools with custom ones
-    attr_writer :inventory_redis_pool, :voting_redis_pool
+    attr_writer :inventory_redis_pool
 
     # Inventory Redis pool for inventory management
     def inventory_redis_pool
       @inventory_redis_pool ||= default_redis_pool
     end
 
-    # Voting Redis pool for voting system counters
-    def voting_redis_pool
-      @voting_redis_pool ||= default_redis_pool
-    end
-
     # Resets all Redis pools, useful for testing or reinitialization
     def reset_redis_pools
       @inventory_redis_pool = nil
-      @voting_redis_pool = nil
     end
 
     private

data/spree_cm_commissioner.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(%r{^spec/fixtures})}
 
-  s.require_paths = ['lib', 'app']
+  s.require_path = 'lib'
   s.requirements << 'none'
 
   spree_opts = '>= 4.5.0'