spree_cm_commissioner 2.8.1.pre.pre.4 → 2.8.2.pre.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed6326825a04e2ef186e72511e895b9fbf8598858d7d8f8e4358c0dbc0bc6f7e
-  data.tar.gz: ee5cdc0fd119a84c4619596f5db5a6a2aef89b39e0be982f71612a68bd8bbd16
+  metadata.gz: 595e82de2ef3a0ab170476a3ad96ab5d25d3d501916fa7b740d4d3d50f11193f
+  data.tar.gz: fb43eb4f67c1dc65ea1833f90f51624595122a6555c5099ac153a6abf20a1d3b
 SHA512:
-  metadata.gz: 7975ae665f017e022b41297314d72e25ac872241e5e224f5581cea5a736ef7e4e8abee4a8fa71916b038661da894a116c15ceeb71c03e4259627e44fff11222f
-  data.tar.gz: 6fa46d5991c849243fdac985bed14ad86d88404adf5880d0e8000c48867f27e6f20c08973bbe41c293e200650ac7b5416a0e4fc0b628a5d1a9b722062101f8c9
+  metadata.gz: a63ca4741ece801cadde290f28f810bcc7143a320201af0d1a074b2a9ae380b7307807d06eac856d01d062eb27b149efaf9e70e87c6853008d2bf667d852d3d1
+  data.tar.gz: d6cbf032196337ad97649cc72a4f2d1a7a0426224498cd0e2df492e4251a67ed00a7876e9719a66296b8ff9f168be7fa4c991e91a7d318f71eeab08802ae377f

data/Gemfile.lock

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

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

@@ -0,0 +1,57 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class ShowEliminationSessionsController < BaseController
+          # override
+          def collection
+            @collection ||= scope
+                            .includes(
+                              :episode,
+                              :show,
+                              eliminated_voting_contestants: [
+                                :show_contestant,
+                                { show_contestant: %i[show_contestant_images show_contestant_videos] }
+                              ]
+                            )
+                            .order('cm_voting_sessions.closes_at DESC')
+          end
+
+          # override
+          def collection_serializer
+            Spree::V2::Tenant::VotingSessionSerializer
+          end
+
+          private
+
+          # override
+          def model_class
+            SpreeCmCommissioner::VotingSession
+          end
+
+          # override
+          def scope
+            return model_class.none unless current_show
+
+            current_show.voting_sessions
+                        .joins(:episode)
+                        .joins(:voting_contestants)
+                        .where(voting_contestants: { eliminated: true })
+                        .distinct
+          end
+
+          def current_show
+            @current_show ||= show_scope.find_by!(slug: params[:show_id])
+          end
+
+          def show_scope
+            vendor_ids = @tenant.vendors.select(:id)
+            return SpreeCmCommissioner::Show.none if vendor_ids.blank?
+
+            SpreeCmCommissioner::Show.where(vendor_id: vendor_ids)
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/spree_cm_commissioner/line_item_transitable.rb

@@ -23,6 +23,8 @@ module SpreeCmCommissioner
     TripKey = Struct.new(:trip_id, :direction, :boarding_trip_stop_id, :drop_off_trip_stop_id)
 
     included do
+      include SpreeCmCommissioner::ServiceOrigin
+
       validates :direction, inclusion: { in: DIRECTION }, allow_nil: true
       validates :trip_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
       validates :service_origin_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
@@ -125,6 +127,12 @@ module SpreeCmCommissioner
 
     private
 
+    def resolve_service_origin_id
+      return nil if trip_id.blank?
+
+      SpreeCmCommissioner::Trip.find_by(id: trip_id)&.service_origin_id
+    end
+
     def validate_trip_stops_for_scheduled_trips
       return if trip_id.blank? || trip_id.zero?
 

data/app/models/concerns/spree_cm_commissioner/service_origin.rb

@@ -0,0 +1,22 @@
+module SpreeCmCommissioner
+  # Defaults service_origin (nationality) from parent associations during validation (on create).
+  # Vendor → Route → Trip → LineItem.
+  # Pricing rules use this to determine local vs foreigner rates.
+  module ServiceOrigin
+    extend ActiveSupport::Concern
+
+    included do
+      before_validation :assign_service_origin_id, on: :create
+    end
+
+    private
+
+    def assign_service_origin_id
+      self.service_origin_id ||= resolve_service_origin_id
+    end
+
+    def resolve_service_origin_id
+      nil
+    end
+  end
+end

