spree_cm_commissioner 2.8.2.pre.pre.6 → 2.8.2.pre.pre.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d27d1bbb2542f8c7f2ab1b23e228b657018a3d3444303382ddf5ab812735a409
-  data.tar.gz: bbeb67c0cc2f372ae6fc10b3dc117c8406fcb1a04c49f450db512e733fecd327
+  metadata.gz: 591df0d5df4917d190e645eebdee72c980e9ea67c21467693ed78d1ee6ff28b7
+  data.tar.gz: b1d462674dd6e670d2563d6da3c95ca84ae04ed72afdbf3d7a6c26ba79d57296
 SHA512:
-  metadata.gz: 9bbdffa2c63368a6f60736a726909780585eeffaaedcf8937500112e3bad8528a6c64b1738be07e3b50e20a9c41ed097de44d2488c0b1dd795cd59513e38d330
-  data.tar.gz: 8c3b7541de536b0156868f5f383d54397817f8cba0455778dec2d6600396529e1c54c4888c3c5834044488322088d9d21d2e4b8b80f6f6dd68e9a1bee6bf7bc7
+  metadata.gz: 7a1ff6848bdc1550e7265210e7983a1542f13ed6675968e12d6b84b6878b8bf50af2d177de9af3f4392e616ad17db43d4bc318abf380dd50afa08140554b7471
+  data.tar.gz: 2b26975401c635204547177d0853b01a699e304fc23ac5d3e6820d8af58024e2f0e31e3864c0227d38f7992d5deba1a35647e8f3f66f2a9b4d6b27fe4f99c6c9

data/Gemfile.lock

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

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

@@ -0,0 +1,19 @@
+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

data/app/models/spree_cm_commissioner/show_contestant.rb

@@ -29,11 +29,6 @@ module SpreeCmCommissioner
 
     scope :ordered, -> { order(:position, :id) }
 
-    def eliminate
-      self.status = :eliminated
-      self.eliminated_at = Time.current
-    end
-
     self.whitelisted_ransackable_attributes = %w[name contestant_number status gender category origin]
   end
 end

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, :eliminated_at, to: :show_contestant, allow_nil: true
+    delegate :name, :contestant_number, :category, :gender, 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

@@ -6,14 +6,12 @@ module SpreeCmCommissioner
     belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
     belongs_to :show, class_name: 'SpreeCmCommissioner::Show', optional: false
     belongs_to :episode, class_name: 'Spree::Product', optional: false
+    belongs_to :parent, class_name: 'SpreeCmCommissioner::VotingSession', optional: true
 
     has_one :season, through: :episode, class_name: 'SpreeCmCommissioner::Show', source: :season
 
     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
@@ -30,10 +28,13 @@ module SpreeCmCommissioner
     validates :session_key, presence: true, uniqueness: true
     validates :name, :opens_at, :closes_at, :status, presence: true
     validate :closes_after_opens
+    validate :closes_at_not_after_parent
     validate :validate_live_stream_url, if: :live_stream_url_changed?
 
     before_validation :generate_session_key, on: :create
     before_save :update_live_stream_thumbnail
+    after_create :copy_contestants_from_parent, if: -> { pre_vote? && parent.present? }
+    after_update :copy_contestants_from_parent, if: -> { pre_vote? && saved_change_to_parent_id? && parent.present? }
     after_update :schedule_counter_reconciliation, if: -> { saved_change_to_status?(from: 'enabled', to: 'closed') }
     # Scopes
     # Uses the database clock (CURRENT_TIMESTAMP) for consistency and to avoid application server clock drift.
@@ -210,12 +211,28 @@ module SpreeCmCommissioner
       self.session_key ||= "#{episode.slug}-#{Time.current.to_i}-#{SecureRandom.hex(8)}"
     end
 
+    def copy_contestants_from_parent
+      parent.voting_contestants.find_each do |vc|
+        voting_contestants.find_or_create_by!(show_contestant: vc.show_contestant) do |new_vc|
+          new_vc.show_id = show_id
+        end
+      end
+    end
+
     def closes_after_opens
       return unless opens_at && closes_at
 
       errors.add(:closes_at, 'must be after opens_at') if closes_at <= opens_at
     end
 
+    def closes_at_not_after_parent
+      return unless parent && closes_at && parent.closes_at
+
+      return unless closes_at > parent.closes_at
+
+      errors.add(:closes_at, 'cannot be after parent session closes_at')
+    end
+
     def parse_json_config(value)
       return {} if value.nil? || value == ''
       return value if value.is_a?(Hash)

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

@@ -4,7 +4,7 @@ module Spree
       class ShowContestantSerializer < BaseSerializer
         set_type :show_contestant
 
-        attributes :name, :age, :origin, :category, :bio, :gender, :status, :contestant_number, :show_id, :eliminated_at
+        attributes :name, :age, :origin, :category, :bio, :gender, :status, :contestant_number, :show_id
 
         attribute :video_highlights do |contestant|
           contestant.video_highlights || []

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

