spree_cm_commissioner 2.3.0.pre.pre19 → 2.3.0.pre.pre20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba19c5f6b8ae1e8a80fb0128bf1f58b1a653d6430aa11d46ae3722b13e2d17be
-  data.tar.gz: 7993749d255ca3800e9d200adc21820bad68ac350a60b88882a5bda4ee054701
+  metadata.gz: f73314825dc2db092e1255e49203ceb8e1071e0dac1c11803d8343b8dc37fafa
+  data.tar.gz: 32c25a52977a2f20591b8650ece48a69e517845b3431b79e3c57da63cf8ddb50
 SHA512:
-  metadata.gz: 83ffc09e4828acf4abb37b4d10e537f2302f967dca20fdf86a806f260fe733dbd9da4097a2f813650e29f2f1420350c538ec4aa8eedc7d9b7543a68e9c535d07
-  data.tar.gz: 40448782e45555c79e319cca373607a53ca34125ce1c5e13f45a74aa0014992a7294c768fdca9826287e645b2073a2f953eb2956ce983d1147d810f68a31c608
+  metadata.gz: 1bd90e765ad3bdd9f28b6199900a7ea4f587dd11732af3a03c8bd3b13d234eb83765740de6619223dd03cbe77cb4b865c82c12c8a1845bc05157977463bf17d6
+  data.tar.gz: ef7380007df4d1ee55da2fea5d2d9cb2b3b5d931c44d17a955b9925c338f8a6285df1df59459b643152cd03fda819bcdd264075bc87eaaff5961e93d08b84606

data/Gemfile.lock

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

data/app/interactors/spree_cm_commissioner/user_registration_with_id_token.rb

@@ -2,26 +2,54 @@ module SpreeCmCommissioner
   class UserRegistrationWithIdToken < BaseInteractor
     # :id_token
     def call
+      firebase_context = validate_firebase_token!
+      return if firebase_context.nil?
+
+      ActiveRecord::Base.transaction do
+        find_or_register_user!(firebase_context.provider[:name], firebase_context.provider[:email])
+        link_user_account!(firebase_context.provider)
+      end
+    end
+
+    private
+
+    def validate_firebase_token!
       firebase_context = SpreeCmCommissioner::FirebaseIdTokenProvider.call(id_token: context.id_token)
+      return firebase_context if firebase_context.success?
 
-      if firebase_context.success?
-        ActiveRecord::Base.transaction do
-          register_user!(firebase_context.provider[:name], firebase_context.provider[:email])
-          link_user_account!(firebase_context.provider)
-        end
+      context.fail!(message: firebase_context.message)
+      nil
+    end
+
+    def find_or_register_user!(name, email)
+      if email.present?
+        register_user_with_email!(name, email)
       else
-        context.fail!(message: firebase_context.message)
+        register_user_without_email!(name)
       end
     end
 
-    def register_user!(name, email)
-      user = Spree.user_class.new(
-        password: SecureRandom.base64(16),
-        email: email,
-        tenant_id: context.tenant_id,
-        **name_attributes(name)
-      )
-      user.confirmed_at = Time.zone.now
+    def register_user_with_email!(name, email)
+      user = Spree.user_class.find_by(email: email, tenant_id: context.tenant_id)
+      return context.user = ensure_user_confirmed!(user) if user.present?
+
+      begin
+        context.user = Spree.user_class.find_or_create_by!(email: email, tenant_id: context.tenant_id) do |u|
+          assign_user_attributes(u, name)
+        end
+      # Handle potential race condition: Another request might have created the user
+      # between our find_by and find_or_create_by calls. If we get a RecordNotUnique,
+      # it means the user was created by another process, so we find and return it.
+      rescue ActiveRecord::RecordNotUnique
+        user = Spree.user_class.find_by!(email: email, tenant_id: context.tenant_id)
+        context.user = ensure_user_confirmed!(user)
+      end
+    end
+
+    def register_user_without_email!(name)
+      user = Spree.user_class.new(email: nil, tenant_id: context.tenant_id)
+      assign_user_attributes(user, name)
+
       if user.save(validate: false)
         context.user = user
       else
@@ -29,39 +57,32 @@ module SpreeCmCommissioner
       end
     end
 
+    def assign_user_attributes(user, name)
+      user.password = SecureRandom.base64(16)
+      user.confirmed_at = Time.zone.now
+      user.assign_attributes(name_attributes(name))
+    end
+
     def name_attributes(name)
       full_name = name&.strip
       return {} if full_name.blank?
 
-      split = full_name.split
-      first_name = split[0]
-      last_name = split[1..].join(' ')
-
-      attributes = {}
-      attributes[:first_name] = first_name if first_name.present?
-      attributes[:last_name] = last_name if last_name.present?
+      parts = full_name.split
+      attributes = { first_name: parts[0] }
+      attributes[:last_name] = parts[1..].join(' ') if parts.size > 1
 
       attributes
     end
 
