spree_cm_commissioner 2.8.3.pre.pre12 → 2.8.3.pre.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc7986faabd73e3ae1e70e3a80e14f59119301779f847a112d585d15bf52406f
-  data.tar.gz: 97c8e0f4d601a7ddb553e786bc23f0f8b9a70a1eae307d7cf79da8e05d70d5c9
+  metadata.gz: eedbddb863eb9f58dad73a83892a225e971a89736c37af047df757d76bcfc058
+  data.tar.gz: 59eaad5012be611640f1c27f6566bfb91cd7b5cea176d465be69c4230c8b9241
 SHA512:
-  metadata.gz: a1bec82d194a2943c597dc804c2a3f69c7a3f09da8c9734d82e76c1af7c102748175307e1a530a7107a0011bf5d1556cefc1c2d9fd7929e1e52ea2979912ed2c
-  data.tar.gz: 992f9e6d0c5b58e06d726ed5967121d85530bf654410a475ce7b694f7e559dc42d6bc0e021136e550b000517b6d9a505e45db16bede3bc2ecc0b70c308c267ec
+  metadata.gz: aa9db90a1c39aaa74f66135c5034cb8762e09123edaad154fb5fe6e013609b5344d23910bd8449380030c5b3e391b3a3792c92b569f5fbe2271d6e78420e55e6
+  data.tar.gz: 80c51833f840ba8b4db0611309153c7a7723fd986f065113a06063ac7d5aee78cce2af29dd2eb591b64a90c57a75f1f4716b9d7daf2664903ff34ad031f663e4

data/Gemfile.lock

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

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
@@ -29,6 +32,18 @@ module Spree
 
           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/interactors/spree_cm_commissioner/waiting_guests_caller.rb

@@ -19,18 +19,47 @@ module SpreeCmCommissioner
       max_sessions - active_sessions
     end
 
-    # This query required index. create them in Firebase beforehand.
-    # Client side must create waiting_guests document with :queued_at & :allow_to_enter_room_at to null to allow fillter & order.
+    # This query requires an index; create it in Firebase beforehand.
+    # Client must create waiting_guests documents with :queued_at and :allow_to_enter_room_at set to nil to allow filter + order queries.
+    #
+    # Yesterday's guests are always older than today's, so fill from yesterday first, then use any
+    # leftover slots for today. This way no one queued before the midnight rollover gets skipped.
+    #   e.g. 5 slots, 2 waiting in yesterday -> take both, then take 3 from today.
     def fetch_long_waiting_guests(available_slots)
-      firestore.col('waiting_guests')
-               .doc(current_date)
-               .col('records')
+      previous_guests = eligible_guests_in(previous_records_path, available_slots)
+
+      # Pre-flip window: the lobby pointer still points at yesterday, so both paths resolve to the
+      # same partition — return now to avoid querying (and double-counting) it twice.
+      return previous_guests if records_path == previous_records_path
+
+      remaining_slots = available_slots - previous_guests.size
+      return previous_guests if remaining_slots <= 0
+
+      previous_guests + eligible_guests_in(records_path, remaining_slots)
+    end
+
+    def eligible_guests_in(records_path, limit)
+      firestore.col(records_path)
                .where('allow_to_enter_room_at', '==', nil)
                .order('queued_at')
-               .limit(available_slots)
+               .limit(limit)
                .get.to_a
     end
 
+    # Published path is authoritative; fall back to the server's own date if not yet published.
+    def records_path
+      lobby_data&.dig(:waiting_guests_records_path).presence || default_records_path(current_date)
+    end
+
+    # Drain target is derived from the server date, never the (possibly stale) lobby pointer.
+    def previous_records_path
+      default_records_path(previous_date)
+    end
+
+    def default_records_path(date)
+      "waiting_guests/#{date}/records"
+    end
+
     # For alert waiting guests to enter room, we just update :allow_to_enter_room_at.
     # App will listen to firebase & start refresh session token to enter room.
     def calling_all(waiting_guests)
