spree_cm_commissioner 2.9.2 → 2.9.3.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea1290341adc6665c82f0ca238b21620b882af5eff415f8d76866938ada20bf1
-  data.tar.gz: 5299a81a6a985807378d89609eed247006ec984a7a304f23d48d6deb659b1dcf
+  metadata.gz: 0cde283f01b472fecef2447fa4f2ecfbd2e89126a5c0100f6eb0da02d8470a81
+  data.tar.gz: 115e564d261168faef7c209fc743b7f57ef2914afbfaac75de7668d1d1579865
 SHA512:
-  metadata.gz: 0015dfa2635e073b48c0b0d694e7958d1e7951dac7af8e693a80122a16fc348c413e92bfc4d7ef91da16d232d0c5781e24407165401cad9eeba45c698b01049c
-  data.tar.gz: 837d04df6961bd72fbdc3784f3f9ce2a5283d4001eb37cf6588d1c52e52e6c2a6f77d1ea05f9980a678a9859c9415e310e1bc261b579da03abca0cdeb4e6dd83
+  metadata.gz: 61475e20da1c597866e2a2bf80d05ec60cbb5b26082c8103f002abde91d129738eb7d483c0955d66c0b1045d689ac4f68430888905ef638ddea162cf48d847b8
+  data.tar.gz: 659074571ef7ae8f01b2fe5737a4f569edb7986bd7d33bbb6e99342956bc211c6d0c85894feb5e4511557b22670711874d8316bcdc5f9deac5ffc63d446bc1c6

data/Gemfile.lock

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

data/app/controllers/spree/api/v2/tenant/episodes_controller.rb

@@ -14,7 +14,9 @@ module Spree
           end
 
           def scope
-            current_season.episodes.where(product_type: :show_episode).includes(:voting_sessions, :vote_packages)
+            current_season.episodes
+                          .where(product_type: :show_episode, status: :active)
+                          .includes(:voting_sessions, :vote_packages)
           end
 
           def current_season

data/app/controllers/spree_cm_commissioner/admin/variants_controller_decorator.rb

@@ -58,8 +58,14 @@ module SpreeCmCommissioner
 
       # Builds the load-test fixture for this variant so it can be used by the k6 booking flow.
       # Shown on a page (with a check for whether the variant can be booked) for the tester to
-      # copy into the load_testing config.
+      # copy into the load_testing config. A product with a tenant_id belongs to a tenant
+      # (SaaS-hosted) store rather than the platform — the two k6 workflows keep separate fixture
+      # folders (load_testing/config/fixture/platform/booking_ticket_flow/ vs
+      # load_testing/config/fixture/tenant/cash_on_booking_ticket_flow/ — the tenant flow is named
+      # cash_on_* since it has an ABA sibling; the platform flow doesn't).
       def fixture
+        @fixture_workflow = @variant.product.tenant_id.present? ? 'tenant' : 'platform'
+        @fixture_flow = @fixture_workflow == 'tenant' ? 'cash_on_booking_ticket_flow' : 'booking_ticket_flow'
         result = SpreeCmCommissioner::LoadTest::GenerateBookingTicketData.call(variant: @variant)
         @fixture = result.value[:data]
         @fixture_issues = result.value[:issues]

data/app/models/spree_cm_commissioner/voting_contestant.rb

@@ -5,6 +5,7 @@ module SpreeCmCommissioner
     belongs_to :show, class_name: 'Spree::Taxon', optional: false
     belongs_to :voting_session, class_name: 'SpreeCmCommissioner::VotingSession', optional: false
     belongs_to :show_contestant, class_name: 'SpreeCmCommissioner::ShowContestant', optional: false
+    belongs_to :advanced_to_episode, class_name: 'SpreeCmCommissioner::ShowEpisode', optional: true
     belongs_to :advanced_to, polymorphic: true, optional: true
     belongs_to :advanced_from, polymorphic: true, optional: true
     has_many :votes, class_name: 'SpreeCmCommissioner::Vote', foreign_key: :contestant_id, dependent: :restrict_with_error