-    # provider object
-
-    # {
-    #   identity_type: identity_type,
-    #   sub: sub
-    # }
-
     def link_user_account!(provider)
       identity_type = SpreeCmCommissioner::UserIdentityProvider.identity_types[provider[:identity_type]]
+      user_identity_provider = find_or_initialize_identity_provider(identity_type)
 
-      user_identity_provider = SpreeCmCommissioner::UserIdentityProvider.where(
-        user_id: context.user,
-        identity_type: identity_type
-      ).first_or_initialize
-
-      user_identity_provider.sub = provider[:sub]
-      user_identity_provider.email = provider[:email]
-      user_identity_provider.name = provider[:name]
+      user_identity_provider.assign_attributes(
+        sub: provider[:sub],
+        email: provider[:email],
+        name: provider[:name]
+      )
 
       if user_identity_provider.save
         context.user_identity_provider = user_identity_provider
@@ -69,5 +90,20 @@ module SpreeCmCommissioner
         context.fail!(message: user_identity_provider.errors.full_messages)
       end
     end
+
+    def find_or_initialize_identity_provider(identity_type)
+      SpreeCmCommissioner::UserIdentityProvider.where(
+        user_id: context.user,
+        identity_type: identity_type
+      ).first_or_initialize
+    end
+
+    # Ensure user is confirmed when linking with identity provider.
+    # Users created via OAuth should be auto-confirmed since they've proven
+    # their identity through the OAuth provider.
+    def ensure_user_confirmed!(user)
+      user.update(confirmed_at: Time.zone.now) if user.confirmed_at.nil?
+      user
+    end
   end
 end

data/app/jobs/spree_cm_commissioner/orders/bulk_archive_inactive_orders_job.rb

@@ -0,0 +1,13 @@
+module SpreeCmCommissioner
+  module Orders
+    class BulkArchiveInactiveOrdersJob < ApplicationJob
+      # Manual job that archives ALL incomplete orders inactive for 14+ days.
+      # Thin wrapper that calls BulkArchiveInactiveOrders service.
+      # ApplicationJob handles error logging via around_perform hook.
+      # Triggered manually via Sidekiq (not scheduled).
+      def perform
+        SpreeCmCommissioner::Orders::BulkArchiveInactiveOrders.new.call
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/orders/{archive_inactive_orders_job.rb → daily_archive_inactive_orders_job.rb}

@@ -1,11 +1,11 @@
 module SpreeCmCommissioner
   module Orders
-    class ArchiveInactiveOrdersJob < ApplicationJob
+    class DailyArchiveInactiveOrdersJob < ApplicationJob
       # Scheduled job that runs daily to archive incomplete orders inactive for 14+ days.
-      # Thin wrapper that calls ArchiveInactiveOrders service.
+      # Thin wrapper that calls DailyArchiveInactiveOrders service.
       # ApplicationJob handles error logging via around_perform hook.
       def perform
-        SpreeCmCommissioner::Orders::ArchiveInactiveOrders.new.call
+        SpreeCmCommissioner::Orders::DailyArchiveInactiveOrders.new.call
       end
     end
   end

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

@@ -0,0 +1,46 @@
+module SpreeCmCommissioner
+  module OrderScopes
+    extend ActiveSupport::Concern
+
+    included do
+      # Archiving scopes
+      scope :archived, -> { where.not(archived_at: nil) }
+      scope :not_archived, -> { where(archived_at: nil) }
+
+      # Payment and state scopes
+      scope :subscription, -> { where.not(subscription_id: nil) }
+      scope :paid, -> { where(payment_state: :paid) }
+      scope :complete_or_canceled, -> { complete.or(where(state: 'canceled')) }
+      scope :payment, -> { incomplete.where(state: 'payment') }
+      scope :without_user, -> { where(user_id: nil) }
+
+      # Inactive orders scopes with parameterized dates
+      # Usage: Spree::Order.inactive_incomplete_all(threshold: 14.days.ago)
+      scope :inactive_incomplete_all, lambda { |threshold: 14.days.ago|
+        where(archived_at: nil, completed_at: nil)
+          .where('updated_at < ?', threshold)
+      }
+
+      # Usage: Spree::Order.inactive_incomplete(threshold: 14.days.ago, window: 7.days)
+      # Returns orders updated between (threshold - window) and threshold
+      scope :inactive_incomplete, lambda { |threshold: 14.days.ago, window: 7.days|
+        where(archived_at: nil, completed_at: nil)
+          .where('updated_at >= ?', threshold - window)
+          .where('updated_at < ?', threshold)
+      }
+
+      # Filter scopes
+      scope :filter_by_match_user_contact, lambda { |user|
+        complete.where(
+          '(email = :email OR intel_phone_number = :intel_phone_number) AND user_id IS NULL',
+          email: user.email,
+          intel_phone_number: user.intel_phone_number
+        )
+      }
+
+      scope :filter_by_vendor, lambda { |vendor|
+        joins(:line_items).where(spree_line_items: { vendor_id: vendor }).distinct
+      }
+    end
+  end
+end

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -1,31 +1,12 @@
 module SpreeCmCommissioner
   module OrderDecorator
