spree_cm_commissioner 2.8.6 → 2.8.7.pre.pre2

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

@@ -0,0 +1,52 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class ShowContestantsController < BaseController
+          private
+
+          # override
+          def model_class
+            SpreeCmCommissioner::ShowContestant
+          end
+
+          # override
+          def scope
+            return model_class.none unless current_show
+
+            model_class
+              .where(show_id: current_show.id)
+              .includes(
+                :show_contestant_images,
+                :show_contestant_videos,
+                :current_voting_session,
+                :voting_contestants,
+                assigned_show_person: :show_person_images,
+                show: [
+                  :parent,
+                  { episodes: :voting_sessions },
+                  { seasons: { episodes: :voting_sessions } }
+                ]
+              )
+          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
+
+          # override
+          def resource_serializer
+            Spree::V2::Tenant::ShowContestantSerializer
+          end
+        end
+      end
+    end
+  end
+end

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/controllers/spree/api/v2/tenant/show_people_controller.rb

@@ -0,0 +1,49 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class ShowPeopleController < BaseController
+          private
+
+          # override
+          def model_class
+            SpreeCmCommissioner::ShowPerson
+          end
+
+          # override
+          def scope
+            scope = current_show.show_people
+                                .joins(:assignments)
+                                .distinct
+                                .includes(
+                                  :assignments,
+                                  assigned_contestants: %i[show_contestant_images current_voting_session]
+                                )
+
+            role = params[:role].presence
+            return scope if role.blank?
+
+            role_value = SpreeCmCommissioner::ShowPersonAssignment.roles[role.to_s]
+            return scope.none if role_value.nil?
+
+            scope.where(cm_show_people_assignments: { role: role_value })
+          end
+
+          # override
+          def collection_serializer
+            Spree::V2::Tenant::ShowPersonSerializer
+          end
+
+          def current_show
+            @current_show ||= show_scope.find_by!(slug: params[:show_id])
+          end
+
+          def show_scope
+            vendor_ids = @tenant.vendors.select(:id)
+            SpreeCmCommissioner::Show.where(vendor_id: vendor_ids)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class ShowPersonAssignmentsController < BaseController
+          private
+
+          def model_class
+            SpreeCmCommissioner::ShowPersonAssignment
+          end
+
+          def scope
+            vendor_ids = @tenant.vendors.select(:id)
+            show_ids = SpreeCmCommissioner::Show.where(vendor_id: vendor_ids).select(:id)
+
+            model_class.where(show_id: show_ids)
+                       .where(show_person_id: params[:person_id], show_id: current_show.id)
+                       .includes(:show_person, :show)
+          end
+
+          def current_show
+            @current_show ||= SpreeCmCommissioner::Show.find_by!(slug: params[:show_id])
+          end
+
+          def resource_serializer
+            Spree::V2::Tenant::ShowPersonAssignmentSerializer
+          end
+
+          def collection_serializer
+            Spree::V2::Tenant::ShowPersonAssignmentSerializer
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class ShowsController < BaseController
+          private
+
+          # override
+          def model_class
+            SpreeCmCommissioner::Show
+          end
+
+          def resource
+            @resource ||= scope.find_by!(slug: params[:id])
+          end
+
+          # override
+          def scope
+            vendor_ids = @tenant.vendors.select(:id)
+            return model_class.none if vendor_ids.blank?
+
+            model_class.where(vendor_id: vendor_ids, preview: false)
+                       .includes(:parent, :app_banner, show_people: :show_person_images,
+                                                       episodes: :voting_sessions, seasons: { episodes: :voting_sessions }
+                       )
+          end
+
+          # override
+          def resource_serializer
+            Spree::V2::Tenant::ShowSerializer
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -31,7 +31,7 @@ module Spree
 
           def scope
             MultiTenant.with(@tenant) do
-              model_class
+              model_class.where(preview: false)
             end
           end
 

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