data/app/models/spree_cm_commissioner/route.rb

@@ -2,8 +2,9 @@ module SpreeCmCommissioner
   class Route < Base
     include SpreeCmCommissioner::RouteType
     include SpreeCmCommissioner::StoreMetadata
+    include SpreeCmCommissioner::ServiceOrigin
 
-    belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
+    belongs_to :vendor, class_name: 'Spree::Vendor', inverse_of: :routes, optional: false
     belongs_to :tenant, class_name: 'SpreeCmCommissioner::Tenant', optional: true
 
     belongs_to :service_origin, class_name: 'Spree::Taxon', optional: true
@@ -66,6 +67,10 @@ module SpreeCmCommissioner
 
     private
 
+    def resolve_service_origin_id
+      vendor&.service_origin_id
+    end
+
     def validate_route_stops
       return if route_stops.valid?
 

data/app/models/spree_cm_commissioner/show_contestant.rb

@@ -27,17 +27,10 @@ module SpreeCmCommissioner
     validates :name, presence: true
     validates :contestant_number, uniqueness: { scope: :show_id }, allow_nil: true
 
-    before_save :set_eliminated_at, if: :status_changed_to_eliminated?
-
     scope :ordered, -> { order(:position, :id) }
 
-    private
-
-    def status_changed_to_eliminated?
-      status_changed? && eliminated?
-    end
-
-    def set_eliminated_at
+    def eliminate
+      self.status = :eliminated
       self.eliminated_at = Time.current
     end
 

data/app/models/spree_cm_commissioner/trip.rb

@@ -2,6 +2,7 @@ module SpreeCmCommissioner
   class Trip < Base
     include SpreeCmCommissioner::StoreMetadata
     include SpreeCmCommissioner::RouteType
+    include SpreeCmCommissioner::ServiceOrigin
 
     attr_accessor :hours, :minutes, :seconds
 
@@ -133,6 +134,10 @@ module SpreeCmCommissioner
 
     private
 
+    def resolve_service_origin_id
+      route&.service_origin_id || vendor&.service_origin_id
+    end
+
     def duplicate_seat_layout_from_vehicle
       # Duplicate the vehicle's seat layout into this trip. Copies nested
       # seat sections and blocks while excluding identifying columns and

data/app/models/spree_cm_commissioner/voting_contestant.rb

@@ -32,7 +32,7 @@ module SpreeCmCommissioner
     # | 1             | 2         | 1           | ✓ OK   | Different session         |
     validates :vote_number, uniqueness: { scope: %i[show_contestant_id voting_session_id], allow_nil: true }
 
-    delegate :name, :contestant_number, :category, :gender, to: :show_contestant, allow_nil: true
+    delegate :name, :contestant_number, :category, :gender, :eliminated_at, to: :show_contestant, allow_nil: true
     delegate :can_vote?, to: :voting_session, allow_nil: true
 
     def special_rule_type=(value)

data/app/models/spree_cm_commissioner/voting_session.rb

@@ -8,6 +8,9 @@ module SpreeCmCommissioner
 
     has_many :voting_credits, class_name: 'SpreeCmCommissioner::VotingCredit', as: :votable, dependent: :destroy
     has_many :voting_contestants, class_name: 'SpreeCmCommissioner::VotingContestant', dependent: :destroy
+    has_many :eliminated_voting_contestants, lambda {
+                                               where(eliminated: true)
+                                             }, class_name: 'SpreeCmCommissioner::VotingContestant', foreign_key: 'voting_session_id'
     has_many :show_contestants, through: :voting_contestants
     has_many :contestants, through: :show, source: :show_contestants
     has_many :votes, class_name: 'SpreeCmCommissioner::Vote', dependent: :destroy
@@ -15,7 +18,7 @@ module SpreeCmCommissioner
 
     acts_as_list scope: :episode
 