@@ -37,6 +38,7 @@ module SpreeCmCommissioner
     # | 1             | 1         | 2           | ✓ OK   | Can update/change number  |
     # | 1             | 2         | 1           | ✓ OK   | Different session         |
     validates :vote_number, uniqueness: { scope: :voting_session_id, allow_nil: true }
+    validate :advanced_to_and_advanced_from_must_differ
 
     delegate :name, :contestant_number, :category, :gender, :eliminated_at, to: :show_contestant, allow_nil: true
     delegate :can_vote?, to: :voting_session, allow_nil: true
@@ -50,11 +52,11 @@ module SpreeCmCommissioner
     end
 
     def advanced_from_name
-      advanced_from&.name
+      [advanced_from&.episode&.name, advanced_from&.name].compact.join(' - ')
     end
 
     def advanced_to_name
-      advanced_to&.name
+      [advanced_to&.episode&.name || advanced_to_episode&.name, advanced_to&.name].compact.join(' - ')
     end
 
     private
@@ -97,5 +99,14 @@ module SpreeCmCommissioner
       errors.add(:base, :has_advanced_to_session)
       throw :abort
     end
+
+    # Prevent a contestant from being advanced to the same record it was advanced from,
+    # which would create a self-referencing loop between sessions.
+    def advanced_to_and_advanced_from_must_differ
+      return if advanced_to_id.blank? || advanced_from_id.blank?
+      return unless advanced_to_type == advanced_from_type && advanced_to_id == advanced_from_id
+
+      errors.add(:advanced_to_id, :same_as_advanced_from)
+    end
   end
 end

data/app/services/spree_cm_commissioner/load_test/generate_booking_ticket_data.rb

@@ -1,22 +1,43 @@
 module SpreeCmCommissioner
   module LoadTest
-    # Generates the booking_ticket_flow load-test data for one variant so it can be used by the
-    # k6 booking flow. An admin picks a ticket variant in the dashboard; this reads its
-    # product / variant / event straight off the models and returns the payload the flow needs,
-    # plus a "can this actually be booked?" check so the tester knows it will drive the flow.
+    # Generates the cash_on_booking_ticket_flow / aba_booking_ticket_flow load-test data for one variant
+    # so it can be used by the k6 booking flow. An admin/organizer picks a ticket variant in the
+    # dashboard; this reads its product / variant / event straight off the models and returns the
+    # payload the flow needs, plus a "can this actually be booked?" check so the tester knows it
+    # will drive the flow. Mirrors GenerateVotingFixtureData's cash-on/ABA payment resolution
+    # (gems/spree_cm_commissioner/app/services/spree_cm_commissioner/load_test/
+    # generate_voting_fixture_data.rb) for the same two payment methods, applied to a variant
+    # instead of a voting session.
     #
-    # Flow: pick a ticket variant in admin -> copy this payload into
-    # load_testing/config/fixture/platform/booking_ticket_flow/<env>.json -> Env.fixture() reads
-    # that file when running k6 (load_testing/tests/platform/booking_ticket_flow).
+    # Flow: pick a ticket variant in admin/organizer -> copy this payload into
+    # load_testing/config/fixture/<platform|tenant>/<flow>/<env>.json -> Env.fixture()/
+    # Env.optionalFixture() reads that file when running k6. Note: the k6 flows themselves still
+    # read the actual payment_method_id/payway config from env vars (TENANT_PAYMENT_METHOD_ID,
+    # TENANT_PAYWAY_*), not from this JSON — payment_method_id/payway are included here purely so
+    # whoever generates the fixture can see (and copy) what's actually configured, same as
+    # GenerateVotingFixtureData's topup flows.
     #
