spree_cm_commissioner 2.5.2.pre.pre3 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa0e45576d6b86ad5c668c0ffe85f437e4e0e0ee01dcab1bef8c3cb4628950f9
-  data.tar.gz: b0d0683d2b81ede7e5200c270ac8d0b52d9c48dcb7e3223c94cf9f944bafe864
+  metadata.gz: 847e4b0b554ef076b2daeafe2d90509a434254ef6bb7bc19d34905d9a72f5a42
+  data.tar.gz: ce1c22521e38c5d012d2cb3fbe1ac041958a6054808c9b1786f4446a3046483d
 SHA512:
-  metadata.gz: 6304eee33f234cd8bcd652faefe614e48060b4bb0b0d61a7e5343935d9228f5fd66fcf46a6a24877cac346c161f5863f4bc84f3fe0021715d668f5021e64343c
-  data.tar.gz: aaeb3660e2c2cd02e453e4fc83daae2be76cb7611c12ee2bc2f15de05a0172258a2bc336e05366544060611a827d04c19fa4726fe41c8b3ae5606909c7488eb9
+  metadata.gz: 1bfbb01640f43c2b9540063a8c5e368b44b4009ecd27653f739c030c65ceffcdc48d1141d466f90e2870d3c088f933260366f9db3f3bfb4b1c68dba402f5522e
+  data.tar.gz: 7f128de24e2ad50a06c9a148dc37c2ccc4e8396077a32c2456a89a35b45236562073a185f67e8e50dca5b1a59efd9b6dbcfeef2018aa63becc88b334fa070609

data/Gemfile.lock

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

data/app/controllers/spree/api/v2/storefront/active_homepage_events_controller.rb

@@ -6,12 +6,7 @@ module Spree
           private
 
           def collection
-            @collection ||= model_class.active_homepage_events.includes(category_icon: { attachment_attachment: :blob })
-          end
-
-          def serialize_collection(collection)
-            model_class.preload_ancestors_for(collection)
-            super(collection)
+            @collection ||= model_class.active_homepage_events
           end
 
           def model_class

data/app/controllers/spree/api/v2/storefront/homepage_data_controller.rb

@@ -3,12 +3,43 @@ module Spree
     module V2
       module Storefront
         class HomepageDataController < ::Spree::Api::V2::ResourceController
+          before_action :load_homepage_background, only: [:show]
+          before_action :load_menu, only: [:show]
+
           def show
-            home_data_loader = SpreeCmCommissioner::HomepageDataLoader.with_cache
+            resource = SpreeCmCommissioner::HomepageData.new(
+              menu: @menu,
+              homepage_background: @homepage_background
+            )
+            render_serialized_payload { serialize_resource(resource) }
+          end
+
+          private
+
+          def serialize_resource(resource)
+            resource_serializer.new(
+              resource,
+              params: serializer_params,
+              include: resource_includes
+            ).serializable_hash
+          end
+
+          def load_homepage_background
+            @homepage_background ||= SpreeCmCommissioner::HomepageBackground
+                                     .active
+                                     .includes(:app_image, :web_image)
+                                     .where(segment: params[:segment] || :general)
+                                     .order(priority: :asc)
+                                     .first
+          end
 
-            render_serialized_payload do
-              serialize_resource(home_data_loader)
-            end
+          def load_menu
+            # Spree::Menu::MENU_LOCATIONS = ['Header', 'Footer']
+            # Current our homepage use only location: header
+            @menu ||= Spree::Menu.by_locale(I18n.locale)
+                                 .includes({ menu_items: %i[children parent icon] })
+                                 .where(location: 'header')
+                                 .first
           end
 
           def resource_serializer

data/app/controllers/spree/api/v2/storefront/homepage_sections_controller.rb

@@ -16,47 +16,10 @@ module Spree
           end
 
           def collection