@@ -0,0 +1,94 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class VotesController < BaseController
+          before_action :require_spree_current_user
+
+          def index
+            render_serialized_payload do
+              serialize_collection(collection)
+            end
+          end
+
+          def create
+            voting_session = current_vendor.voting_sessions.find(params[:voting_session_id])
+            contestant = voting_session.voting_contestants.find(params[:contestant_id])
+
+            processor_params = vote_params.merge(
+              device_fingerprint: device_params[:fingerprint],
+              voter_identifier: device_params[:identifier],
+              public_metadata: params[:public_metadata] || {},
+              tenant_id: MultiTenant.current_tenant_id,
+              vendor_id: current_vendor.id
+            )
+
+            result = SpreeCmCommissioner::VoteProcessor.call(
+              voting_session: voting_session,
+              contestant: contestant,
+              user: spree_current_user,
+              params: processor_params,
+              request: request
+            )
+
+            if result.success?
+              render_serialized_payload(201) { serialize_resource(result.value) }
+            else
+              render_error_payload(result.error)
+            end
+          end
+
+          private
+
+          def collection
+            @collection ||= scope.page(params[:page])
+                                 .per(params[:per_page])
+          end
+
+          def scope
+            MultiTenant.with(@tenant) do
+              scope = spree_current_user.votes
+                                        .includes(:contestant, :voting_session, :vote_credit)
+                                        .order(created_at: :desc)
+
+              scope = scope.for_session(params[:voting_session_id]) if params[:voting_session_id]
+              scope
+            end
+          end
+
+          def model_class
+            SpreeCmCommissioner::Vote
+          end
+
+          def resource_serializer
+            Spree::V2::Tenant::VoteSerializer
+          end
+
+          def collection_serializer
+            Spree::V2::Tenant::VoteSerializer
+          end
+
+          # {
+          #   "contestant_id": 1,
+          #   "vote": {
+          #     "quantity": 1,
+          #     "channel": "mobile"
+          #   },
+          #   "device": {
+          #     "fingerprint": "fp-xyz",
+          #     "identifier": "device-abc",
+          #     "platform": "android"
+          #   }
+          # }
+          def vote_params
+            params.require(:vote).permit(:quantity, :channel)
+          end
+
+          def device_params
+            params.require(:device).permit(:fingerprint, :identifier, :platform)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class VotingContestantsController < BaseController
+          before_action :load_voting_session, only: %i[index]
+
+          # override
+          def collection
+            @collection ||= @voting_session
+                            .voting_contestants
+                            .includes(:voting_session, :show_contestant,
+                                      :show_contestant_images, :show_contestant_videos,
+                                      :advanced_to, :advanced_from
+                            )
+                            .order(:id)
+          end
+
+          # override
+          def collection_serializer
+            Spree::V2::Tenant::VotingContestantSerializer
+          end
+
+          private
+
+          # override
+          def model_class
+            SpreeCmCommissioner::VotingSession
+          end
+
+          # override
+          def scope
+            current_vendor.voting_sessions.includes(:episode)
+          end
+
+          def load_voting_session
+            @voting_session = scope.find(params[:voting_session_id])
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class VotingCreditTransactionsController < BaseController
+          before_action :require_spree_current_user
+
+          def index
+            render_serialized_payload do
+              serialize_collection(collection)
+            end
+          end
+
+          private
+
+          def collection
+            @collection ||= scope.page(params[:page])
+                                 .per(params[:per_page])
+          end
+
+          def scope
+            scope = spree_current_user.voting_credit_transactions
+                                      .includes(:vote_credit, :originator)
+                                      .order(created_at: :desc)
+
+            scope = scope.by_action(params[:actions].split(',')) if params[:actions].present?
+            scope
+          end
+
+          def model_class
+            SpreeCmCommissioner::VotingCreditTransaction
+          end
+
+          def collection_serializer
+            Spree::V2::Tenant::VotingCreditTransactionSerializer
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class VotingCreditsController < BaseController
+          before_action :require_spree_current_user
+
+          def index
+            render_serialized_payload do
+              serialize_resource(voting_credit)
+            end
+          end
+
+          private
+
+          def voting_credit
+            spree_current_user.voting_credits.active.eligible(load_voting_session).first
+          end
+
+          def load_voting_session
+            @voting_session ||= SpreeCmCommissioner::VotingSession.find(params[:voting_session_id])
+          end
+
+          def resource_serializer
+            Spree::V2::Tenant::VotingCreditSerializer
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,7 @@ module SpreeCmCommissioner
         base.around_action :set_writing_role, only: %i[index]
         base.after_action :set_tenant_after_update, only: %i[update]
         base.before_action :merge_industry_taxons_into_taxons, only: [:update]