-    # Returns success({ data: {...}, issues: [...] }). `issues` is empty when the variant
-    # is ready to load-test; otherwise it lists why the booking flow would fail. The same
-    # `issues` (plus a `ready` flag) are duplicated into `data[:metadata]` so they travel with
-    # the copied JSON — the k6 flow ignores that key, it's there for a human to read later.
+    # Returns success({ data: {...}, issues: [...] }). `issues` is empty when the variant is ready
+    # to load-test; otherwise it lists why the booking flow would fail — including "no payment
+    # method configured" for whichever flow you asked for. `issues` (plus a `ready` flag) are
+    # duplicated into `data[:metadata]` so they travel with the copied JSON — the k6 flow ignores
+    # that key, it's there for a human to read later.
     class GenerateBookingTicketData
       prepend ::Spree::ServiceModule::Base
 
-      def call(variant:)
+      FLOWS = %w[cash_on_booking_ticket_flow aba_booking_ticket_flow].freeze
+
+      # ABA's checkout endpoint is fixed regardless of tenant/environment — only `host` (sandbox
+      # vs production) differs, and that comes off the payment method. See
+      # Vpago::PaywayV2::Checkout#checkout_url in gems/spree_vpago. Mirrors
+      # GenerateVotingFixtureData::PAYWAY_CHECKOUT_PATH.
+      PAYWAY_CHECKOUT_PATH = '/api/payment-gateway/v1/payments/purchase'.freeze
+
+      # flow: which payment method to resolve — 'cash_on_booking_ticket_flow' (the default) or
+      # 'aba_booking_ticket_flow' (ABA/PayWay v2, adds a `payway` block).
+      def call(variant:, flow: 'cash_on_booking_ticket_flow')
+        raise ArgumentError, "Unknown flow: #{flow.inspect} (expected one of: #{FLOWS.join(', ')})" unless FLOWS.include?(flow)
+
         product = variant.product
         event = product.event
         issues = issues_for(variant, event)
@@ -25,15 +46,15 @@ module SpreeCmCommissioner
           event_permalink: event&.permalink,
           product_slug: product.slug,
           product_id: product.id,
-          variant_id: variant.id,
-          # Informational only — the k6 flow never reads this. Carries the readiness check into
-          # the copied JSON itself, so it's visible later without regenerating from admin.
-          metadata: {
-            ready: issues.empty?,
-            issues: issues
-          }
+          variant_id: variant.id
         }
 
+        issues.concat(payment_method_issues(variant, flow, data))
+
+        # Informational only — the k6 flow never reads this. Carries the readiness check into
+        # the copied JSON itself, so it's visible later without regenerating from admin/organizer.
+        data[:metadata] = { ready: issues.empty?, issues: issues }
+
         success(data: data, issues: issues)
       rescue StandardError => e
         failure(nil, e.message)
@@ -41,6 +62,49 @@ module SpreeCmCommissioner
 
       private
 
+      # Resolves the payment method for `flow` into `data`, and (for ABA) its payway payload.
+      # Returns the readiness issues — "no payment method configured" is blocking, same as
+      # GenerateVotingFixtureData's topup_flow_issues.
+      def payment_method_issues(variant, flow, data)
+        payment_method = resolve_payment_method(variant.vendor, flow)
+
+        return ["No #{payment_method_label(flow)} payment method configured for this tenant."] if payment_method.nil?
+
+        data[:payment_method_id] = payment_method.id
+        return [] unless flow == 'aba_booking_ticket_flow'
+
+        data[:payway] = payway_payload(payment_method)
+        return [] if payment_method.preferred_host.to_s.match?(/sandbox/i)
+
+        [
+          "ABA payment method's host (#{payment_method.preferred_host.inspect}) doesn't look like a sandbox URL — " \
+          'load tests should run against ABA\'s sandbox, not production.'
+        ]
+      end
+
+      def resolve_payment_method(vendor, flow)
+        type = flow == 'aba_booking_ticket_flow' ? Vpago::PaymentMethodDecorator::TYPE_PAYWAY_V2 : Vpago::PaymentMethodDecorator::TYPE_CASH_ON
+
+        Spree::PaymentMethod.active.where(vendor_id: vendor&.id, type: type).first
+      end
+
+      def payment_method_label(flow)
+        flow == 'aba_booking_ticket_flow' ? 'ABA' : 'cash-on'
+      end
+
+      def payway_payload(payment_method)
+        {
+          host: payment_method.preferred_host,
+          checkout_path: PAYWAY_CHECKOUT_PATH,
+          merchant_id: payment_method.preferred_merchant_id,
+          api_key: payment_method.preferred_api_key,
+          payment_option: payment_method.preferred_payment_option,
+          transaction_fee_fix: payment_method.preferred_transaction_fee_fix.to_f,
+          transaction_fee_percentage: payment_method.preferred_transaction_fee_percentage.to_f,
+          enable_pre_auth: payment_method.enable_pre_auth?
+        }
+      end
+
       # Each check returns an explanatory string when it would break the booking flow, or nil when the
       # variant is fine on that axis. Order mirrors the flow: availability first, then checkout shape.
       def issues_for(variant, event)