-            @collection = model_class.filter_by_segment(params[:homepage_id] || :general)
-                                     .active
-                                     .where(tenant_id: nil)
-                                     .order(position: :asc)
-                                     .includes(preload_associations)
-          end
-
-          def preload_associations
-            {
-              homepage_section_relatables: {
-                relatable: [
-                  :icon,
-                  {
-                    home_banner: { attachment_attachment: :blob }
-                  },
-                  {
-                    category_icon: { attachment_attachment: :blob }
-                  },
-                  {
-                    video_banner: { attachment_attachment: :blob }
-                  },
-                  {
-                    app_banner: { attachment_attachment: :blob }
-                  },
-                  {
-                    web_banner: { attachment_attachment: :blob }
-                  },
-                  {
-                    children: [
-                      :icon,
-                      {
-                        vendors: [
-                          { photos: { attachment_attachment: :blob } },
-                          :default_state
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              }
-            }
+            @collection ||= model_class.filter_by_segment(params[:homepage_id] || :general)
+                                       .active
+                                       .where(tenant_id: nil)
+                                       .order(position: :asc)
           end
         end
       end

data/app/controllers/spree/api/v2/storefront/invite_guests_controller.rb

@@ -42,17 +42,8 @@ module Spree
           end
 
           def load_invite_guest_by_token
-            @invite_guest = SpreeCmCommissioner::InviteGuest.includes(
-              order: {
-                line_items: {
-                  guests: %i[
-                    guest_dynamic_fields
-                    id_card
-                    check_in
-                  ]
-                }
-              }
-            ).find_by(token: params[:id])
+            @invite_guest = SpreeCmCommissioner::InviteGuest.find_by!(token: params[:id])
+          rescue ActiveRecord::RecordNotFound
             render_error_payload(I18n.t('invite.url_not_found'))
           end
 

data/app/interactors/spree_cm_commissioner/conversion_pre_calculator.rb

@@ -5,7 +5,7 @@ module SpreeCmCommissioner
     def call
       update_conversion
       reassign_guests_event_id
-      generate_guests_bib_number
+      refinalize_guests
     end
 
     def update_conversion
@@ -28,14 +28,23 @@ module SpreeCmCommissioner
       end
     end
 
-    def generate_guests_bib_number
+    def refinalize_guests
       return if event_id.blank?
 
       SpreeCmCommissioner::Guest
         .complete
         .where(event_id: event_id)
         .none_bib
-        .find_each(&:generate_bib!)
+        .find_each do |guest|
+          result = SpreeCmCommissioner::Guests::Finalize.call(
+            guest: guest,
+            user: guest.line_item.order.user,
+            event: guest.event,
+            variant: guest.variant
+          )
+
+          result.success? || raise(ActiveRecord::RecordInvalid, guest)
+        end
     end
 
     def event_id

data/app/interactors/spree_cm_commissioner/notification_reader.rb

@@ -15,9 +15,11 @@ module SpreeCmCommissioner
     end
 
     def read_all_user_unread_notifications
-      # mark all unread notifications accept type 'guest_dynamic_field_notification'
+      # mark all unread notifications except type 'guest_dynamic_field_notification'
       # due to it requires user to fill info before mark as read
       user.notifications.markable_notifications.mark_as_read!
+
+      SpreeCmCommissioner::UserCountersService.reset_unread_notifications_count(user)
     end
   end
 end

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

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

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

@@ -4,7 +4,7 @@ module SpreeCmCommissioner
   module OrderStateMachine
     extend ActiveSupport::Concern
 
-    included do
+    included do # rubocop:disable Metrics/BlockLength
       state_machine.before_transition to: :address, do: :hold_blocks
       state_machine.before_transition to: :payment, do: :ensure_blocks_held
 
@@ -43,12 +43,14 @@ module SpreeCmCommissioner
         event :request do
           transition from: nil, to: :requested
         end
+        after_transition to: :requested, do: :increment_user_request_orders_count
         after_transition to: :requested, do: :send_order_requested_app_notification_to_user
         after_transition to: :requested, do: :send_order_requested_telegram_alert_to_store
 
         event :accept do
           transition from: :requested, to: :accepted
         end
+        after_transition from: :requested, to: :accepted, do: :decrement_user_request_orders_count
         after_transition to: :accepted, do: :send_order_accepted_app_notification_to_user
         after_transition to: :accepted, do: :send_order_accepted_telegram_alert_to_store
 
@@ -59,6 +61,8 @@ module SpreeCmCommissioner
           transition from: :requested, to: :rejected
         end
 
+        after_transition from: :requested, to: :rejected, do: :decrement_user_request_orders_count
+
         after_transition to: :rejected, do: :send_order_rejected_app_notification_to_user
         after_transition to: :rejected, do: :send_order_rejected_telegram_alert_to_store
 
@@ -72,6 +76,18 @@ module SpreeCmCommissioner
       end
     end
 
+    def increment_user_request_orders_count
+      return if user.nil?
+
+      SpreeCmCommissioner::UserCountersService.increment_request_orders_count(user)
+    end
+
+    def decrement_user_request_orders_count
+      return if user.nil?
+
+      SpreeCmCommissioner::UserCountersService.decrement_request_orders_count(user)
+    end
+
     def product_completion_steps_exist?
       product_completion_steps.any?
     end
@@ -174,9 +190,17 @@ module SpreeCmCommissioner
           line_item.generate_remaining_guests
 
           line_item.guests.each do |guest|
-            guest.user = user if user.present?
-            guest.generate_bib_if_needed
-            guest.save!
+            result = SpreeCmCommissioner::Guests::Finalize.call(
+              guest: guest,
+              user: user,
+              event: line_item.event,
+              variant: line_item.variant
+            )
+
+            unless result.success?
+              guest.errors.add(:base, result.error.value || result.error.to_s)
+              raise(ActiveRecord::RecordInvalid, guest)
+            end
           end
         end
       end

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

@@ -26,7 +26,6 @@ module SpreeCmCommissioner
                :bib_prefix,
                :bib_zerofill,
                :bib_display_prefix?,
-               :bib_pre_generation_on_create?,
                :seat_number_positions,
                :seat_number_layouts,
                :color,

data/app/models/spree_cm_commissioner/guest.rb

@@ -62,7 +62,6 @@ module SpreeCmCommissioner
     before_validation :assign_seat_number_with_block, if: -> { will_save_change_to_block_id? }
 
     before_save :preload_eligible_check_in_session_ids, if: -> { new_record? }
-    before_create :generate_bib_if_needed, if: -> { line_item.reload && variant.bib_pre_generation_on_create? }
     after_create :preload_order_block_ids, if: -> { block_id.present? }
     after_update :preload_order_block_ids, if: :saved_change_to_block_id?
     before_destroy :cancel_reserved_block!, if: -> { reserved_block.present? }
@@ -248,26 +247,6 @@ module SpreeCmCommissioner
       line_item.variant.bib_display_prefix?
     end
 
-    def generate_bib_if_needed
-      return if bib_prefix.present?
-      return unless bib_required?
-      return if event_id.blank?
-
-      self.bib_prefix = line_item.variant.bib_prefix
-
-      last_bib_number = event.guests
-                             .where(bib_prefix: bib_prefix)
-                             .maximum(:bib_number) || 0
-
-      self.bib_number = last_bib_number + 1
-      self.bib_index = "#{event_id}-#{bib_prefix}-#{bib_number}"
-    end
-
-    def generate_bib!
-      generate_bib_if_needed
-      save!
-    end
-
     # bib_number: 345, bib_prefix: 5KM, bib_zerofill: 5 => return 5KM00345
     # bib_number: 345, bib_prefix: 5KM, bib_zerofill: 2 => return 5KM345
     def formatted_bib_number
@@ -446,15 +425,15 @@ module SpreeCmCommissioner
     end
 
     def pre_registration_fields?
-      line_item&.product&.dynamic_fields&.select(&:pre_registration?)&.any?
+      line_item&.product&.dynamic_fields&.pre_registration&.any?
     end
 
     def post_registration_fields?
-      line_item&.product&.dynamic_fields&.select(&:post_registration?)&.any?
+      line_item&.product&.dynamic_fields&.post_registration&.any?
     end
 
     def during_check_in_fields?
-      line_item&.product&.dynamic_fields&.select(&:during_check_in?)&.any?
+      line_item&.product&.dynamic_fields&.during_check_in&.any?
     end
 
     def product_dynamic_fields

data/app/models/spree_cm_commissioner/notification.rb

@@ -26,5 +26,33 @@ module SpreeCmCommissioner
 
     belongs_to :recipient, polymorphic: true
     belongs_to :notificable, polymorphic: true
+
+    after_create :increment_user_counters
+    after_update :decrement_user_counters, if: :saved_change_to_read_at?
+    after_destroy :decrement_user_counters
+
+    private
+
+    def increment_user_counters
+      return unless recipient.is_a?(Spree::User)
+
+      return unless unread?
+
+      SpreeCmCommissioner::UserCountersService.increment_unread_notifications_count(recipient)
+    end
+
+    def decrement_user_counters
+      return unless recipient.is_a?(Spree::User)
+
+      # On update: decrement only if transitioning from unread (nil) to read (present)
+      if saved_change_to_read_at
+        return unless saved_change_to_read_at[0].nil? && saved_change_to_read_at[1].present?
+      # On destroy: decrement only if currently unread
+      else
+        return unless read_at.nil?
+      end
+
+      SpreeCmCommissioner::UserCountersService.decrement_unread_notifications_count(recipient)
+    end
   end
 end

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -94,32 +94,6 @@ module SpreeCmCommissioner
       def base.find_event(id)
         find_by(slug: "events-#{id}")
       end
-
-      def base.preload_ancestors_for(taxons)
-        return taxons if taxons.empty?
-
-        # Build a single query to fetch all ancestors for all taxons
-        conditions = taxons.map do |t|
-          sanitize_sql_array(['(lft <= ? AND rgt >= ?)', t.lft, t.rgt])
-        end.join(' OR ')
-        all_ancestors = where(conditions).distinct.order(:lft).to_a
-
-        # Store preloaded ancestors for each taxon
-        taxons.each do |t|
-          taxon_ancestors = all_ancestors.select { |a| a.lft <= t.lft && a.rgt >= t.rgt && a.id != t.id }
-          t.instance_variable_set(:@preloaded_ancestors, taxon_ancestors)
-        end
-
-        taxons
-      end
-    end
-
-    def pretty_name
-      ancestor_chain = @preloaded_ancestors || ancestors
-      ancestor_chain = ancestor_chain.inject('') do |chain, ancestor|
-        chain + "#{ancestor.name} -> "
-      end
-      ancestor_chain + name.to_s
     end
 
     def set_kind

data/app/models/spree_cm_commissioner/variant_options.rb

@@ -126,11 +126,6 @@ module SpreeCmCommissioner
       @bib_display_prefix == 1
     end
 
-    def bib_pre_generation_on_create?
-      @bib_pre_generation_on_create ||= option_value_name_for(option_type_name: 'bib-pre-generation-on-create')&.to_i || 0
-      @bib_pre_generation_on_create == 1
-    end
-
     def seat_number_positions
       @seat_number_positions ||= option_value_name_for(option_type_name: 'seat-number-positions')&.split(',')
     end

data/app/serializers/spree/v2/storefront/product_serializer_decorator.rb

@@ -2,52 +2,24 @@ module Spree
   module V2
     module Storefront
       module ProductSerializerDecorator
-        def self.prepended(base)
-          add_option_type_associations(base)
-          add_promotion_associations(base)
-          add_dynamic_field_associations(base)
-          add_taxon_associations(base)
-          add_basic_attributes(base)
-          add_custom_attributes(base)
-          add_cache_and_action_button(base)
-        end
-
-        def self.add_option_type_associations(base)
+        def self.prepended(base) # rubocop:disable Metrics/MethodLength
           base.has_many :variant_kind_option_types, serializer: :option_type
           base.has_many :product_kind_option_types, serializer: :option_type
           base.has_many :promoted_option_types, serializer: :option_type
-        end
-
-        def self.add_promotion_associations(base)
           base.has_many :possible_promotions, serializer: ::SpreeCmCommissioner::V2::Storefront::PromotionSerializer
-        end
-
-        def self.add_dynamic_field_associations(base)
           base.has_many :dynamic_fields, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldSerializer
-        end
 
-        def self.add_taxon_associations(base)
-          base.has_many :taxons, serializer: :taxon, record_type: :taxon do |object, params|
-            filter_store_taxons(object, params)
-          end
-        end
-
-        def self.filter_store_taxons(object, params)
-          object.classifications
-                .map(&:taxon)
-                .select { |taxon| taxon.taxonomy&.store_id == params[:store]&.id }
-                .sort_by(&:id)
-        end
-
-        def self.add_basic_attributes(base)
           base.has_one :default_state, serializer: :state
           base.has_one :venue, serializer: ::SpreeCmCommissioner::V2::Storefront::ProductPlaceSerializer
+
           base.attributes :need_confirmation, :product_type, :kyc, :kyc_fields, :allowed_upload_later, :allow_anonymous_booking, :use_video_as_default
           base.attributes :reveal_description, :discontinue_on, :public_metadata, :purchasable_on
+
+          # Expose only the `event_id` here instead of the full event object.
+          # This lets the client fetch event details separately (usually already cached),
+          # avoids extra DB queries from a `has_one :event` association, and keeps this response lightweight.
           base.attributes :event_id
-        end
 
-        def self.add_custom_attributes(base)
           base.attribute :purchasable_on_app do |product|
             product.purchasable_on == 'app' || product.purchasable_on == 'both'
           end
@@ -75,10 +47,9 @@ module Spree
             value = product.available?
             [true, false].include?(value) ? value : nil
           end
-        end
 
-        def self.add_cache_and_action_button(base)
           base.cache_options store: nil
+
           base.attribute :action_button, &:action_button
         end
       end

data/app/serializers/spree/v2/storefront/user_serializer_decorator.rb

@@ -6,7 +6,8 @@ module Spree
           base.attributes :first_name, :last_name, :gender, :phone_number, :intel_phone_number,
                           :country_code, :otp_enabled, :otp_email, :otp_phone_number,
                           :confirm_pin_code_enabled, :tenant_id, :has_incomplete_guest_info,
-                          :login, :qr_data, :qr_data_version, :qr_data_invalidated_at
+                          :login, :qr_data, :qr_data_version, :qr_data_invalidated_at,
+                          :unread_notifications_count, :request_orders_count
 
           base.has_one :profile, serializer: ::Spree::V2::Storefront::UserProfileSerializer
           base.has_many :device_tokens, serializer: Spree::V2::Storefront::UserDeviceTokenSerializer

data/app/serializers/spree_cm_commissioner/v2/storefront/homepage_data_serializer.rb

@@ -2,16 +2,10 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class HomepageDataSerializer < BaseSerializer
-        set_type :homepage_data
+        attributes :menu_id, :homepage_background_id
 
-        has_many :homepage_backgrounds, serializer: :homepage_background
-        has_many :homepage_banners, serializer: :homepage_banner
-        has_many :featured_vendors, serializer: ::Spree::V2::Storefront::AccommodationSerializer
-
-        # has_many :trending_categories, serializer: :category_taxon
-        # has_many :top_categories, serializer: :category_taxon
-        # has_many :display_products, serializer: :taxon_include_product
-        # has_many :featured_brands, serializer: :brand_taxon
+        has_one :menu, serializer: Spree::Api::Dependencies.storefront_menu_serializer.constantize
+        has_one :homepage_background, serializer: SpreeCmCommissioner::V2::Storefront::HomepageBackgroundSerializer
       end
     end
   end

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

@@ -0,0 +1,76 @@
+module SpreeCmCommissioner
+  module Guests
+    class Finalize
+      prepend ::Spree::ServiceModule::Base
+
+      MAX_RETRY_ATTEMPTS = 5
+
+      def call(guest:, variant:, event: nil, user: nil) # rubocop:disable Metrics/MethodLength,Metrics/PerceivedComplexity
+        attempts = 0
+
+        begin
+          attempts += 1
+
+          guest.user = user if user.present?
+          assign_bib(guest: guest, event: event, variant: variant)
+          guest.save!
+
+          success(guest)
+        rescue ActiveRecord::RecordInvalid => e
+          # Handle Rails-level validation error
+          if e.record.errors[:bib_index].any? && attempts < MAX_RETRY_ATTEMPTS
+            # Reload guest to get fresh data and retry
+            if guest.persisted?
+              guest.reload
+            else
+              # Clear bib values for new records so they get recalculated on retry
+              guest.bib_prefix = nil
+              guest.bib_number = nil
+              guest.bib_index = nil
+            end
+            retry
+          else
+            # Return failure if not a bib_index error or exceeded max attempts
+            failure(nil, e.message)
+          end
+        rescue ActiveRecord::RecordNotUnique => e
+          # Handle database-level uniqueness constraint violation
+          # Return failure if not a bib_index error or exceeded max attempts
+          return failure(nil, e.message) unless e.message.include?('bib_index') && attempts < MAX_RETRY_ATTEMPTS
+
+          # Reload guest to get fresh data and retry
+          if guest.persisted?
+            guest.reload
+          else
+            # Clear bib values for new records so they get recalculated on retry
+            guest.bib_prefix = nil
+            guest.bib_number = nil
+            guest.bib_index = nil
+          end
+          retry
+        end
+      end
+
+      def assign_bib(guest:, event:, variant:)
+        bib_prefix = variant.bib_prefix
+
+        return false unless variant.bib_required?
+
+        return false if guest.bib_prefix.present?
+        return false if guest.event_id.blank?
+        return false if event.nil? || guest.event_id != event.id
+
+        guest.bib_prefix = bib_prefix
+
+        last_bib_number = event.guests
+                               .where(bib_prefix: bib_prefix)
+                               .maximum(:bib_number) || 0
+
+        guest.bib_number = last_bib_number + 1
+        guest.bib_index = "#{event.id}-#{bib_prefix}-#{guest.bib_number}"
+
+        true
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/homepage_data.rb

@@ -0,0 +1,23 @@
+module SpreeCmCommissioner
+  class HomepageData
+    attr_reader :menu, :homepage_background
+
+    # Plain Old Ruby Object (PORO) for homepage data
+    def initialize(menu:, homepage_background:)
+      @menu = menu
+      @homepage_background = homepage_background
+    end
+
+    def id
+      @id ||= SecureRandom.uuid
+    end
+
+    def menu_id
+      menu&.id
+    end
+
+    def homepage_background_id
+      homepage_background&.id
+    end
+  end
+end

data/app/services/spree_cm_commissioner/user_counters_service.rb

@@ -0,0 +1,55 @@
+module SpreeCmCommissioner
+  class UserCountersService
+    def self.increment_unread_notifications_count(user)
+      return if user.nil?
+
+      user.increment!(:unread_notifications_count) # rubocop:disable Rails/SkipsModelValidations
+    end
+
+    def self.decrement_unread_notifications_count(user)
+      return if user.nil?
+
+      user.class
+          .where(id: user.id)
+          .where('unread_notifications_count > 0')
+          .update_all('unread_notifications_count = unread_notifications_count - 1') # rubocop:disable Rails/SkipsModelValidations
+    end
+
+    def self.reset_unread_notifications_count(user)
+      return if user.nil?
+
+      user.unread_notifications_count = 0
+      user.save!
+    end
+
+    def self.increment_request_orders_count(user)
+      return if user.nil?
+
+      user.increment!(:request_orders_count) # rubocop:disable Rails/SkipsModelValidations
+    end
+
+    def self.decrement_request_orders_count(user)
+      return if user.nil?
+
+      user.class
+          .where(id: user.id)
+          .where('request_orders_count > 0')
+          .update_all('request_orders_count = request_orders_count - 1') # rubocop:disable Rails/SkipsModelValidations
+    end
+
+    # This Method is to Resolve the race condition of increment and decrement user counters
+    # We will create a Cron job to sync user counters from database Later
+    def self.sync_counters(user)
+      return if user.nil?
+
+      unread = user.notifications.unread_notifications.count
+      requested = user.orders.where(request_state: 'requested').count
+
+      user.update_columns( # rubocop:disable Rails/SkipsModelValidations
+        unread_notifications_count: unread,
+        request_orders_count: requested,
+        updated_at: Time.current
+      )
+    end
+  end
+end

data/app/views/spree/admin/classifications/edit.html.erb

@@ -24,7 +24,7 @@
           <%= f.field_container :product do %>
             <%= f.label :product_id, Spree.t(:products) %>
             <%= f.select :product_id,
-              options_from_collection_for_select(Spree::Product.all, :id, :name),
+              options_from_collection_for_select(Spree::Product.all, :id, :name, f.object.product_id),
                 { include_hidden: true }, class: 'select2 form-control', disabled: f.object.persisted? %>
             <%= f.error_message_on :product_id %>
           <% end %>

data/db/migrate/20260128043540_add_counter_cache_to_spree_users.rb

@@ -0,0 +1,6 @@
+class AddCounterCacheToSpreeUsers < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_users, :unread_notifications_count, :integer, default: 0, null: false, if_not_exists: true
+    add_column :spree_users, :request_orders_count, :integer, default: 0, null: false, if_not_exists: true
+  end
+end

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

@@ -141,12 +141,6 @@ FactoryBot.define do
       presentation { 'Should display bib prefix?' }
     end
 
-    trait :bib_pre_generation_on_create do
-      attr_type { :boolean }
-      name { 'bib-pre-generation-on-create' }
-      presentation { 'Should pre generate bib on create' }
-    end
-
     trait :seat_number_positions do
       attr_type { :array }
       name { 'seat-number-positions' }

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

@@ -103,31 +103,18 @@ FactoryBot.define do
       transient do
         variant1_bib_prefix { '3KM' }
         variant2_bib_prefix { '5KM' }
-        bib_pre_generation_on_create { false }
-      end
-
-      before(:create) do |product, evaluator|
-        if evaluator.bib_pre_generation_on_create
-          product.option_types << create(:cm_option_type, :bib_pre_generation_on_create)
-        end
       end
 
       after(:create) do |product, evaluator|
         option_value1 = create(:cm_option_value, presentation: evaluator.variant1_bib_prefix, name: evaluator.variant1_bib_prefix, option_type: product.option_types[0])
         option_value2 = create(:cm_option_value, presentation: evaluator.variant2_bib_prefix, name: evaluator.variant2_bib_prefix, option_type: product.option_types[0])
 
-        bib_pre_generation_option_value = if evaluator.bib_pre_generation_on_create
-          create(:cm_option_value, presentation: 'Yes', name: '1', option_type: product.option_types.find_by(name: 'bib-pre-generation-on-create'))
-        end
-
         variant1 = create(:cm_variant, price: product.price, product: product)
         variant1.option_values = [option_value1]
-        variant1.option_values << bib_pre_generation_option_value if evaluator.bib_pre_generation_on_create
         variant1.save!
 
         variant2 = create(:cm_variant, price: product.price, product: product)
         variant2.option_values = [option_value2]
-        variant2.option_values << bib_pre_generation_option_value if evaluator.bib_pre_generation_on_create
         variant2.save!
       end
     end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.5.2-pre3'.freeze
+  VERSION = '2.5.2'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.5.2.pre.pre3
+  version: 2.5.2
 platform: ruby
 authors:
 - You
@@ -817,7 +817,6 @@ files:
 - app/controllers/.gitkeep
 - app/controllers/blazer/base_controller_decorator.rb
 - app/controllers/blazer/queries_controller_decorator.rb
-- app/controllers/concerns/spree/api/v2/product_list_includes_decorator.rb
 - app/controllers/concerns/spree/billing/order_parents_concern.rb
 - app/controllers/concerns/spree/billing/payment_creatable.rb
 - app/controllers/concerns/spree/billing/payment_fireable.rb
@@ -980,7 +979,6 @@ files:
 - app/controllers/spree/api/v2/storefront/pin_code_otp_checkers_controller.rb
 - app/controllers/spree/api/v2/storefront/pin_code_otp_generators_controller.rb
 - app/controllers/spree/api/v2/storefront/popular_route_places_controller.rb
-- app/controllers/spree/api/v2/storefront/products_controller_decorator.rb
 - app/controllers/spree/api/v2/storefront/profile_images_controller.rb
 - app/controllers/spree/api/v2/storefront/provinces_controller.rb
 - app/controllers/spree/api/v2/storefront/qr_urls_controller.rb
@@ -990,7 +988,6 @@ files:
 - app/controllers/spree/api/v2/storefront/s3_signed_urls_controller.rb
 - app/controllers/spree/api/v2/storefront/seat_layouts_controller.rb
 - app/controllers/spree/api/v2/storefront/self_check_in_controller.rb
-- app/controllers/spree/api/v2/storefront/taxons_controller_decorator.rb
 - app/controllers/spree/api/v2/storefront/tenants_controller.rb
 - app/controllers/spree/api/v2/storefront/transit/draft_orders_controller.rb
 - app/controllers/spree/api/v2/storefront/trip_places_controller.rb
@@ -1414,7 +1411,6 @@ files:
 - app/models/concerns/spree_cm_commissioner/vendor_promotable.rb
 - app/models/concerns/spree_cm_commissioner/video_on_demand_bitwise.rb
 - app/models/concerns/spree_cm_commissioner/webhooks/subscriber_rulable.rb
-- app/models/spree/stock/quantifier_decorator.rb
 - app/models/spree_cm_commissioner.rb
 - app/models/spree_cm_commissioner/ability_decorator.rb
 - app/models/spree_cm_commissioner/address_decorator.rb
@@ -2017,7 +2013,9 @@ files:
 - app/services/spree_cm_commissioner/google_wallets/hotel_class_updater.rb
 - app/services/spree_cm_commissioner/google_wallets/hotel_object_builder.rb
 - app/services/spree_cm_commissioner/guests/claim_invite_guest_service.rb
+- app/services/spree_cm_commissioner/guests/finalize.rb
 - app/services/spree_cm_commissioner/guests/preload_check_in_session_ids.rb
+- app/services/spree_cm_commissioner/homepage_data.rb
 - app/services/spree_cm_commissioner/homepage_data_loader.rb
 - app/services/spree_cm_commissioner/imports/base_import_order_service.rb
 - app/services/spree_cm_commissioner/imports/create_order_service.rb
@@ -2088,6 +2086,7 @@ files:
 - app/services/spree_cm_commissioner/trips/variants/create.rb
 - app/services/spree_cm_commissioner/update_guest_service.rb
 - app/services/spree_cm_commissioner/user_authenticator.rb
+- app/services/spree_cm_commissioner/user_counters_service.rb
 - app/services/spree_cm_commissioner/user_roles_assigner.rb
 - app/services/spree_cm_commissioner/users/incomplete_guest_checker_service.rb
 - app/services/spree_cm_commissioner/users/qr_data/extract_login.rb
@@ -2997,6 +2996,7 @@ files:
 - db/migrate/20260108101406_add_allow_booking_to_cm_trips.rb
 - db/migrate/20260121024645_add_nationality_group_to_cm_guests.rb
 - db/migrate/20260126110528_seed_user_initial_usernames.rb
+- db/migrate/20260128043540_add_counter_cache_to_spree_users.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md
@@ -3177,9 +3177,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubygems_version: 3.4.1

data/app/controllers/concerns/spree/api/v2/product_list_includes_decorator.rb

@@ -1,37 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module ProductListIncludesDecorator
-        # OVERRIDE: Extends base product_list_includes from Spree::Api::V2::ProductListIncludes
-        def product_list_includes
-          # Gets base from ProductListIncludes concern
-          base_includes = super
-
-          # Preload taxons with their taxonomies
-          base_includes[:classifications] = { taxon: :taxonomy }
-
-          # Add missing associations
-          base_includes[:vendor] = [:default_state]
-          base_includes[:venue] = []
-          base_includes[:variants_including_master] = { prices: [] }
-          base_includes[:product_option_types] = :option_type
-          base_includes[:product_promotion_rules] = {
-            promotion_rule: {
-              promotion: []
-            }
-          }
-          base_includes[:product_dynamic_fields] = :dynamic_field
-
-          %i[master variants variants_including_master].each do |key|
-            base_includes[key][:stock_items] = :stock_location if base_includes[key]
-            base_includes[key][:stock_locations] = []
-          end
-
-          base_includes
-        end
-      end
-    end
-  end
-end
-
-Spree::Api::V2::ProductListIncludes.prepend Spree::Api::V2::ProductListIncludesDecorator

data/app/controllers/spree/api/v2/storefront/products_controller_decorator.rb

@@ -1,27 +0,0 @@
-# gems/spree_cm_commissioner/app/controllers/spree/api/v2/storefront/products_controller_decorator.rb
-module Spree
-  module Api
-    module V2
-      module Storefront
-        module ProductsControllerDecorator
-          def scope_includes
-            base_includes = super
-
-            base_includes[:vendor] = { default_state: [] }
-            base_includes[:venue] = []
-            base_includes[:variants_including_master] = { prices: [] }
-
-            %i[master variants variants_including_master].each do |key|
-              base_includes[key][:stock_items] = :stock_location if base_includes[key]
-            end
-
-            base_includes
-          end
-        end
-      end
-    end
-  end
-end
-
-Spree::Api::V2::Storefront::ProductsController
-  .prepend Spree::Api::V2::Storefront::ProductsControllerDecorator

data/app/controllers/spree/api/v2/storefront/taxons_controller_decorator.rb

@@ -1,92 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Storefront
-        module TaxonsControllerDecorator
-          def resource
-            @resource ||= begin
-              taxon = scope.find_by(permalink: params[:id]) || scope.find(params[:id])
-
-              if action_name == 'show' && should_include_products?
-                taxon.products = taxon.products
-                                      .includes(product_includes_for_show)
-                                      .order('spree_products_taxons.position ASC')
-              end
-
-              if action_name == 'show' && should_include_visible_products?
-                taxon.visible_products = taxon.visible_products
-                                              .includes(product_includes_for_show)
-                                              .order('spree_products_taxons.position ASC')
-              end
-
-              taxon
-            end
-          end
-
-          protected
-
-          def scope(skip_cancancan: false)
-            base_scope = super(skip_cancancan: skip_cancancan)
-            base_scope = base_scope.includes(asset_includes) if action_name == 'show'
-            base_scope
-          end
-
-          private
-
-          def should_include_products?
-            params[:include]&.include?('products')
-          end
-
-          def should_include_visible_products?
-            params[:include]&.include?('visible_products')
-          end
-
-          def product_includes_for_show
-            {
-              product_properties: [],
-              option_types: [],
-              variant_images: [],
-              classifications: :taxon,
-              variants_including_master: product_variant_includes,
-              master: product_variant_includes,
-              variants: product_variant_includes,
-              vendor: { default_state: [] },
-              venue: []
-            }
-          end
-
-          def product_variant_includes
-            {
-              prices: [],
-              option_values: :option_type,
-              images: [],
-              stock_items: :stock_location
-            }
-          end
-
-          def asset_includes
-            {
-              category_icon: { attachment_attachment: :blob },
-              app_banner: { attachment_attachment: :blob },
-              web_banner: { attachment_attachment: :blob },
-              home_banner: { attachment_attachment: :blob },
-              video_banner: { attachment_attachment: :blob },
-              children: {
-                icon: { attachment_attachment: :blob },
-                category_icon: { attachment_attachment: :blob },
-                app_banner: { attachment_attachment: :blob },
-                web_banner: { attachment_attachment: :blob },
-                home_banner: { attachment_attachment: :blob },
-                video_banner: { attachment_attachment: :blob }
-              }
-            }
-          end
-        end
-      end
-    end
-  end
-end
-
-Spree::Api::V2::Storefront::TaxonsController.prepend(
-  Spree::Api::V2::Storefront::TaxonsControllerDecorator
-)

data/app/models/spree/stock/quantifier_decorator.rb

@@ -1,26 +0,0 @@
-module Spree
-  module Stock
-    module QuantifierDecorator
-      private
-
-      def scope_to_location(collection)
-        # If stock_items are already loaded (preloaded via includes), filter in memory
-        if collection.loaded?
-          if stock_location.blank?
-            # Filter to only active stock locations in memory
-            collection.select { |si| si.stock_location&.active? }
-          else
-            collection.select { |si| si.stock_location_id == stock_location.id }
-          end
-        else
-          # Fall back to original behavior if not preloaded
-          return collection.with_active_stock_location if stock_location.blank?
-
-          collection.where(stock_location: stock_location)
-        end
-      end
-    end
-  end
-end
-
-Spree::Stock::Quantifier.prepend Spree::Stock::QuantifierDecorator