spree_cm_commissioner 2.8.2 → 2.8.3.pre.pre4

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

@@ -0,0 +1,34 @@
+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, 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,40 @@
+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(show_contestant: :show_contestant_images)
+                            .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/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/jobs/spree_cm_commissioner/cleanup_expired_access_tokens_job.rb

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  class CleanupExpiredAccessTokensJob < SpreeCmCommissioner::ApplicationJob
+    queue_as :default
+
+    def perform
+      SpreeCmCommissioner::CleanupExpiredAccessTokens.new.call
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/show_contestants/import_job.rb

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  module ShowContestants
+    class ImportJob < ApplicationJob
+      def perform(import_id)
+        SpreeCmCommissioner::Imports::Contestants::Create.new(import_id: import_id).call
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/vote_fraud_event_job.rb

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  class VoteFraudEventJob < ApplicationJob
+    queue_as :default
+
+    def perform(options = {})
+      SpreeCmCommissioner::VoteFraudEvent.create!(options)
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/voting_credit_allocation_job.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  class VotingCreditAllocationJob < ApplicationUniqueJob
+    def perform(options = {})
+      order = Spree::Order.find_by(id: options[:order_id])
+      return if order.nil?
+
+      SpreeCmCommissioner::VotingCredits::Allocate.new(order).call
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/voting_credit_de_allocation_job.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  class VotingCreditDeAllocationJob < ApplicationUniqueJob
+    def perform(options = {})
+      order = Spree::Order.find_by(id: options[:order_id])
+      return if order.nil?
+
+      SpreeCmCommissioner::VotingCredits::DeAllocate.new(order).call
+    end
+  end
+end

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

@@ -8,7 +8,8 @@ module SpreeCmCommissioner
       tour: 0b00100,
       accommodation: 0b01000,
       things_to_do: 0b10000,
-      football: 0b100000
+      football: 0b100000,
+      show: 0b1000000
     }.freeze
 
     BIT_SEGMENT.each do |segment, bit_value|

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

@@ -23,8 +23,6 @@ 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
@@ -127,12 +125,6 @@ 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/option_type_attr_type.rb

@@ -45,7 +45,8 @@ module SpreeCmCommissioner
       'color' => 'color',
       'ticket-type' => 'string',
       'seat-type' => 'string',
-      'intercity-taxi' => 'string'
+      'intercity-taxi' => 'string',
+      'vote-package' => 'integer'
     }.freeze
 
     included do

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

@@ -26,8 +26,10 @@ module SpreeCmCommissioner
 
       state_machine.after_transition to: :canceled, do: :precalculate_conversion
       state_machine.after_transition to: :canceled, do: :restock_inventory!
+      state_machine.after_transition to: :canceled, do: :de_allocate_resources
 
       state_machine.after_transition to: :complete, do: :increment_route_fulfilled_order_count
+      state_machine.after_transition to: :complete, do: :allocate_resources
 
       scope :accepted, -> { where(request_state: 'accepted') }
 
@@ -328,5 +330,13 @@ module SpreeCmCommissioner
       factory = OrderTelegramMessageFactory.new(title: title, order: self)
       TelegramNotificationSenderJob.perform_later(chat_id: chat_id, message: factory.message, parse_mode: factory.parse_mode)
     end
+
+    def allocate_resources
+      SpreeCmCommissioner::VotingCreditAllocationJob.perform_later(order_id: id)
+    end
+
+    def de_allocate_resources
+      SpreeCmCommissioner::VotingCreditDeAllocationJob.perform_later(order_id: id)
+    end
   end
 end

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

@@ -5,7 +5,7 @@ module SpreeCmCommissioner
   module ProductType
     extend ActiveSupport::Concern
 
-    PRODUCT_TYPES = %i[accommodation service ecommerce transit].freeze
+    PRODUCT_TYPES = %i[accommodation service ecommerce transit show_episode vote_package advertisement].freeze
     PERMANENT_STOCK_PRODUCT_TYPES = %w[accommodation service transit].freeze
     PRE_INVENTORY_DAYS = { 'transit' => 90, 'accommodation' => 365, 'service' => 30 }.freeze
 

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