data/app/services/spree_cm_commissioner/voting_contestants/advancer.rb

@@ -63,9 +63,15 @@ module SpreeCmCommissioner
       # --- Elimination ---------------------------------------------------------
 
       def sync_elimination_status
-        # No destination id — contestant was never advanced forward; nothing to mirror.
-        # e.g. vc_a { advanced_to_id: nil } → return
-        return if @voting_contestant.advanced_to_id.blank?
+        # Episode-only advancement (no session mirror was ever created) — just
+        # drop the marker when eliminated; nothing to unwind.
+        # e.g. vc_a { advanced_to_id: nil, advanced_to_episode_id: 5, eliminated: true } → clear it
+        if @voting_contestant.advanced_to_id.blank?
+          if @voting_contestant.eliminated? && @voting_contestant.advanced_to_episode_id.present?
+            @voting_contestant.update!(advanced_to_episode_id: nil)
+          end
+          return
+        end
 
         # Incomplete polymorphic ref — can't resolve a session without both parts.
         # e.g. vc_a { advanced_to_type: nil } → return
@@ -203,6 +209,7 @@ module SpreeCmCommissioner
         @voting_contestant.update!(
           advanced_to_type: nil,
           advanced_to_id: nil,
+          advanced_to_episode_id: nil,
           updated_at: Time.current
         )
       end

data/app/services/spree_cm_commissioner/voting_contestants/assigner.rb

@@ -29,12 +29,30 @@ module SpreeCmCommissioner
               )
             end
 
-            @voting_session.voting_contestants.find_or_create_by!(show_contestant: show_contestant) do |voting_contestant|
-              voting_contestant.show_id = @voting_session.show_id
+            voting_contestant = @voting_session.voting_contestants.find_or_create_by!(show_contestant: show_contestant) do |vc|
+              vc.show_id = @voting_session.show_id
             end
+
+            link_pending_episode_advance!(show_contestant, voting_contestant)
           end
         end
       end
+
+      # A contestant advanced "By Episode" (BulkUpdater#advanced_to_attrs with a ShowEpisode
+      # target) only has advanced_to_episode_id set, no specific session yet. Once they're
+      # manually placed into a session of that episode here, resolve the pointer on both sides
+      # so Advancer's reversion/unwind logic (which walks advanced_to_type/id and matches via
+      # advanced_from) works the same as it would for a normal session-to-session mirror.
+      def link_pending_episode_advance!(show_contestant, voting_contestant)
+        source = SpreeCmCommissioner::VotingContestant
+                 .where(show_contestant_id: show_contestant.id, advanced_to_episode_id: @episode.id, advanced_to_id: nil)
+                 .order(id: :desc)
+                 .first
+        return unless source
+
+        source.update!(advanced_to_type: 'SpreeCmCommissioner::VotingSession', advanced_to_id: @voting_session.id)
+        voting_contestant.update!(advanced_from: source.voting_session) if voting_contestant.advanced_from.blank?
+      end
     end
   end
 end