-    def self.prepended(base) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+    def self.prepended(base) # rubocop:disable Metrics/MethodLength
       base.include SpreeCmCommissioner::StoreMetadata
       base.include SpreeCmCommissioner::PhoneNumberSanitizer
       base.include SpreeCmCommissioner::OrderSeatable
       base.include SpreeCmCommissioner::OrderStateMachine
       base.include SpreeCmCommissioner::RouteOrderCountable
-
-      base.scope :subscription, -> { where.not(subscription_id: nil) }
-      base.scope :paid, -> { where(payment_state: :paid) }
-      base.scope :complete_or_canceled, -> { complete.or(where(state: 'canceled')) }
-      base.scope :payment, -> { incomplete.where(state: 'payment') }
-      base.scope :archived, -> { where.not(archived_at: nil) }
-      base.scope :not_archived, -> { where(archived_at: nil) }
-      base.scope :without_user, -> { where(user_id: nil) }
-
-      base.scope :filter_by_match_user_contact, lambda { |user|
-        complete.where(
-          '(email = :email OR intel_phone_number = :intel_phone_number) AND user_id IS NULL',
-          email: user.email,
-          intel_phone_number: user.intel_phone_number
-        )
-      }
-
-      base.scope :filter_by_vendor, lambda { |vendor|
-        joins(:line_items).where(spree_line_items: { vendor_id: vendor }).distinct
-      }
+      base.include SpreeCmCommissioner::OrderScopes
 
       base.before_create :link_by_phone_number
       base.before_create :associate_customer

data/app/services/spree_cm_commissioner/orders/bulk_archive_inactive_orders.rb

@@ -0,0 +1,52 @@
+module SpreeCmCommissioner
+  module Orders
+    class BulkArchiveInactiveOrders
+      prepend ::Spree::ServiceModule::Base
+
+      # Archives ALL incomplete orders inactive for 14+ days (no time range limit).
+      # This is a bulk operation for manual cleanup via Sidekiq.
+      # Archived orders are hidden from users (Orders::Find filters them out).
+      #
+      # Criteria for archiving:
+      # - archived_at IS NULL (not already archived)
+      # - completed_at IS NULL (incomplete/unfinished orders)
+      # - updated_at < 14 days ago (inactive for 2+ weeks)
+      #
+      # Difference from ArchiveInactiveOrders:
+      # - ArchiveInactiveOrders: Runs daily, archives only 1-week window (21-14 days)
+      # - BulkArchiveInactiveOrders: Manual job, archives ALL orders older than 14 days
+      #
+      # Use case: Bulk cleanup when needed, triggered manually via Sidekiq
+      def call
+        # Archives ALL orders inactive for 14+ days (no time range limit)
+        # Uses parameterized scope: threshold=14.days.ago
+        inactive_orders = Spree::Order.inactive_incomplete_all(threshold: 14.days.ago)
+
+        count = inactive_orders.count
+
+        # Archive all inactive orders with reason in internal_note.
+        # We use bulk update_all instead of find_each because:
+        # - We rarely use internal_note, so preserving history is not critical
+        # - Bulk update is significantly faster (1 query vs N queries)
+        # - For bulk operations, performance is critical
+        inactive_orders.update_all( # rubocop:disable Rails/SkipsModelValidations
+          archived_at: Time.current,
+          internal_note: 'Auto-archived: inactive for 14 days',
+          updated_at: Time.current
+        )
+
+        CmAppLogger.log(
+          label: 'SpreeCmCommissioner::Orders::BulkArchiveInactiveOrders#call completed',
+          data: {
+            archived_count: count,
+            threshold_days: 14
+          }
+        )
+
+        success(archived_count: count)
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/orders/{archive_inactive_orders.rb → daily_archive_inactive_orders.rb}

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
   module Orders
-    class ArchiveInactiveOrders
+    class DailyArchiveInactiveOrders
       prepend ::Spree::ServiceModule::Base
 
       # Archives incomplete orders that haven't been updated for 14 days.
@@ -24,14 +24,17 @@ module SpreeCmCommissioner
       # - Keeps user-facing order history clean (hidden from Orders::Find queries)
       # - Reduces clutter in active carts/orders
       def call
