spree_cm_commissioner 2.8.14 → 2.8.15.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c9db9328cb88cf7fde16a7e685701308b1f7b939ed963d7ee589033a1c38a6e
-  data.tar.gz: b43d69cdc29b8550301afcc5a01ab8da004261fc4bc4314019525b36d6f8ca27
+  metadata.gz: 400b9f97bf94e87bc297ba238423a80ef7f5b94774a39170c48e809350f24bb3
+  data.tar.gz: dade198707fa92ad3c258205d7616187007e865890906419fcbfaaa36b168dbe
 SHA512:
-  metadata.gz: aa15d9ee3abd52045750066949564ce695a44744750f5de0087de5fefedff5dc0117c23a44541da7ba169d995454aa6366008c57776c37198e915e755b866220
-  data.tar.gz: db7d35fe794708874feccc997084b00565e42c053963d7bf32fa135be05c625eeff8390ccce4a8e9c747acbd74694fc682a05313e6edb41639678b4fe8fc32c7
+  metadata.gz: bf0faa81d8026d4283c6292d40c3c0c60be8d5d5e1e755c9eb03c950fd94de02f262e3946473a45a2b8500355e37781b175c7d425ce5c292d5c59e1fbc316533
+  data.tar.gz: dfd7f46061291a7ddce0780aacb82d9e9129c52ec1b01244b6a48cb1a008a1ee339b5c878656dc4e4091d0492c89de627758cd42ff8c8706059d135a1bb604fc

data/Gemfile.lock

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

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

@@ -26,13 +26,6 @@ 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

data/app/services/spree_cm_commissioner/waiting_room_system_metadata_fetcher.rb

@@ -12,24 +12,17 @@ module SpreeCmCommissioner
       @document_data = document.get.data
     end
 
-    def self.min_sessions_count
-      ENV.fetch('WAITING_ROOM_MIN_SESSIONS_COUNT', '5').to_i
-    end
-
-    def self.compute_max_sessions_count_with_min(server_running_count:, max_thread_count:, multiplier:, cap:)
-      min = min_sessions_count
+    def self.compute_max_sessions_count_with_min(server_running_count:, max_thread_count:, multiplier:)
+      min = ENV.fetch('WAITING_ROOM_MIN_SESSIONS_COUNT', '5').to_i
       max = server_running_count * max_thread_count * multiplier / 100
-      # Cap the auto-scaled value so the system does not scale beyond the configured ceiling,
-      # while ensuring the minimum always wins even if the cap is set below it.
-      max.clamp(min, [cap, min].max)
+      [max, min].max
     end
 
     def max_sessions_count_with_min
       @max_sessions_count_with_min ||= self.class.compute_max_sessions_count_with_min(
         server_running_count: server_running_count,
         max_thread_count: max_thread_count,
-        multiplier: multiplier,
-        cap: max_sessions_count_cap
+        multiplier: multiplier
       )
     end
 
@@ -48,11 +41,6 @@ module SpreeCmCommissioner
       document_data[:multiplier]&.to_i || ENV.fetch('WAITING_ROOM_MULTIPLIER', '150').to_i
     end
 
-    # hard ceiling for max_sessions_count to avoid auto-scaling the system too much
-    def max_sessions_count_cap
-      document_data[:max_sessions_count_cap]&.to_i || ENV.fetch('WAITING_ROOM_MAX_SESSIONS_COUNT_CAP', '1000').to_i
-    end
-
     def document
       @document ||= firestore.col('metadata').doc('system')
     end

data/app/services/spree_cm_commissioner/waiting_room_system_metadata_setter.rb

@@ -20,18 +20,6 @@ module SpreeCmCommissioner
       cache_max_sessions_count(new_data)
     end
 
-    def modify_max_sessions_count_cap(modify)
-      fetcher.load_document_data
-
-      new_data = fetcher.document_data.dup
-      # Floor the cap at the configured minimum; a cap below the min is meaningless
-      # since the min always wins in compute_max_sessions_count_with_min.
-      new_data[:max_sessions_count_cap] = [fetcher.max_sessions_count_cap + modify, WaitingRoomSystemMetadataFetcher.min_sessions_count].max
-
-      fetcher.document.set(new_data)
-      cache_max_sessions_count(new_data)
-    end
-
     def set(server_running_count:)
       fetcher.load_document_data
 
@@ -52,8 +40,7 @@ module SpreeCmCommissioner
       max = WaitingRoomSystemMetadataFetcher.compute_max_sessions_count_with_min(
         server_running_count: data[:server_running_count]&.to_i || fetcher.server_running_count,
         max_thread_count: data[:max_thread_count]&.to_i || fetcher.max_thread_count,
-        multiplier: data[:multiplier]&.to_i || fetcher.multiplier,
-        cap: data[:max_sessions_count_cap]&.to_i || fetcher.max_sessions_count_cap
+        multiplier: data[:multiplier]&.to_i || fetcher.multiplier
       )
       Rails.cache.write('waiting_room/max_sessions_count', max, expires_in: 1.hour)
     end

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

@@ -20,11 +20,6 @@
           field_name: :max_sessions,
           value: @fetcher.max_sessions_count_with_min,
         },
-        {
-          field_name: :max_sessions_count_cap,
-          value: @fetcher.max_sessions_count_cap,
-          modify_path: modify_max_sessions_count_cap_admin_system_waiting_room_path
-        },
         {
           field_name: :active_sesions,
           value: @active_sesions_count,

data/config/routes.rb

@@ -17,7 +17,6 @@ Spree::Core::Engine.add_routes do
           post :publish_lobby_path
           post :modify_multiplier
           post :modify_max_thread_count
-          post :modify_max_sessions_count_cap
         end
       end
 

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.8.14'.freeze
+  VERSION = '2.8.15.pre.pre1'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.8.14
+  version: 2.8.15.pre.pre1
 platform: ruby
 authors:
 - You
@@ -3480,9 +3480,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubygems_version: 3.4.1