@@ -17,7 +17,6 @@ module Spree
           end
         end
 
-        has_many :voting_sessions, serializer: Spree::V2::Tenant::VotingSessionSerializer
         has_many :episodes, serializer: Spree::V2::Tenant::ShowEpisodeSerializer
         has_many :voting_sessions, serializer: Spree::V2::Tenant::VotingSessionSerializer
 

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

@@ -12,8 +12,6 @@ module Spree
 
         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
         belongs_to :voting_session, serializer: ::Spree::V2::Tenant::VotingSessionSerializer

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

@@ -2,8 +2,8 @@ module Spree
   module V2
     module Tenant
       class VotingSessionSerializer < BaseSerializer
-        attributes :opens_at, :closes_at, :status, :session_type, :name, :public_metadata,
-                   :live_stream_enabled, :live_stream_thumbnail, :live_stream_title, :live_stream_description,
+        attributes :opens_at, :closes_at, :status, :session_type, :live_stream_enabled,
+                   :live_stream_thumbnail, :live_stream_title, :live_stream_description,
                    :position
 
         attribute :live_stream_url, &:embedded_live_stream_url
@@ -11,8 +11,6 @@ module Spree
 
         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/api_caches/invalidate.rb

@@ -66,19 +66,12 @@ module SpreeCmCommissioner
             '/api/v2/storefront/homepage_data*'
           ],
           'Spree::Taxon' => ['/api/v2/storefront/taxons/:id*'],
-          'SpreeCmCommissioner::Show' => ['/api/v2/storefront/taxons/:id*'],
           'Spree::Product' => [
             '/api/v2/tenant/products/:id*',
             '/api/v2/tenant/products/:slug*',
             '/api/v2/storefront/products/:id*',
             '/api/v2/storefront/products/:slug*'
           ],
-          'SpreeCmCommissioner::ShowEpisode' => [
-            '/api/v2/tenant/products/:id*',
-            '/api/v2/tenant/products/:slug*',
-            '/api/v2/storefront/products/:id*',
-            '/api/v2/storefront/products/:slug*'
-          ],
           'Spree::Vendor' => [
             '/api/v2/tenant/vendors/:id*',
             '/api/v2/storefront/vendors/:id*',
@@ -94,15 +87,10 @@ module SpreeCmCommissioner
           'SpreeCmCommissioner::HomepageBackground' => homepage_background_patterns,
           'Spree::Menu' => ['/api/v2/storefront/menus/*'],
           'Spree::Taxon' => ['/api/v2/storefront/taxons/*'],
-          'SpreeCmCommissioner::Show' => ['/api/v2/storefront/taxons/*'],
           'Spree::Product' => [
             '/api/v2/tenant/products/*',
             '/api/v2/storefront/products/*'
           ],
-          'SpreeCmCommissioner::ShowEpisode' => [
-            '/api/v2/tenant/products/*',
-            '/api/v2/storefront/products/*'
-          ],
           'Spree::Vendor' => [
             '/api/v2/tenant/vendors/*',
             '/api/v2/storefront/vendors/*',

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

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

data/config/routes.rb

@@ -593,7 +593,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 :elimination_sessions, controller: :show_elimination_sessions, only: %i[index]
+          resources :eliminated_contestants, controller: :eliminated_contestants, only: %i[index]
           resources :free_vote_claims, only: :create
         end
 

data/db/migrate/20260601000000_add_combining_parent_to_cm_voting_sessions.rb

@@ -1,8 +1,9 @@
 class AddCombiningParentToCmVotingSessions < ActiveRecord::Migration[7.0]
   def change
-    add_reference :cm_voting_sessions, :combining_parent,
+    add_reference :cm_voting_sessions, :parent,
                   foreign_key: { to_table: :cm_voting_sessions },
                   null: true,
-                  index: true
+                  index: true,
+                  if_not_exists: true
   end
 end

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

@@ -100,21 +100,5 @@ 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.2.pre.pre.6'.freeze
+  VERSION = '2.8.2.pre.pre.7'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.8.2.pre.pre.6
+  version: 2.8.2.pre.pre.7
 platform: ruby
 authors:
 - You
@@ -1045,6 +1045,7 @@ 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,7 +1070,6 @@ 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
@@ -3276,7 +3276,6 @@ files:
 - 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
 - db/migrate/20260529000001_add_session_type_to_cm_voting_sessions.rb
 - db/migrate/20260601000000_add_combining_parent_to_cm_voting_sessions.rb
 - docker-compose.yml

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

@@ -1,57 +0,0 @@
-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/db/migrate/20260527062005_add_eliminated_at_to_cm_show_contestants.rb

@@ -1,5 +0,0 @@
-class AddEliminatedAtToCmShowContestants < ActiveRecord::Migration[7.0]
-  def change
-    add_column :cm_show_contestants, :eliminated_at, :datetime, default: nil
-  end
-end