-        inactive_orders = Spree::Order
-                          .where(archived_at: nil)
-                          .where(completed_at: nil)
-                          .where('updated_at < ?', 14.days.ago)
+        # Archives orders from the 1-week window (21-14 days ago)
+        # Uses parameterized scope: threshold=14.days.ago, window=7.days
+        inactive_orders = Spree::Order.inactive_incomplete(threshold: 14.days.ago, window: 7.days)
 
         count = inactive_orders.count
 
-        # Archive all inactive orders with reason in internal_note
+        # Archive all inactive orders with reason in internal_note.
+        # We use bulk update_all instead of find_each because:
+        # - We rarely use internal_note, so preserving history is not critical
+        # - Bulk update is significantly faster (1 query vs N queries)
+        # - For typical 100-500 orders/day, bulk update is worth the performance gain
         inactive_orders.update_all( # rubocop:disable Rails/SkipsModelValidations
           archived_at: Time.current,
           internal_note: 'Auto-archived: inactive for 14 days',
@@ -39,7 +42,7 @@ module SpreeCmCommissioner
         )
 
         CmAppLogger.log(
-          label: 'SpreeCmCommissioner::Orders::ArchiveInactiveOrders#call completed',
+          label: 'SpreeCmCommissioner::Orders::DailyArchiveInactiveOrders#call completed',
           data: {
             archived_count: count,
             threshold_days: 14

data/db/migrate/20251113081853_add_index_to_spree_orders_updated_at.rb

@@ -0,0 +1,7 @@
+class AddIndexToSpreeOrdersUpdatedAt < ActiveRecord::Migration[7.0]
+  def change
+    unless index_exists?(:spree_orders, :updated_at)
+      add_index :spree_orders, :updated_at, name: 'index_spree_orders_on_updated_at'
+    end
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.3.0-pre19'.freeze
+  VERSION = '2.3.0-pre20'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.3.0.pre.pre19
+  version: 2.3.0.pre.pre20
 platform: ruby
 authors:
 - You
@@ -1310,7 +1310,8 @@ files:
 - app/jobs/spree_cm_commissioner/option_type_variants_public_metadata_updater_job.rb
 - app/jobs/spree_cm_commissioner/option_value_variants_public_metadata_updater_job.rb
 - app/jobs/spree_cm_commissioner/order_complete_telegram_sender_job.rb
-- app/jobs/spree_cm_commissioner/orders/archive_inactive_orders_job.rb
+- app/jobs/spree_cm_commissioner/orders/bulk_archive_inactive_orders_job.rb
+- app/jobs/spree_cm_commissioner/orders/daily_archive_inactive_orders_job.rb
 - app/jobs/spree_cm_commissioner/product_event_id_to_children_syncer_job.rb
 - app/jobs/spree_cm_commissioner/queue_order_webhooks_requests_job.rb
 - app/jobs/spree_cm_commissioner/reports_assigner_job.rb
@@ -1358,6 +1359,7 @@ files:
 - app/models/concerns/spree_cm_commissioner/metafield.rb
 - app/models/concerns/spree_cm_commissioner/option_type_attr_type.rb
 - app/models/concerns/spree_cm_commissioner/option_value_attr_type.rb
+- app/models/concerns/spree_cm_commissioner/order_scopes.rb
 - app/models/concerns/spree_cm_commissioner/order_seatable.rb
 - app/models/concerns/spree_cm_commissioner/order_state_machine.rb
 - app/models/concerns/spree_cm_commissioner/parameterize_name.rb
@@ -1953,7 +1955,8 @@ files:
 - app/services/spree_cm_commissioner/intercity_taxi_order/update.rb
 - app/services/spree_cm_commissioner/metafields/product_metadata_service.rb
 - app/services/spree_cm_commissioner/order_params_checker.rb
-- app/services/spree_cm_commissioner/orders/archive_inactive_orders.rb
+- app/services/spree_cm_commissioner/orders/bulk_archive_inactive_orders.rb
+- app/services/spree_cm_commissioner/orders/daily_archive_inactive_orders.rb
 - app/services/spree_cm_commissioner/orders/generate_commissions_decorator.rb
 - app/services/spree_cm_commissioner/organizer/export_guest_csv_service.rb
 - app/services/spree_cm_commissioner/organizer/export_invite_guest_csv_service.rb
@@ -2844,6 +2847,7 @@ files:
 - db/migrate/20251009033331_add_registered_by_to_spree_users.rb
 - db/migrate/20251009073040_add_lock_version_to_cm_routes.rb
 - db/migrate/20251009073929_add_lock_version_to_cm_vendor_routes.rb
+- db/migrate/20251113081853_add_index_to_spree_orders_updated_at.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md