spree_cm_commissioner 2.3.0.pre.pre17 → 2.3.0.pre.pre19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76d6f1a36e751b1723a6a6f7d6ba016dcf6df4c24d4e66322fadd7cb6d99f133
-  data.tar.gz: 5ee3fb8b1c36b92b04b349218a72db179b9e5afffe18342b73c6bafea2375600
+  metadata.gz: ba19c5f6b8ae1e8a80fb0128bf1f58b1a653d6430aa11d46ae3722b13e2d17be
+  data.tar.gz: 7993749d255ca3800e9d200adc21820bad68ac350a60b88882a5bda4ee054701
 SHA512:
-  metadata.gz: d402702c7778ddf7a44be7b6370fb943c7e091ee1d9cc5214ac4ffa97fde73a2347f072692661a815daf85fd1a18441d44b79c2e4246fce686b5f9822554a5b5
-  data.tar.gz: 3adbb3c9b40e612c65be67ae0853047bd5f1b1c82ac5daf7e91dc494a1f16d51f005eca9dbc48adf83467d3edb25e466114d9716abec8d43b0e7edff1b0753f2
+  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.pre17)
+    spree_cm_commissioner (2.3.0.pre.pre19)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

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

@@ -61,6 +61,7 @@ module Spree
 
             Spree::LineItem.joins(:order)
                            .where(spree_orders: { token: order_tokens, state: 'complete', user_id: nil })
+                           .includes(:guests, :saved_guests)
                            .filter_by_event(event)
                            .page(params[:page])
                            .per(params[:per_page])

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/line_item_decorator.rb

@@ -22,6 +22,11 @@ module SpreeCmCommissioner
       base.has_many :pending_guests, pending_guests_query, class_name: 'SpreeCmCommissioner::Guest', dependent: :destroy
       base.has_many :product_completion_steps, class_name: 'SpreeCmCommissioner::ProductCompletionStep', through: :product
 
+      base.has_many :saved_guests,
+                    through: :guests,
+                    source: :saved_guest,
+                    class_name: 'SpreeCmCommissioner::SavedGuest'
+
       base.before_validation -> { self.product_type = variant.product_type || product.product_type }, if: -> { product_type.nil? }
 
       base.before_save :update_vendor_id

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/serializers/spree/v2/storefront/line_item_serializer_decorator.rb

@@ -25,6 +25,8 @@ module Spree
 
           base.has_many :guests, serializer: SpreeCmCommissioner::V2::Storefront::GuestSerializer
 
+          base.has_many :saved_guests, serializer: SpreeCmCommissioner::V2::Storefront::SavedGuestSerializer
+
           base.has_many :pending_guests, serializer: SpreeCmCommissioner::V2::Storefront::GuestSerializer
 
           base.has_one :product, serializer: Spree::V2::Storefront::ProductSerializer

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-pre17'.freeze
+  VERSION = '2.3.0-pre19'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.3.0.pre.pre17
+  version: 2.3.0.pre.pre19
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-12 00:00:00.000000000 Z
+date: 2025-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -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