spree_cm_commissioner 2.8.4.pre.pre4 → 2.8.4.pre.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20f0a180f0ca53b77ce1c80dd3dc41e0d3049321aa02567ae35f23421828020c
-  data.tar.gz: 52f68c03ee83f7b0863ebcda54c301be0f13f1584f026a6f46d574933e0f368e
+  metadata.gz: 65dbac61388e0427398c0ae91a6fbb9a8a17c22edf317b421c7070a3ee07980c
+  data.tar.gz: 2fb8bcf23633f432e5f3af10d77fc04cc4fa0899385282d18a6d99e672cb02f3
 SHA512:
-  metadata.gz: 64e7b779a99ea18dfc44ecd1953f4e7878087754c55fe13fe741304ca4566b027e301638d2954ebdd19d1dc0e014b5119bb2ca7e73e0a36be05570db66c2eae0
-  data.tar.gz: bf170f7c4fdba381ff89bd02393df9b5e8baad1d765d5542804beca8fef87f03088ac0a6903fd62e1017eba367d8653d1f44ad89b7396c91ed9fb1bc5f6c2f68
+  metadata.gz: aef422f9c1e17f2f92f93164cfbc979feb7d636fb7468847549e805ea79280544a4935b806aa5b28d6c99f1b15beb68803ba86c7dc0e22397e90e8a93c6baf31
+  data.tar.gz: 4ccdf815706a21cdd40fcfc02861fabf34c5792281a7101a306e92bc2b37665969a9aac7acbe02dfbcc535f020ec34b94e39f78e48679ce98b0ccf33ebd86f88

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.8.4.pre.pre4)
+    spree_cm_commissioner (2.8.4.pre.pre5)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

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

@@ -1,102 +1,13 @@
-require 'google/cloud/firestore'
-
 module SpreeCmCommissioner
   module WaitingRoom
     class StampQueuePositionsJob < ApplicationJob
       queue_as :waiting_room
 
-      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
-        total = paths.sum { |p| waiting_count(p) }
-        return if total.zero?
-
-        stamped_at = Time.zone.now
-        global = 0
-
-        paths.each do |path|
-          remaining = STAMP_LIMIT - global
-          break if remaining <= 0
-
-          docs = waiting_query(path).order('queued_at').limit(remaining).get.to_a
-
-          # 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: [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
-            end
-          end
-        end
-      end
-
-      private
-
-      def stamp_paths
-        [previous_records_path, records_path]
-      end
-
-      def records_path
-        default_records_path(Time.zone.now.strftime('%Y-%m-%d'))
-      end
-
-      def previous_records_path
-        default_records_path(1.day.ago.strftime('%Y-%m-%d'))
-      end
-
-      def default_records_path(date)
-        "waiting_guests/#{date}/records"
-      end
-
-      def waiting_count(path)
-        waiting_query(path).aggregate_query.add_count.get.first.get.to_i
-      end
-
-      def waiting_query(path)
-        firestore.col(path).where('allow_to_enter_room_at', '==', nil)
-      end
-
-      def lobby_data
-        @lobby_data ||= firestore.col('waiting_rooms').doc('lobby').get.data || {}
-      end
-
-      def firestore
-        @firestore ||= Google::Cloud::Firestore.new(
-          project_id: service_account[:project_id],
-          credentials: service_account
-        )
-      end
+        return if ENV['WAITING_ROOM_DISABLED'] == 'yes'
 
-      def service_account
-        @service_account ||= Rails.application.credentials.cloud_firestore_service_account
+        # call! so a stamping failure raises (Sidekiq retries/alerts) instead of being silently swallowed.
+        SpreeCmCommissioner::WaitingRoom::StampQueuePositions.call!
       end
     end
   end

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

@@ -0,0 +1,114 @@
+require 'google/cloud/firestore'
+
+module SpreeCmCommissioner
+  module WaitingRoom
+    # Stamps queue positions onto waiting-guest Firestore docs so the app can render each guest's
+    # place in line and a forward-only progress bar. Walks the day partitions oldest-first, assigning
+    # a continuous global position (1, 2, 3, ...) capped at STAMP_LIMIT, and commits in Firestore
+    # batches to stay under the 10 MiB/commit payload bound.
+    class StampQueuePositions
+      prepend ::Spree::ServiceModule::Base
+      extend SpreeCmCommissioner::ServiceModuleThrowable
+
+      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 call
+        stamp_positions
+        success(stamped: @stamped.to_i)
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+
+      private
+
+      def stamp_positions
+        paths = stamp_paths
+        avg_queue_to_enter = lobby_data[:avg_queue_to_enter_seconds].to_i
+        total = paths.sum { |p| waiting_count(p) }
+        return if total.zero?
+
+        stamped_at = Time.zone.now
+        @stamped = 0
+
+        paths.each do |path|
+          remaining = STAMP_LIMIT - @stamped
+          break if remaining <= 0
+
+          docs = waiting_query(path).order('queued_at').limit(remaining).get.to_a
+
+          # 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 { |doc| stamp_doc(b, doc, avg_queue_to_enter, stamped_at) }
+            end
+          end
+        end
+      end
+
+      def stamp_doc(batch, doc, avg_queue_to_enter, stamped_at)
+        @stamped += 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: @stamped,
+          queue_total: [doc.data[:queue_total].to_i, @stamped].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]
+        batch.update(doc.ref, data)
+      end
+
+      def stamp_paths
+        [previous_records_path, records_path]
+      end
+
+      def records_path
+        default_records_path(Time.zone.now.strftime('%Y-%m-%d'))
+      end
+
+      def previous_records_path
+        default_records_path(1.day.ago.strftime('%Y-%m-%d'))
+      end
+
+      def default_records_path(date)
+        "waiting_guests/#{date}/records"
+      end
+
+      def waiting_count(path)
+        waiting_query(path).aggregate_query.add_count.get.first.get.to_i
+      end
+
+      def waiting_query(path)
+        firestore.col(path).where('allow_to_enter_room_at', '==', nil)
+      end
+
+      def lobby_data
+        @lobby_data ||= firestore.col('waiting_rooms').doc('lobby').get.data || {}
+      end
+
+      def firestore
+        @firestore ||= Google::Cloud::Firestore.new(project_id: service_account[:project_id], credentials: service_account)
+      end
+
+      def service_account
+        @service_account ||= Rails.application.credentials.cloud_firestore_service_account
+      end
+    end
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.8.4-pre4'.freeze
+  VERSION = '2.8.4-pre5'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.8.4.pre.pre4
+  version: 2.8.4.pre.pre5
 platform: ruby
 authors:
 - You
@@ -2264,6 +2264,7 @@ files:
 - app/services/spree_cm_commissioner/vendor_route_metrics/decrease_trip_count.rb
 - app/services/spree_cm_commissioner/vendor_route_metrics/increase_trip_count.rb
 - app/services/spree_cm_commissioner/waiting_room/publish_lobby_path.rb
+- app/services/spree_cm_commissioner/waiting_room/stamp_queue_positions.rb
 - app/services/spree_cm_commissioner/waiting_room_lobby_metadata_fetcher.rb
 - app/services/spree_cm_commissioner/waiting_room_system_metadata_fetcher.rb
 - app/services/spree_cm_commissioner/waiting_room_system_metadata_setter.rb