@@ -45,9 +74,22 @@ module SpreeCmCommissioner
       Time.zone.now.strftime('%Y-%m-%d')
     end
 
+    def previous_date
+      1.day.ago.strftime('%Y-%m-%d')
+    end
+
     # When open app, app request to check whether room is full or not via Firebase instead of server to minimize server requests.
+    # merge: true so we preserve the published `waiting_guests_records_path` on the lobby doc.
     def mark_as(full:, available_slots:)
-      firestore.col('waiting_rooms').doc('lobby').set({ full: full, available_slots: available_slots })
+      lobby_document.set({ full: full, available_slots: available_slots }, merge: true)
+    end
+
+    def lobby_data
+      @lobby_data ||= lobby_document.get.data
+    end
+
+    def lobby_document
+      @lobby_document ||= firestore.col('waiting_rooms').doc('lobby')
     end
 
     def fetch_max_sessions

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

@@ -0,0 +1,17 @@
+# waiting_room_lobby_path_publisher:
+#   cron: "0 0 * * * Asia/Phnom_Penh" # Once per day at local midnight (date rollover)
+#   class: "SpreeCmCommissioner::WaitingRoom::PublishLobbyPathJob"
+module SpreeCmCommissioner
+  module WaitingRoom
+    class PublishLobbyPathJob < ApplicationJob
+      queue_as :waiting_room
+
+      def perform
+        return if ENV['WAITING_ROOM_DISABLED'] == 'yes'
+
+        # call! so a publish failure raises (Sidekiq retries/alerts) instead of being silently swallowed.
+        SpreeCmCommissioner::WaitingRoom::PublishLobbyPath.call!
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+require 'google/cloud/firestore'
+
+module SpreeCmCommissioner
+  module WaitingRoom
+    # Publishes the server-owned waiting-guests records path to the lobby document, so mobile
+    # and the waiting-room caller share one source of truth for the date partition instead of
+    # each building it from their own (possibly skewed) clock/timezone.
+    #
+    # CRON note: ecause we use Time.zone.now to determine the path, it's important that the CRON job runs at the same
+    # timezone as well — otherwise the cron could fire before/after Time.zone.now rolls to the new date.
+    # Example: cron: "0 0 * * * Asia/Phnom_Penh"
+    #
+    # Caching note: No caching needed since the service is expected to be called once per day
+    # so a single daily merge write is negligible.
+    class PublishLobbyPath
+      prepend ::Spree::ServiceModule::Base
+      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)
+
+        success(records_path: records_path)
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+
+      private
+
+      # Server date is authoritative.
+      def records_path
+        @records_path ||= "waiting_guests/#{Time.zone.now.strftime('%Y-%m-%d')}/records"
+      end
+
+      def lobby_document
+        @lobby_document ||= firestore.col('waiting_rooms').doc('lobby')
+      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/app/services/spree_cm_commissioner/waiting_room_lobby_metadata_fetcher.rb

@@ -0,0 +1,47 @@
+require 'google/cloud/firestore'
+
+module SpreeCmCommissioner
+  # Reads the lobby document (waiting_rooms/lobby) — the read-side counterpart to
+  # WaitingRoom::PublishLobbyPath. Kept separate from WaitingRoomSystemMetadataFetcher,
+  # which owns the unrelated metadata/system document.
+  class WaitingRoomLobbyMetadataFetcher
+    attr_reader :document_data
+
+    def initialize(firestore: nil)
+      @firestore = firestore if firestore.present?
+    end
+
+    def load_document_data
+      @document_data = document.get.data || {}
+    end
+
+    # firebase metadata
+
+    # server-owned date partition — see WaitingRoom::PublishLobbyPath.
+    def waiting_guests_records_path
+      document_data[:waiting_guests_records_path]
+    end
+
+    # written by WaitingGuestsCaller#mark_as.
+    def full
+      document_data[:full]
+    end
+
+    # written by WaitingGuestsCaller#mark_as.
+    def available_slots
+      document_data[:available_slots]
+    end
+
+    def document
+      @document ||= firestore.col('waiting_rooms').doc('lobby')
+    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