@@ -7,7 +7,6 @@ module SpreeCmCommissioner
       preference :telegram_order_alert_chat_id, :string
       preference :telegram_order_request_alert_chat_id, :string
       preference :telegram_new_vendor_alert_chat_id, :string
-      preference :telegram_new_event_alert_chat_id, :string
       preference :assetlinks, :string, default: ''
       preference :apple_app_site_association, :string, default: ''
     end

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

@@ -3,7 +3,9 @@ module SpreeCmCommissioner
     extend ActiveSupport::Concern
 
     included do
-      enum kind: { category: 0, cms: 1, event: 2, occupation: 3, nationality: 4, organization: 5, transit: 6, industry: 7, agency_category: 8 }
+      enum kind: { category: 0, cms: 1, event: 2, occupation: 3, nationality: 4, organization: 5, transit: 6, industry: 7, agency_category: 8,
+                   ads: 9
+}
     end
   end
 end

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

@@ -0,0 +1,41 @@
+module SpreeCmCommissioner
+  module VotingSessionLiveStreamConcern
+    extend ActiveSupport::Concern
+
+    included do
+      store_public_metadata :live_stream_url, :string
+      store_public_metadata :live_stream_enabled, :boolean
+      store_public_metadata :live_stream_thumbnail, :string
+      store_public_metadata :live_stream_title, :string
+      store_public_metadata :live_stream_description, :text
+
+      validate :validate_live_stream_url, if: :live_stream_url_changed?
+      before_save :update_live_stream_thumbnail
+    end
+
+    def embedded_live_stream_url
+      return nil if live_stream_url.blank?
+
+      result = SpreeCmCommissioner::UrlEmbed::YoutubeEmbed.call(url: live_stream_url)
+      result.success? ? result.value : nil
+    end
+
+    private
+
+    def validate_live_stream_url
+      return if live_stream_url.blank?
+
+      result = SpreeCmCommissioner::UrlEmbed::YoutubeEmbed.call(url: live_stream_url)
+      return if result.success?
+
+      errors.add(:live_stream_url, result.error)
+    end
+
+    def update_live_stream_thumbnail
+      return if live_stream_url.blank?
+
+      video_id = SpreeCmCommissioner::UrlEmbed::YoutubeEmbed.extract_video_id(live_stream_url)
+      self.live_stream_thumbnail = "https://img.youtube.com/vi/#{video_id}/hqdefault.jpg" if video_id
+    end
+  end
+end

data/app/models/spree_cm_commissioner/import.rb

@@ -3,7 +3,7 @@ module SpreeCmCommissioner
     extend FriendlyId
 
     enum :status, { :queue => 0, :progress => 1, :done => 2, :failed => 3 }
-    enum :import_type, { :new_order => 0, :existing_order => 1, :aba_payment_reference => 2 }
+    enum :import_type, { :new_order => 0, :existing_order => 1, :aba_payment_reference => 2, :contestant_import => 3 }
     has_one_attached :imported_file
     friendly_id :name, use: :slugged
 

data/app/models/spree_cm_commissioner/imports/import_contestant.rb

@@ -0,0 +1,7 @@
+module SpreeCmCommissioner
+  module Imports
+    class ImportContestant < Import
+      preference :fail_rows, :string
+    end
+  end
+end

data/app/models/spree_cm_commissioner/inventory_item.rb

@@ -23,23 +23,8 @@ module SpreeCmCommissioner
 
     before_save -> { self.product_type = variant.product_type }, if: -> { product_type.nil? }
 
