spree_cm_commissioner 2.8.2.pre.pre.6 → 2.8.2.pre.pre.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d27d1bbb2542f8c7f2ab1b23e228b657018a3d3444303382ddf5ab812735a409
-  data.tar.gz: bbeb67c0cc2f372ae6fc10b3dc117c8406fcb1a04c49f450db512e733fecd327
+  metadata.gz: 5ef384b13b8b23bbd46aa3c9f8f99e8b7b88e9cd78bcf31e44f74534f60b9a8c
+  data.tar.gz: 27796cce088d3db3a9ff09332236705ae3430d4f4065b2d3fdede50016987c41
 SHA512:
-  metadata.gz: 9bbdffa2c63368a6f60736a726909780585eeffaaedcf8937500112e3bad8528a6c64b1738be07e3b50e20a9c41ed097de44d2488c0b1dd795cd59513e38d330
-  data.tar.gz: 8c3b7541de536b0156868f5f383d54397817f8cba0455778dec2d6600396529e1c54c4888c3c5834044488322088d9d21d2e4b8b80f6f6dd68e9a1bee6bf7bc7
+  metadata.gz: 7a565f861ce630f95e7422771a5e2188084ad4f52fe7f62c62d229b63904a1a03496429aa728a02eef5eb21f26a733899dde2d320cd575c0156fa99892900648
+  data.tar.gz: bfcd0620eb133c51d7ca6f9c55b72aff078955b7d27dbd96a5f08c9090cc4ea04812e6eb0df086b377789f80405eae142d4e2ffa44a0187cc76dd74f1a1c2999

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.8)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/models/spree_cm_commissioner/voting_session.rb

@@ -6,6 +6,7 @@ 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
 
@@ -30,10 +31,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 +214,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/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

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/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.8.2.pre.pre.6'.freeze
+  VERSION = '2.8.2.pre.pre.8'.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.8
 platform: ruby
 authors:
 - You