spree_cm_commissioner 2.3.0.pre.pre18 → 2.3.0.pre.pre19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31d13343c99ba15786dc8ea2706e64fd79ada05ce505f06fea9dfdffd24f1313
-  data.tar.gz: 2638b1befd6df8abbc2ed8bcabfd447bb15bb2006336e2ff894662c58c07e933
+  metadata.gz: ba19c5f6b8ae1e8a80fb0128bf1f58b1a653d6430aa11d46ae3722b13e2d17be
+  data.tar.gz: 7993749d255ca3800e9d200adc21820bad68ac350a60b88882a5bda4ee054701
 SHA512:
-  metadata.gz: 487aa62c3894d83cd38036169a677ab79633f9792654e4d87e59c61fdbbe6a6bb60cd303f69727e093fc37fcf41c361ad43fbb2f60e79f84e5cd6e830aa05ed2
-  data.tar.gz: 608a5d18e523889840e11a31f2686d357636de604fb360abb0c5074c1f3eda129c33012e779f5dc5ce025aed2842eb605cb051014217fccf4fa36361b8315fb5
+  metadata.gz: 83ffc09e4828acf4abb37b4d10e537f2302f967dca20fdf86a806f260fe733dbd9da4097a2f813650e29f2f1420350c538ec4aa8eedc7d9b7543a68e9c535d07
+  data.tar.gz: 40448782e45555c79e319cca373607a53ca34125ce1c5e13f45a74aa0014992a7294c768fdca9826287e645b2073a2f953eb2956ce983d1147d810f68a31c608

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.3.0.pre.pre18)
+    spree_cm_commissioner (2.3.0.pre.pre19)
       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,54 +2,26 @@ 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?
 
-      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
-        register_user_without_email!(name)
-      end
-    end
-
-    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)
+      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
-      # 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)
+      else
+        context.fail!(message: firebase_context.message)
       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)
-
+    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
       if user.save(validate: false)
         context.user = user
       else
@@ -57,32 +29,39 @@ 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?
 
-      parts = full_name.split
-      attributes = { first_name: parts[0] }
-      attributes[:last_name] = parts[1..].join(' ') if parts.size > 1
+      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?
 
       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.assign_attributes(
-        sub: provider[:sub],
-        email: provider[:email],
-        name: provider[:name]
-      )
+      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]
 
       if user_identity_provider.save
         context.user_identity_provider = user_identity_provider
@@ -90,20 +69,5 @@ 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/archive_inactive_orders_job.rb

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

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -88,6 +88,7 @@ module SpreeCmCommissioner
     def restart_checkout_flow
       ActiveRecord::Base.transaction do
         cancel_blocks! if should_manage_blocks?
+        log_state_changes(state_name: 'cart', old_state: state, new_state: 'cart')
         update_columns( # rubocop:disable Rails/SkipsModelValidations
           state: 'cart',
           updated_at: Time.current

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

@@ -0,0 +1,55 @@
+module SpreeCmCommissioner
+  module Orders
+    class ArchiveInactiveOrders
+      prepend ::Spree::ServiceModule::Base
+
+      # Archives incomplete orders that haven't been updated for 14 days.
+      # Archived orders are hidden from users (Orders::Find filters them out).
+      # Users will see an empty cart and can start a new one.
+      #
+      # 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)
+      #
+      # Why 14 days?
+      # - Gives users time to notice discontinued products and clean up their cart
+      # - If product is discontinued during these 14 days, users can manually clear
+      #   their cart when they see the "unavailable" status in the UI
+      # - Gives the team time to investigate payment errors or stuck orders
+      #
+      # Why archive all payment states?
+      # - Data is preserved (archived_at is just a flag, not deletion)
+      # - Team can still review archived orders in the database if needed
+      # - 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)
+
+        count = inactive_orders.count
+
+        # Archive all inactive orders with reason in internal_note
+        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::ArchiveInactiveOrders#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/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.3.0-pre18'.freeze
+  VERSION = '2.3.0-pre19'.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.pre18
+  version: 2.3.0.pre.pre19
 platform: ruby
 authors:
 - You
@@ -1310,6 +1310,7 @@ 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/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
@@ -1952,6 +1953,7 @@ 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/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