-    after_commit :schedule_product_cache_invalidation
-
-    # Only for ecommerce: the app uses product.in_stock? (derived from quantity_available) for product cards.
-    # Other types (e.g. accommodation, bus) have many inventory items (including daily-generated ones),
-    # so invalidating per item would flood the task queue.
-    #
-    # This is temporary until we have a more robust cache invalidation strategy in place.
-    def schedule_product_cache_invalidation
-      return unless ecommerce?
-      return unless saved_change_to_quantity_available?
-
-      # Only fires on in_stock status transition (0 ↔ N); non-zero to non-zero changes are skipped.
-      old_val, new_val = saved_change_to_quantity_available
-      return if old_val.to_i.positive? && new_val.to_i.positive?
-
-      SpreeCmCommissioner::MaintenanceTasks::CacheInvalidation.pending.create_or_find_by(maintainable: variant.product)
-    end
+    # Create maintaining task to purge product related caches
+    after_commit { SpreeCmCommissioner::MaintenanceTasks::CacheInvalidation.pending.create_or_find_by(maintainable: variant.product) }
 
     def public_quantity_available
       [quantity_available, MAX_DISPLAY_STOCK].min

data/app/models/spree_cm_commissioner/maintenance_tasks/cache_invalidation.rb

@@ -3,8 +3,6 @@ module SpreeCmCommissioner
   module MaintenanceTasks
     class CacheInvalidation < MaintenanceTask
       def maintain
-        return if ENV['CACHE_AUTO_INVALIDATION_DISABLED'] == 'yes'
-
         if maintainable.is_a?(SpreeCmCommissioner::HomepageBackground) || maintainable.is_a?(Spree::Menu)
           SpreeCmCommissioner::HomepageDataLoader.clear_cache
         end

data/app/models/spree_cm_commissioner/maintenance_tasks/voting_session.rb

@@ -0,0 +1,36 @@
+# Reconciles Redis vote counters against cm_votes for a specific voting session.
+#
+# Created automatically by VoteProcessor when Redis is unavailable during a vote —
+# VoteProcessor skips async_execute (Sidekiq also needs Redis) and just creates
+# the DB row so OrchestrateJob's cron can pick it up once Redis recovers.
+#
+# `maintain` runs three steps in order:
+#   1. RebuildFromDb  — overwrites Redis counters with DB totals (source of truth)
+#   2. AuditCounters  — logs any remaining mismatches between Redis and DB
+#   3. SnapshotToDb   — writes final aggregates to cm_voting_contestants and cm_voting_session_stats
+#
+# maintainable: SpreeCmCommissioner::VotingSession
+#
+# Trigger on-demand:
+#   MaintenanceTasks::VotingSession.create!(maintainable: session).async_execute
+module SpreeCmCommissioner
+  module MaintenanceTasks
+    class VotingSession < MaintenanceTask
+      def maintain
+        ttl = rebuild_ttl
+        SpreeCmCommissioner::VoteCounters::RebuildFromDb.call(voting_session_id: maintainable.id, ttl: ttl)
+        SpreeCmCommissioner::VoteCounters::AuditCounters.call(voting_session_id: maintainable.id)
+        SpreeCmCommissioner::VoteCounters::SnapshotToDb.call(voting_session_id: maintainable.id)
+      end
+
+      # For closed sessions use the fixed 24h constant — closes_at is in the past
+      # so the dynamic formula would produce a TTL shorter than intended.
+      # For active sessions use closes_at + 24h buffer (same formula as Increment).
+      def rebuild_ttl
+        return SpreeCmCommissioner::VoteCounters::Base::REDIS_KEY_TTL if maintainable.closed?
+
+        [(maintainable.closes_at - Time.current).to_i + 1.day.to_i, 1].max
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/preview_role.rb

@@ -0,0 +1,8 @@
+module SpreeCmCommissioner
+  class PreviewRole < Base
+    belongs_to :previewable, polymorphic: true, optional: false
+    belongs_to :role, class_name: 'Spree::Role', optional: false
+
+    validates :role_id, uniqueness: { scope: %i[previewable_type previewable_id] }
+  end
+end