-    enum status: { disabled: 0, enabled: 1, closed: 2 }
+    enum status: { disabled: 0, enabled: 1, closed: 2, finalized: 3 }
     enum scoring_model: { manual: 0, geometric: 1, harmonic: 2, weighted_sum: 3, arithmetic: 4 }
 
     self.whitelisted_ransackable_attributes = %w[name status]

data/app/serializers/spree/v2/tenant/voting_contestant_serializer.rb

@@ -4,12 +4,16 @@ module Spree
       class VotingContestantSerializer < BaseSerializer
         set_type :voting_contestant
 
-        attributes :show_contestant_id, :name, :contestant_number, :vote_number, :category, :gender
+        attributes :show_id, :show_contestant_id, :name, :contestant_number, :vote_number, :category, :gender,
+                   :vote_count, :eliminated, :eliminated_via, :eliminated_at, :advanced_to_type, :advanced_to_id, :special_rules,
+                   :created_at, :updated_at, :advanced_from_type, :advanced_from_id, :unique_voter_count, :preferences
 
         attribute :voting_session_id, &:voting_session_id
 
         attribute :can_vote, &:can_vote?
 
+        belongs_to :voting_session, serializer: ::Spree::V2::Tenant::VotingSessionSerializer
+
         has_many :show_contestant_images, serializer: ::Spree::V2::Tenant::AssetSerializer
         has_many :show_contestant_videos, serializer: ::Spree::V2::Tenant::VideoSerializer
       end

data/app/serializers/spree/v2/tenant/voting_session_serializer.rb

@@ -2,13 +2,16 @@ module Spree
   module V2
     module Tenant
       class VotingSessionSerializer < BaseSerializer
-        attributes :opens_at, :closes_at, :status, :live_stream_enabled, :live_stream_thumbnail, :live_stream_title, :live_stream_description
+        attributes :name, :opens_at, :closes_at, :status, :live_stream_enabled, :live_stream_thumbnail, :live_stream_title, :live_stream_description,
+                   :created_at
 
         attribute :live_stream_url, &:embedded_live_stream_url
         attribute :can_vote, &:can_vote?
 
         belongs_to :episode, serializer: Spree::V2::Tenant::ShowEpisodeSerializer
         belongs_to :show, serializer: Spree::V2::Tenant::ShowSerializer
+
+        has_many :eliminated_voting_contestants, serializer: ::Spree::V2::Tenant::VotingContestantSerializer
       end
     end
   end

data/app/services/spree_cm_commissioner/pricing_models/preview.rb

@@ -52,12 +52,16 @@ module SpreeCmCommissioner
         vendor_ids = transit_contexts.map { |ctx| variant_vendor_id(ctx.variant_id) }.compact.uniq
         return [] if vendor_ids.blank?
 
-        SpreeCmCommissioner::PricingModelRoute
-          .active
-          .for_origin_destination(origin_place_id, destination_place_id)
-          .includes(:pricing_model)
-          .map(&:pricing_model)
-          .select { |pm| vendor_ids.include?(pm.vendor_id) }
+        route_ids = trip_route_ids(transit_contexts)
+
+        scope = SpreeCmCommissioner::PricingModelRoute
+                .active
+                .for_origin_destination(origin_place_id, destination_place_id)
+                .includes(:pricing_model)
+
+        scope = scope.where(route_id: route_ids) if route_ids.any?
+
+        scope.map(&:pricing_model).select { |pm| vendor_ids.include?(pm.vendor_id) }
       end
 
       def variant_pricing_models(group_contexts)
@@ -83,6 +87,11 @@ module SpreeCmCommissioner
         end
       end
 
+      def trip_route_ids(transit_contexts)
+        trip_ids = transit_contexts.map(&:trip_id).compact.uniq
+        SpreeCmCommissioner::Trip.where(id: trip_ids).where.not(route_id: nil).distinct.pluck(:route_id)
+      end
+
       def variant_vendor_id(variant_id)
         return nil if variant_id.blank?
 

data/app/services/spree_cm_commissioner/routes/create.rb