data/app/views/spree/admin/system/waiting_room/show.html.erb

@@ -4,6 +4,7 @@
   <%= button_link_to Spree.t(:force_pull), force_pull_admin_system_waiting_room_path, method: :post, class: "btn btn-outline-primary" %>
 <% end %>
 
+<h6 class="mb-2 text-muted">System</h6>
 <div class="bg-white border rounded table-responsive">
   <table class="table" data-hook>
     <thead class="text-muted">
@@ -71,3 +72,55 @@
     </tbody>
   </table>
 </div>
+
+<h6 class="mt-4 mb-2 text-muted">Lobby</h6>
+<div class="bg-white border rounded table-responsive">
+  <table class="table" data-hook>
+    <thead class="text-muted">
+      <tr data-hook="admin_system_lobby_headers">
+        <th><%= Spree.t(:field_name) %></th>
+        <th><%= Spree.t(:current_value) %></th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% lobby_items = [
+        {
+          field_name: :waiting_guests_records_path,
+          value: @lobby_fetcher.waiting_guests_records_path.presence || "Not published yet",
+          reset_path: publish_lobby_path_admin_system_waiting_room_path
+        },
+        {
+          field_name: :full,
+          value: @lobby_fetcher.full ? "Yes" : "No",
+        },
+        {
+          field_name: :available_slots,
+          value: @lobby_fetcher.available_slots,
+        },
+      ] %>
+
+      <% lobby_items.each do |item| %>
+        <tr data-hook="admin_system_lobby_rows">
+          <td>
+            <%= item[:field_name].to_s.humanize %>
+            <span class="badge text-lowercase"><%= item[:field_name] %></span>
+          </td>
+          <td>
+            <%= item[:value] %>
+          </td>
+          <td>
+            <% if item[:reset_path].present? %>
+              <%= link_to_with_icon('arrow-counterclockwise.svg', "Publish path now", item[:reset_path],
+                    method: :post,
+                    remote: false,
+                    class: 'icon_link btn btn-sm outline text-dark m-0 p-0',
+                    data: { confirm: "Publish today's records path to the lobby now?" }, no_text: true
+                  ) %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

data/config/routes.rb

@@ -14,6 +14,7 @@ Spree::Core::Engine.add_routes do
       resource :waiting_room, controller: :waiting_room, only: [:show] do
         collection do
           post :force_pull
+          post :publish_lobby_path
           post :modify_multiplier
           post :modify_max_thread_count
         end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.8.3.pre.pre12'.freeze
+  VERSION = '2.8.3.pre.pre13'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.8.3.pre.pre12
+  version: 2.8.3.pre.pre13
 platform: ruby
 authors:
 - You
@@ -1416,6 +1416,7 @@ files:
 - app/jobs/spree_cm_commissioner/voting_credit_allocation_job.rb
 - app/jobs/spree_cm_commissioner/voting_credit_de_allocation_job.rb
 - app/jobs/spree_cm_commissioner/waiting_guests_caller_job.rb
+- app/jobs/spree_cm_commissioner/waiting_room/publish_lobby_path_job.rb
 - app/jobs/spree_cm_commissioner/waiting_room_latest_system_metadata_puller_job.rb
 - app/jobs/spree_cm_commissioner/waiting_room_session_firebase_logger_job.rb
 - app/jobs/spree_cm_commissioner/webhook_subscriber_orders_sender_job.rb
@@ -2341,6 +2342,8 @@ files:
 - app/services/spree_cm_commissioner/voting_leaderboards/calculate_score.rb
 - app/services/spree_cm_commissioner/voting_leaderboards/combined_result.rb
 - app/services/spree_cm_commissioner/voting_sessions/finalize.rb
+- app/services/spree_cm_commissioner/waiting_room/publish_lobby_path.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
 - app/services/spree_cm_commissioner/webhooks/subscribers/handle_request_decorator.rb