+        base.before_action :normalize_sti_product_params, only: %i[create update]
       end
 
       # Override
@@ -51,6 +52,24 @@ module SpreeCmCommissioner
 
       protected
 
+      # Some admin forms submit STI records under their class key while
+      # Spree update reads :product. Merge both into :product so all edited
+      # fields are persisted for STI product subclasses.
+      def normalize_sti_product_params
+        return unless @product
+
+        sti_key = @product.class.model_name.param_key.to_sym
+        sti_params = params[sti_key]
+        return unless sti_params.is_a?(::ActionController::Parameters)
+
+        base_params = params[:product]
+        base_hash = base_params.is_a?(::ActionController::Parameters) ? base_params.to_unsafe_h : {}
+        sti_hash = sti_params.to_unsafe_h
+        merged_params = ::ActionController::Parameters.new(base_hash.merge(sti_hash))
+
+        params[:product] = merged_params
+      end
+
       def merge_industry_taxons_into_taxons
         return if params[:product].blank?
 

data/app/finders/spree_cm_commissioner/events/find_matches.rb

@@ -7,6 +7,7 @@ module SpreeCmCommissioner
       def execute
         scope.joins(:integration_mappings).where(
           kind: :event,
+          preview: false,
           integration_mappings: { status: :active }
         ).distinct
       end

data/app/finders/spree_cm_commissioner/orders/find.rb

@@ -4,14 +4,30 @@
 module SpreeCmCommissioner
   module Orders
     class Find
+      CURRENT_CART_STATES = %w[cart address].freeze
+      CART_MAX_AGE_IN_MINUTES = ENV.fetch('CART_MAX_AGE_IN_MINUTES', '720').to_i # Default: 12 hours
+
       def execute(store:, user:, currency:, token: nil, state: nil)
+        state = Array(state).map(&:to_s)
+
         params = { store_id: store.id, currency: currency }
         params[:state] = state if state.present?
 
-        return find_by_token(params, token) if token.present?
-        return find_by_user(params, user) if user.present?
+        order = if token.present?
+                  find_by_token(params, token)
+                elsif user.present?
+                  find_by_user(params, user)
+                end
+
+        # Only enforce hold and age expiration when fetching current cart states ('cart' or 'address').
+        # For other states (like 'payment,complete'), we want to return the order even if it's old or expired
+        # because some pages on client still need some specific state of order to display.
+        if state.intersect?(CURRENT_CART_STATES)
+          return nil if hold_expired?(order)
+          return nil if cart_too_old?(order)
+        end
 
-        nil
+        order
       end
 
       def find_by_token(params, token)
@@ -24,6 +40,20 @@ module SpreeCmCommissioner
         scope.order(created_at: :desc).find_by(params)
       end
 
+      def hold_expired?(order)
+        return false if order.nil?
+
+        # Check if the order has a hold_expires_at column and if it has already passed
+        order.hold_expires_at.present? && order.hold_expires_at < Time.current
+      end
+
+      def cart_too_old?(order)
+        return false if order.nil?
+
+        # Treat the cart as active based on its last update time, not its creation time.
+        order.updated_at < CART_MAX_AGE_IN_MINUTES.minutes.ago
+      end
+
       private
 
       def scope

data/app/finders/spree_cm_commissioner/orders/find_by_all_state.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  module Orders
+    class FindByAllState < Spree::Orders::FindComplete
+      private
+
+      def scope
+        user? ? user.orders.includes(scope_includes) : Spree::Order.includes(scope_includes)
+      end
+    end
+  end
+end

data/app/helpers/spree_cm_commissioner/admin/homepage_segment_helper.rb

@@ -15,6 +15,8 @@ module SpreeCmCommissioner
           'badge badge-success text-uppercase'
         when :football
           'badge badge-dark text-uppercase'
+        when :show
+          'badge badge-danger text-uppercase'
         else
           'badge'
         end

data/app/interactors/spree_cm_commissioner/waiting_guests_caller.rb

@@ -3,8 +3,11 @@ require 'google/cloud/firestore'
 # TODO: alert when available_slots is negative.
 module SpreeCmCommissioner
   class WaitingGuestsCaller < BaseInteractor