@@ -19,15 +19,10 @@ module SpreeCmCommissioner
         destination_place = find_place_for(route_stops, route_stops.last)
 
         return failure(nil, 'Origin or destination place could not be determined') if origin_place.nil? || destination_place.nil?
-        return failure(nil, 'Route with origin & destination already exists') if vendor.routes.exists?(
-          origin_place_id: origin_place.id,
-          destination_place_id: destination_place.id
-        )
 
         attrs = attrs.merge(
           tenant_id: vendor.tenant_id,
           route_name: attrs[:route_name] || "#{origin_place.name} -> #{destination_place.name}",
-          service_origin_id: vendor.service_origin_id,
           origin_place_id: origin_place.id,
           destination_place_id: destination_place.id,
           route_stops: route_stops

data/app/services/spree_cm_commissioner/trips/create_multi_leg.rb

@@ -43,7 +43,7 @@ module SpreeCmCommissioner
         leg_trips_by_branch_id = find_all_leg_trips(vendor: @vendor, trip_stop_forms: @branch_stops)
 
         ApplicationRecord.transaction do
-          @parent_route = load_parent_route!(vendor: @vendor, locations: @locations, branch_stops: @branch_stops, trip_form: @trip_form)
+          @parent_route = load_parent_route!(vendor: @vendor, trip_form: @trip_form)
 
           # Collect offset_days from input (relative: layover days at each branch)
           # Will be stored in parent_trip metadata for reference
@@ -128,21 +128,11 @@ module SpreeCmCommissioner
               .index_by(&:id)
       end
 
-      # Find parent route by route_id or origin/destination places and route_type
+      # Find parent route by route_id
       #
       # @return [Route] Route from origin to destination place
-      def load_parent_route!(vendor:, locations:, branch_stops:, trip_form:)
-        return vendor.routes.find(trip_form.route_id) if trip_form.route_id.present?
-
-        origin_place_id = locations[branch_stops.first.location_id.to_i]&.place_id
-        destination_place_id = locations[branch_stops.last.location_id.to_i]&.place_id
-        route_type = trip_form.route_type.presence || 'bus'
-
-        vendor.routes.find_by(
-          origin_place_id: origin_place_id,
-          destination_place_id: destination_place_id,
-          route_type: route_type
-        ) or raise StandardError, "Route not found for #{origin_place_id} → #{destination_place_id}"
+      def load_parent_route!(vendor:, trip_form:)
+        vendor.routes.find(trip_form.route_id)
       end
 
       # Find leg trips and map by stop ID (skip final destination)
@@ -199,8 +189,7 @@ module SpreeCmCommissioner
           allow_booking: true,
           trip_type: :multi_leg,
           allow_seat_selection: false,
-          route_type: route_type,
-          service_origin_id: @parent_route.service_origin_id || @vendor.service_origin_id
+          route_type: route_type
         )
 
         # Store relative offset_days (layover days) as metadata

data/app/services/spree_cm_commissioner/trips/create_single_leg.rb

@@ -80,7 +80,6 @@ module SpreeCmCommissioner
           vehicle: SpreeCmCommissioner::Vehicle.find_by(id: first_stop.vehicle_id),
           origin_place_id: locations[first_stop.location_id.to_i].place_id,
           destination_place_id: locations[last_stop.location_id.to_i].place_id,
-          service_origin_id: route.service_origin_id || vendor.service_origin_id,
           route: route,
           departure_time: first_stop.departure_time,
           duration: trip_form.total_duration_seconds,

data/app/services/spree_cm_commissioner/vote_counters/per_contestant_counter.rb

@@ -39,6 +39,8 @@ module SpreeCmCommissioner
           unique_voters: session_unique_voter_count,
           unique_voters_per_contestant: contestant_unique_voter_counts(ids)
         )
+      rescue StandardError => e
+        failure(nil, e.message)
       end
 
       private

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

@@ -51,7 +51,8 @@ module SpreeCmCommissioner
         return unless attributes.key?(:eliminated)
         return unless attributes[:eliminated]
 
-        voting_contestant.show_contestant.update!(status: :eliminated)
+        voting_contestant.show_contestant.eliminate
+        voting_contestant.show_contestant.save!
       end
 
       # Normalizes raw params into a safe attributes hash.