data/app/services/spree_cm_commissioner/voting_contestants/bulk_updater.rb

@@ -85,24 +85,30 @@ module SpreeCmCommissioner
         out
       end
 
-      # Parses "ClassName:id" format into { advanced_to_type:, advanced_to_id: }.
-      # Returns :invalid if the type is not in ALLOWED_ADVANCED_TO_TYPES.
-      # Returns {} (no-op) when the value doesn't include a colon separator.
+      # Parses "ClassName:id:episode_id" into advanced_to_type/id/episode_id attrs.
+      # ShowEpisode targets only mark eligibility (advanced_to_episode_id) rather
+      # than a real session pointer, so type/id are left nil for those.
       def advanced_to_attrs(value)
-        return { advanced_to_type: nil, advanced_to_id: nil } if value.blank?
+        return { advanced_to_type: nil, advanced_to_id: nil, advanced_to_episode_id: nil } if value.blank?
 
         parts = value.to_s.split(':')
-        return {} if parts.size < 2
+        return {} if parts.size < 3
 
+        advanced_to_episode_id = parts.pop.to_i
         advanced_to_id = parts.pop.to_i
         advanced_to_type = parts.join(':')
 
         return :invalid unless ALLOWED_ADVANCED_TO_TYPES.include?(advanced_to_type)
 
-        {
-          advanced_to_id: advanced_to_id,
-          advanced_to_type: advanced_to_type
-        }
+        if advanced_to_type == 'SpreeCmCommissioner::ShowEpisode'
+          { advanced_to_type: nil, advanced_to_id: nil, advanced_to_episode_id: advanced_to_episode_id }
+        else
+          {
+            advanced_to_id: advanced_to_id,
+            advanced_to_type: advanced_to_type,
+            advanced_to_episode_id: advanced_to_episode_id
+          }
+        end
       end
     end
   end

data/app/views/spree/admin/variants/fixture.html.erb

@@ -27,7 +27,7 @@
 
     <p class="text-muted">
       Save this as <code><%= filename %></code> in
-      <code>load_testing/config/fixture/platform/booking_ticket_flow/</code>
+      <code>load_testing/config/fixture/<%= @fixture_workflow %>/<%= @fixture_flow %>/</code>
       (git-ignored).
     </p>
 

data/config/load_test_flows/tenant.yml

@@ -17,6 +17,19 @@ voting_flow:
     note: Resolves show_slug and voting_session_id straight off the voting session you picked.
   doc: tests/tenant/voting_flow/doc.md
 
+topup_vote_flow:
+  description: >-
+    Top-up Vote screen — the organizer picker's "Fixture" button for this generates both the
+    Cash On and ABA (PayWay v2) fixtures at once (see aba_topup_vote_flow / cash_on_topup_vote_flow
+    below for their individual destinations).
+  data_button:
+    label: Fixture
+    where: >-
+      Organizer → Shows → Season → Episode → Voting Sessions table → row "⋮" menu →
+      Fixture → pick "Topup vote flow"
+    note: One click generates both payment methods' JSON on the same page.
+  doc: tests/tenant/aba_topup_vote_flow/doc.md
+
 aba_topup_vote_flow:
   description: Top-up Vote screen paid via ABA (PayWay v2 sandbox).
   destination: config/fixture/tenant/aba_topup_vote_flow/<env>.json
@@ -44,3 +57,37 @@ cash_on_topup_vote_flow:
       Resolves show_slug, voting_session_id, and payment_method_id off the tenant's active
       Cash On payment method — flags an issue if none is configured yet.
   doc: tests/tenant/cash_on_topup_vote_flow/doc.md