-    MIN_WAIT_TO_ENTER_SECONDS = 120 # 2 min floor — Waiting Room step (full journey, more uncertainty)
-    MIN_QUEUE_TO_ENTER_SECONDS = 60 # 1 min floor — Queue step (position assigned, one caller cycle minimum)
+    # 10 min floor — Waiting Room step (full journey, most uncertainty)
+    MIN_WAIT_TO_ENTER_SECONDS = (ENV['WAITING_ROOM_MIN_WAIT_TO_ENTER_SECONDS'] || 600).to_i
+
+    # 5 min floor — Queue step (position assigned, sub-segment of the journey)
+    MIN_QUEUE_TO_ENTER_SECONDS = (ENV['WAITING_ROOM_MIN_QUEUE_TO_ENTER_SECONDS'] || 300).to_i
 
     # Firestore bounds a batch update by payload size (10 MiB); 500 ops/commit leaves us far under that.
     FIRESTORE_BATCH_SIZE = (ENV['WAITING_ROOM_FIRESTORE_BATCH_SIZE'] || 500).to_i
@@ -20,7 +23,8 @@ module SpreeCmCommissioner
         full: long_waiting_guests.size >= available_slots,
         available_slots: available_slots - long_waiting_guests.size,
         avg_wait_to_enter_seconds: compute_avg_wait_to_enter_seconds(long_waiting_guests),
-        avg_queue_to_enter_seconds: compute_avg_queue_to_enter_seconds(long_waiting_guests)
+        avg_queue_to_enter_seconds: compute_avg_queue_to_enter_seconds(long_waiting_guests),
+        slots_per_call: available_slots
       )
     end
 
@@ -96,10 +100,18 @@ module SpreeCmCommissioner
     end
 
     # merge: true so we preserve the published `waiting_guests_records_path` on the lobby doc.
-    def mark_as(full:, available_slots:, avg_wait_to_enter_seconds: nil, avg_queue_to_enter_seconds: nil)
+    def mark_as(
+      full:,
+      available_slots:,
+      avg_wait_to_enter_seconds: nil,
+      avg_queue_to_enter_seconds: nil,
+      slots_per_call: nil
+    )
       data = { full: full, available_slots: available_slots }
       data[:avg_wait_to_enter_seconds] = avg_wait_to_enter_seconds if avg_wait_to_enter_seconds
       data[:avg_queue_to_enter_seconds] = avg_queue_to_enter_seconds if avg_queue_to_enter_seconds
+      data[:slots_per_call] = slots_per_call if slots_per_call
+
       lobby_document.set(data, merge: true)
     end
 

data/app/jobs/concerns/spree_cm_commissioner/idempotent_job.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  module IdempotentJob
+    def with_idempotency(key = nil, &block)
+      SpreeCmCommissioner::IdempotencyKey.run_once(key.presence || default_idempotency_key, &block)
+    end
+
+    # Namespaced so the key is self-describing in the DB (no `source` column needed).
+    def default_idempotency_key
+      "#{self.class.name}:#{job_id}"
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/cancel_import_order_job.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  class CancelImportOrderJob < ApplicationUniqueJob
+    def perform(options = {})
+      SpreeCmCommissioner::Imports::Orders::Cancel.new(
+        import_order_id: options[:import_order_id],
+        canceled_by_user_id: options[:canceled_by_user_id],
+        cancellation_reason: options[:cancellation_reason]
+      ).call
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/idempotency_keys/prune_job.rb

@@ -0,0 +1,20 @@
+# Prunes old idempotency keys. Keys only matter within the retry window
+# (minutes–hours), so anything older than the cutoff is safe to delete.
+# The `created_at` index supports the delete.
+module SpreeCmCommissioner
+  module IdempotencyKeys
+    class PruneJob < SpreeCmCommissioner::ApplicationJob
+      DEFAULT_CUTOFF_DAYS = 3
+
+      queue_as :default
+
+      def perform(cutoff_days = DEFAULT_CUTOFF_DAYS)
+        days = [cutoff_days.to_i, 1].max
+
+        SpreeCmCommissioner::IdempotencyKey
+          .where(created_at: ...days.days.ago)
+          .delete_all
+      end
+    end
+  end
+end