data/app/services/spree_cm_commissioner/voting_sessions/finalize.rb

@@ -0,0 +1,66 @@
+module SpreeCmCommissioner
+  module VotingSessions
+    class Finalize
+      prepend ::Spree::ServiceModule::Base
+
+      def call(voting_session:)
+        ApplicationRecord.transaction do
+          validate_confirmed_ranks!(voting_session)
+          advance_confirmed_winners(voting_session) if next_session?(voting_session)
+          voting_session.update!(status: :finalized)
+          success(voting_session: voting_session)
+        end
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+
+      private
+
+      def validate_confirmed_ranks!(voting_session)
+        if next_session?(voting_session)
+          raise I18n.t('voting.errors.no_winners_confirmed') if voting_session.voting_contestants.where.not(confirmed_rank: nil).none?
+        else
+          unranked = voting_session.voting_contestants.where(eliminated: false, confirmed_rank: nil)
+          raise I18n.t('voting.errors.all_contestants_must_be_ranked') if unranked.any?
+        end
+      end
+
+      # Re-syncs advancement on every call — handles first finalize and re-finalize.
+      # Contestants without a confirmed_rank get their advanced_to cleared.
+      def advance_confirmed_winners(voting_session)
+        next_session = resolve_next_session(voting_session)
+
+        # Reset soft eliminations from previous finalize so re-finalize can re-evaluate them.
+        # rubocop:disable Rails/SkipsModelValidations
+        voting_session.voting_contestants
+                      .where(eliminated: true, eliminated_via: :public_vote)
+                      .update_all(eliminated: false, eliminated_via: nil)
+        # rubocop:enable Rails/SkipsModelValidations
+
+        voting_session.voting_contestants.reload.each do |voting_contestant|
+          if voting_contestant.confirmed_rank.present?
+            SpreeCmCommissioner::VotingContestants::Advancer.call(
+              voting_contestant: voting_contestant,
+              attributes: { advanced_to: next_session }
+            )
+          else
+            SpreeCmCommissioner::VotingContestants::Advancer.call(
+              voting_contestant: voting_contestant,
+              attributes: { eliminated: true, eliminated_via: :public_vote, advanced_to_type: nil, advanced_to_id: nil }
+            )
+          end
+        end
+      end
+
+      def next_session?(voting_session)
+        resolve_next_session(voting_session).present?
+      end
+
+      def resolve_next_session(voting_session)
+        return @resolved_next_session if defined?(@resolved_next_session)
+
+        @resolved_next_session = voting_session.next_in_episode || voting_session.episode.next_episode_first_session
+      end
+    end
+  end
+end

data/config/locales/en.yml

@@ -767,4 +767,6 @@ en:
       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."
+      no_winners_confirmed: "No winners confirmed"
+      all_contestants_must_be_ranked: "All non-eliminated contestants must be ranked"
 

data/config/locales/km.yml

@@ -605,4 +605,8 @@ km:
     token_missing: "សញ្ញាណផ្ទៀងផ្ទាត់គឺបាត់"
     verification_failed: "ការផ្ទៀងផ្ទាត់បានបរាជ័យ"
     service_unavailable: "សេវាកម្មពេលនេះមិនមានការផ្ទៀងផ្ទាត់"
+  voting:
+    errors:
+      no_winners_confirmed: "មិនមានអ្នកឈ្នះត្រូវបានបញ្ជាក់"
+      all_contestants_must_be_ranked: "អ្នកចូលរួមទាំងអស់ដែលមិនត្រូវបានលុបចោលត្រូវតែមានចំណាត់ថ្នាក់"
 

data/config/routes.rb

@@ -592,7 +592,7 @@ Spree::Core::Engine.add_routes do
             resources :assignments, controller: :show_person_assignments, only: %i[index]
           end
           resources :contestants, controller: :show_contestants, only: %i[show]
-          resources :eliminated_contestants, controller: :eliminated_contestants, only: %i[index]
+          resources :elimination_sessions, controller: :show_elimination_sessions, only: %i[index]
           resources :free_vote_claims, only: :create
         end
 

data/db/migrate/20260527035430_add_confirmed_rank_to_cm_voting_contestants.rb