+
+cash_on_booking_ticket_flow:
+  description: >-
+    Homepage → browse tickets → cart → checkout → cash payment → ticket pass (QR). The
+    organizer's "Fixture" button on a ticket variant generates this flow's JSON alongside
+    aba_booking_ticket_flow's on the same page in one click (each has its own destination file).
+  destination: config/fixture/tenant/cash_on_booking_ticket_flow/<env>.json
+  example: config/fixture/tenant/cash_on_booking_ticket_flow/example.json
+  data_button:
+    label: Fixture
+    where: >-
+      Organizer → Events → pick the event → Tickets → pick the ticket → Variants → the variant's
+      row → "⋮" menu → Fixture
+    note: >-
+      Runs a purchasable readiness check and resolves event_permalink, product_slug, product_id,
+      variant_id, and payment_method_id off the tenant's active Cash On payment method — flags an
+      issue if none is configured yet. Same as the platform flow, tenant ticket products here are
+      organized under an event taxon, so event_permalink is required.
+  doc: tests/tenant/cash_on_booking_ticket_flow/doc.md
+
+aba_booking_ticket_flow:
+  description: Same booking flow as cash_on_booking_ticket_flow, paid via ABA (PayWay v2 sandbox) instead of cash.
+  destination: config/fixture/tenant/aba_booking_ticket_flow/<env>.json
+  example: config/fixture/tenant/aba_booking_ticket_flow/example.json
+  data_button:
+    label: Fixture
+    where: >-
+      Organizer → Events → pick the event → Tickets → pick the ticket → Variants → the variant's
+      row → "⋮" menu → Fixture
+    note: >-
+      Runs a purchasable readiness check and resolves event_permalink, product_slug, product_id,
+      variant_id, payment_method_id, and the payway config off the tenant's active ABA/PayWay
+      payment method — flags an issue if none is configured yet.
+  doc: tests/tenant/aba_booking_ticket_flow/doc.md

data/config/locales/en.yml

@@ -667,6 +667,8 @@ en:
               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.'
+            advanced_to_id:
+              same_as_advanced_from: 'cannot be the same as the contestant it was advanced from'
         spree_cm_commissioner/voting_credit:
           attributes:
             free_votes_amount:

data/config/locales/km.yml

@@ -432,6 +432,8 @@ km:
               advanced_from_session: 'ត្រូវបានដំឡើងពី session មុន ហើយមិនអាចដកចេញដោយផ្ទាល់បានទេ។ សូមលុបការដំឡើងនៅក្នុង session ប្រភពជំនួសវិញ។'
               pre_vote_session: 'មិនអាចដកចេញពី pre-vote session បានទេ។'
               has_advanced_to_session: 'ត្រូវបានកំណត់ឱ្យដំឡើងទៅ session មួយទៀត។ សូមលុបការដំឡើងជាមុនសិន មុននឹងដកអ្នកចូលប្រកួតនេះចេញ។'
+            advanced_to_id:
+              same_as_advanced_from: 'មិនអាចដូចនឹងអ្នកចូលប្រកួតដែលវាត្រូវបានដំឡើងចេញពីនោះទេ'
         spree_cm_commissioner/voting_credit:
           attributes:
             free_votes_amount:

data/db/migrate/20260713022227_add_advanced_to_episode_id_to_cm_voting_contestants.rb

@@ -0,0 +1,8 @@
+class AddAdvancedToEpisodeIdToCmVotingContestants < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_voting_contestants, :advanced_to_episode,
+                  foreign_key: { to_table: :spree_products },
+                  index: true,
+                  if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.9.2'.freeze
+  VERSION = '2.9.3.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.9.2
+  version: 2.9.3.pre.pre1
 platform: ruby
 authors:
 - You
@@ -3446,6 +3446,7 @@ files:
 - db/migrate/20260701000001_add_device_info_to_cm_waiting_room_sessions.rb
 - db/migrate/20260703065239_add_position_to_cm_voting_contestants.rb
 - db/migrate/20260708150000_add_name_and_short_name_to_cm_trips.rb
+- db/migrate/20260713022227_add_advanced_to_episode_id_to_cm_voting_contestants.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md
@@ -3659,9 +3660,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