@@ -0,0 +1,5 @@
+class AddConfirmedRankToCmVotingContestants < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_voting_contestants, :confirmed_rank, :integer, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/show_factory.rb

@@ -100,5 +100,21 @@ FactoryBot.define do
     show_contestant { create(:cm_show_contestant, show: show) }
     voting_session { create(:cm_voting_session, episode: create(:cm_show_episode, event: show), show: show, vendor: show.vendor) }
     show_id { show.id }
+    eliminated { false }
+
+    trait :eliminated do
+      eliminated { true }
+      eliminated_via { :public_vote }
+    end
+
+    trait :eliminated_by_judges do
+      eliminated { true }
+      eliminated_via { :judges_deadlock }
+    end
+
+    trait :eliminated_by_coach do
+      eliminated { true }
+      eliminated_via { :coach_decision }
+    end
   end
 end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.8.1.pre.pre.4'.freeze
+  VERSION = '2.8.2.pre.pre.1'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.8.1.pre.pre.4
+  version: 2.8.2.pre.pre.1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-27 00:00:00.000000000 Z
+date: 2026-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1044,7 +1044,6 @@ files:
 - app/controllers/spree/api/v2/tenant/cms_pages_controller.rb
 - app/controllers/spree/api/v2/tenant/customer_notifications_controller.rb
 - app/controllers/spree/api/v2/tenant/dynamic_field_options_controller.rb
-- app/controllers/spree/api/v2/tenant/eliminated_contestants_controller.rb
 - app/controllers/spree/api/v2/tenant/free_vote_claims_controller.rb
 - app/controllers/spree/api/v2/tenant/guests_controller.rb
 - app/controllers/spree/api/v2/tenant/homepage_sections_controller.rb
@@ -1069,6 +1068,7 @@ files:
 - app/controllers/spree/api/v2/tenant/routes_controller.rb
 - app/controllers/spree/api/v2/tenant/s3_signed_urls_controller.rb
 - app/controllers/spree/api/v2/tenant/show_contestants_controller.rb
+- app/controllers/spree/api/v2/tenant/show_elimination_sessions_controller.rb
 - app/controllers/spree/api/v2/tenant/show_people_controller.rb
 - app/controllers/spree/api/v2/tenant/show_person_assignments_controller.rb
 - app/controllers/spree/api/v2/tenant/shows_controller.rb
@@ -1442,6 +1442,7 @@ files:
 - app/models/concerns/spree_cm_commissioner/route_order_countable.rb
 - app/models/concerns/spree_cm_commissioner/route_type.rb
 - app/models/concerns/spree_cm_commissioner/service_calendar_type.rb
+- app/models/concerns/spree_cm_commissioner/service_origin.rb
 - app/models/concerns/spree_cm_commissioner/service_recommendations.rb
 - app/models/concerns/spree_cm_commissioner/service_type.rb
 - app/models/concerns/spree_cm_commissioner/store_metadata.rb
@@ -2285,6 +2286,7 @@ files:
 - app/services/spree_cm_commissioner/voting_credits/credit_calculator.rb
 - app/services/spree_cm_commissioner/voting_credits/de_allocate.rb
 - app/services/spree_cm_commissioner/voting_leaderboards/calculate_score.rb
+- app/services/spree_cm_commissioner/voting_sessions/finalize.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
@@ -3271,6 +3273,7 @@ files:
 - db/migrate/20260520000001_add_scoring_model_to_cm_voting_sessions.rb
 - db/migrate/20260520000001_optimize_cm_votes_indexes.rb
 - db/migrate/20260525042257_add_vote_number_to_cm_voting_contestants.rb
+- db/migrate/20260527035430_add_confirmed_rank_to_cm_voting_contestants.rb
 - db/migrate/20260527062005_add_eliminated_at_to_cm_show_contestants.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md

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

@@ -1,19 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Tenant
-        class EliminatedContestantsController < ShowContestantsController
-          private
-
-          def scope
-            super.eliminated
-          end
-
-          def collection_serializer
-            Spree::V2::Tenant::ShowContestantSerializer
-          end
-        end
-      end
-    end
-  end
-end