spree_cm_commissioner 2.5.13.pre.patch4 → 2.5.13.pre.pre.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0490748ea10626aebe6ebe48862a792f00c14ccc994923a20a8c47cd3b69c868'
-  data.tar.gz: 01655e182fa6a3b2fef4a7d86464cc3e70ef3d11676a5671a27242552a8ebc4c
+  metadata.gz: 2c40684e0f70119578189d382a9276fb63cec8fa0883962e1958e8d43f2f2524
+  data.tar.gz: 5912fd46420192f4b0e0165714f877bd27bac0cefdd9442f94d11bbd11d70f37
 SHA512:
-  metadata.gz: c01ab4f2d158ab227147086d2da8689b7a5c10504760c5ffe2865ad8ad7382f5d45a4b3f60599afcf68c0b8a131621248f521a5a7b24c3b24ed600c15aad79b8
-  data.tar.gz: 60493b89228813004a8ec359ce05d5ad184e85361d44a2e252982913a360e4984f8c073c6efdb413075ccdb242709a6ba240865d1165a0df2f3173a12eb2c2f2
+  metadata.gz: d70eb4325cf0ba929be7823f03e6fb879c900c3351cb3733b2d2065bd540a695ab529f3c200a64db14a3dc53850eff7bf6f71e40f4f8af84a365c22decb1296c
+  data.tar.gz: ea2ef001e5d54b7ce416afbcfb796dc90c7c5a6283291bef20bbcca6a08f9351769325015f87d3b6507aeeebf3a875d24d37d3128c1078437c3a47956f7cc7ce

data/.env.example

@@ -40,13 +40,3 @@ CACHE_SEMI_STATIC_MAX_AGE=3600 # Semi-static content (menus, homepage background
 CACHE_MODERATE_MAX_AGE=1800 # Moderate freshness (products, events, vendors) - 30 minutes
 CACHE_REALTIME_MAX_AGE=300 # High freshness (trips, trip search) - 5 minutes
 CACHE_DEFAULT_MAX_AGE=300 # Default for unlisted controllers - 5 minutes
-
-# Batch size for processing maintenance tasks in app/jobs/spree_cm_commissioner/maintenance_tasks/orchestrate_job.rb
-MAINTENANCE_TASKS_BATCH_SIZE=100
-
-# Export related:
-OPERATOR_GUEST_JSON_GZIP_CACHE_HOURS=24
-EXPORT_PRESIGNED_URL_EXPIRATION_MINUTES=15
-
-# import order batch size
-IMPORT_ORDERS_BATCH_SIZE=50

data/Gemfile.lock

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

data/app/controllers/concerns/spree_cm_commissioner/content_cachable.rb

@@ -64,7 +64,7 @@ module SpreeCmCommissioner
       elsif HIGH_FRESHNESS_CONTROLLERS.include?(controller_name)
         ENV.fetch('CACHE_REALTIME_MAX_AGE', 5.minutes.to_i).to_i
       else
-        ENV.fetch('CACHE_DEFAULT_MAX_AGE', 0.minutes.to_i).to_i
+        ENV.fetch('CACHE_DEFAULT_MAX_AGE', 5.minutes.to_i).to_i
       end
     end
 

data/app/controllers/spree/admin/classifications_controller.rb

@@ -4,19 +4,11 @@ module Spree
       before_action :load_taxon_and_products
 
       def recalculate_conversions
-        if @taxon.parent.event?
-          SpreeCmCommissioner::MaintenanceTasks::Event.pending.find_or_create_by(
-            maintainable_type: 'Spree::Taxon',
-            maintainable_id: @taxon.parent.id
-          ) do |task|
-            task.manually_triggered = true
-          end.async_execute
-
-          flash[:success] = flash_message_for(@taxon, :successfully_updated)
-        else
-          flash[:error] = 'Conversion recalculation can only be performed for taxons under an event.' # rubocop:disable Rails/I18nLocaleTexts
+        @taxon.products.each do |product|
+          SpreeCmCommissioner::ConversionPreCalculatorJob.perform_later(product_id: product.id)
         end
 
+        flash[:success] = flash_message_for(@taxon, :successfully_updated)
         redirect_to collection_url
       end
 

data/app/controllers/spree/admin/exports_controller.rb

@@ -1,9 +1,7 @@
 module Spree
   module Admin
     class ExportsController < Spree::Admin::ResourceController
-      include ActiveStorage::SetCurrent
-
-      before_action :load_export, only: %i[show destroy]
+      before_action :load_export, only: [:destroy]
 
       def index
         @exports = SpreeCmCommissioner::Export
@@ -12,10 +10,6 @@ module Spree
                    .per(params[:per_page] || 25)
       end
 
-      def show
-        # @export is loaded by before_action
-      end
-
       def new
         @export = SpreeCmCommissioner::Export.new
       end

data/app/controllers/spree/admin/import_existing_orders_controller.rb

@@ -3,9 +3,7 @@ module Spree
     class ImportExistingOrdersController < BaseImportOrdersController
       # override
       def collection
-        @collection ||= model_class.existing_order
-                                   .order(created_at: :desc)
-                                   .page(params[:page])
+        @collection ||= model_class.existing_order.page(params[:page])
                                    .per(params[:per_page])
       end
 

data/app/controllers/spree/admin/import_new_orders_controller.rb

@@ -3,9 +3,7 @@ module Spree
     class ImportNewOrdersController < BaseImportOrdersController
       # override
       def collection
-        @collection ||= model_class.new_order
-                                   .order(created_at: :desc)
-                                   .page(params[:page])
+        @collection ||= model_class.new_order.page(params[:page])
                                    .per(params[:per_page])
       end
 

data/app/controllers/spree/admin/inventory_items_controller.rb

@@ -42,8 +42,8 @@ module Spree
         inventory_items = @product.inventory_items.where(id: inventory_item_ids)
         target_quantity = params[:quantity].to_i
 
-        if target_quantity.negative?
-          flash[:error] = "Target quantity (#{target_quantity}) must not be negative"
+        if target_quantity.zero?
+          flash[:error] = "Target quantity (#{target_quantity}) must be greater than zero"
           return redirect_back(fallback_location: admin_product_stock_managements_path(@product))
         end
 
@@ -52,7 +52,7 @@ module Spree
           quantity_change = target_quantity - inventory_item.quantity_available
 
           # Use adjust_quantity! to update max_capacity, quantity_available, and sync to Redis
-          inventory_item.adjust_quantity!(quantity_change)
+          inventory_item.adjust_quantity!(quantity_change) if quantity_change != 0
         end
 
         flash[:success] = "Successfully updated stocks for #{inventory_items.count} items"

data/app/controllers/spree/admin/stock_managements_controller.rb

@@ -14,11 +14,7 @@ module Spree
       def index
         @variants = @product.variants.includes(:images, :default_price, stock_items: :stock_location, option_values: :option_type)
         @variants = [@product.master] if @variants.empty?
-
-        vendor_stock_locations = @product.vendor&.stock_locations || []
-        variant_stock_locations = @variants.flat_map(&:stock_locations).uniq
-
-        @stock_locations = (variant_stock_locations + vendor_stock_locations).uniq
+        @stock_locations = (@variants.flat_map(&:stock_locations) + @product.vendor.stock_locations).uniq
 
         load_inventories unless @product.permanent_stock?
       end

data/app/controllers/spree/admin/taxons_controller_decorator.rb

@@ -5,12 +5,6 @@ module Spree
         base.before_action :build_assets, only: %i[create update]
       end
 
-      # override
-      def new
-        @taxon.parent_id = params[:parent_id] if params[:parent_id].present?
-        super
-      end
-
       def remove_category_icon
         remove_asset(@taxon.category_icon)
       end

data/app/controllers/spree/admin/vendor_service_calendars_controller.rb

@@ -1,31 +1,92 @@
 module Spree
   module Admin
     class VendorServiceCalendarsController < Spree::Admin::ResourceController
-      include Spree::Admin::ServiceCalendarsConcern
-
       before_action :load_vendor
+      new_action.before :set_exception_rules
+
+      create.before :set_vendor
+      update.before :set_vendor
+
+      helper 'spree_cm_commissioner/admin/service_calendars'
 
-      create.before :set_calendarable
-      update.before :set_calendarable
+      def update_status
+        if @object.update(active: !@object.active)
+          flash[:success] = flash_message_for(@object, :successfully_updated)
+        else
+          flash[:error] = @object.errors.full_messages.to_sentence
+        end
+
+        redirect_to admin_vendor_vendor_service_calendars_url
+      rescue ActiveRecord::RecordInvalid => e
+        flash[:error] = e.message
+        redirect_to admin_vendor_vendor_service_calendars_url
+      end
 
       protected
 
+      def model_class
+        SpreeCmCommissioner::ServiceCalendar
+      end
+
+      def object_name
+        'spree_cm_commissioner_service_calendars'
+      end
+
       def collection_url(options = {})
         admin_vendor_vendor_service_calendars_url(options)
       end
 
+      def permitted_resource_params
+        service_calendar_params = params.require(:spree_cm_commissioner_service_calendar)
+                                        .permit(:calendarable_id, :calendarable_type, :start_date, :end_date,
+                                                :monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday
+                                        )
+        service_calendar_params[:exception_rules] = build_exception_rules(params[:spree_cm_commissioner_service_calendar][:exception_rules])
+        service_calendar_params
+      end
+
       private
 
       def load_vendor
         @vendor ||= (Spree::Vendor.find_by(slug: params[:vendor_id]) || Spree::Vendor.find_by(id: params[:vendor_id]))
       end
 
-      def load_calendarable
+      def set_vendor
+        @object.calendarable_type = calendarable_type
+        @object.calendarable_id   = calendarable_id
+      end
+
+      def build_exception_rules(exception_rules)
+        exception_rules.values.reject! { |rule| rule['from'].blank? || rule['to'].blank? || rule['type'].blank? } || exception_rules.values
+      end
+
+      def collection
         load_vendor
+
+        @objects = model_class.where(
+          calendarable_type: calendarable_type,
+          calendarable_id: calendarable_id
+        ).order(id: :desc)
+      end
+
+      def set_exception_rules
+        @exception_rules = [{ from: DateTime.now, to: DateTime.now, type: 'exclusion', reason: nil }]
+      end
+
+      # it load before :load_vendor
+      def build_resource
+        today = Time.zone.today
+        model_class.new(start_date: today, end_date: today.next_year(3),
+                        exception_rules: [{ from: nil, to: nil, type: 'inclusion' }]
+        )
+      end
+
+      def calendarable_id
+        @vendor.id
       end
 
-      def calendarable
-        @vendor
+      def calendarable_type
+        @vendor.class.name
       end
     end
   end

data/app/controllers/spree/api/v2/operator/check_ins_controller.rb

@@ -5,23 +5,10 @@ module Spree
         class CheckInsController < ::Spree::Api::V2::ResourceController
           before_action :require_spree_current_user, only: %i[index create]
 
-          # Check-in history data requires fresh/recent data for operator dashboards
-          # Short cache duration ensures operators see near real-time check-in activity
-          CACHE_EXPIRES_IN = 1.minute
-
           def collection
-            @collection ||= SpreeCmCommissioner::CheckIn
-                            .where(checkinable_type: 'Spree::Taxon', checkinable_id: params[:taxon_id])
-                            .page(params[:page])
-                            .per(params[:per_page])
-          end
+            @collection = SpreeCmCommissioner::CheckIn.where(checkinable: params[:taxon_id])
 
-          # override
-          def collection_cache_opts
-            {
-              namespace: Spree::Api::Config[:api_v2_collection_cache_namespace],
-              expires_in: CACHE_EXPIRES_IN
-            }
+            @collection = @collection.page(params[:page]).per(params[:per_page])
           end
 
           def create

data/app/controllers/spree/api/v2/operator/guest_json_gzips_controller.rb

@@ -3,22 +3,12 @@ module Spree
     module V2
       module Operator
         class GuestJsonGzipsController < ::Spree::Api::V2::ResourceController
-          include ActiveStorage::SetCurrent
-
           before_action :require_spree_current_user
-          before_action :require_event_user
-
-          # Override index to disable server-side caching.
-          # We always want to show the latest exports and their download status.
-          # The app will cache files on its side to avoid unnecessary server requests once files are ready.
-          def index
-            render_serialized_payload do
-              serialize_collection(paginated_collection)
-            end
-          end
 
           # POST /api/v2/operator/guest_json_gzips
           # - taxon_id=1
+          # - resource_includes[]=[check_ins,check_ins.check_in_by]
+          # - force_create=true (optional, to bypass recent export check)
           def create
             spree_authorize! :create, SpreeCmCommissioner::Exports::OperatorGuestJsonGzip
 
@@ -26,17 +16,8 @@ module Spree
 
             result = SpreeCmCommissioner::OperatorGuestJsonGzips::Create.call(
               exportable: exportable,
-              force_create: false,
-              options: {
-                created_by_id: spree_current_user.id.to_s,
-                created_by_login: spree_current_user.login,
-                ip_address: request.remote_ip,
-                user_agent: request.user_agent,
-                request_id: request.request_id,
-                client_version: request.headers['X-Cm-App-Version'],
-                client_os: request.headers['X-Cm-OperatingSystem'],
-                client_platform: request.headers['X-Cm-App-Platform']
-              }
+              resource_includes: params[:resource_includes] || [],
+              force_create: params[:force_create] == 'true'
             )
 
             if result.success?
@@ -48,10 +29,6 @@ module Spree
             end
           end
 
-          def require_event_user
-            raise CanCan::AccessDenied unless spree_current_user.events.exists?(id: params[:taxon_id])
-          end
-
           # override
           def scope
             SpreeCmCommissioner::Exports::OperatorGuestJsonGzip.where(

data/app/controllers/spree/api/v2/operator/guests_controller.rb

@@ -15,12 +15,6 @@ module Spree
             SpreeCmCommissioner::GuestSearcherQuery.new(params).call
           end
 
-          # override
-          # use same includes as export for consistent response.
-          def resource_includes
-            SpreeCmCommissioner::Exports::OperatorGuestJsonGzip::RESOURCE_INCLUDES
-          end
-
           private
 
           def model_class

data/app/controllers/spree/api/v2/operator/recalculate_tickets_controller.rb

@@ -7,9 +7,13 @@ module Spree
           before_action :load_taxon, only: :create
 
           def create
-            SpreeCmCommissioner::MaintenanceTasks::Event.pending.find_or_create_by(
-              maintainable: @taxon
-            ).async_execute
+            classification_ids = Spree::Classification.joins(:taxon)
+                                                      .where(spree_taxons: { id: @taxons.pluck(:id) })
+                                                      .pluck(:id)
+
+            classification_ids.each do |classification_id|
+              SpreeCmCommissioner::ConversionPreCalculator.call(product_taxon: Spree::Classification.find(classification_id))
+            end
 
             render json: { message: 'Conversions recalculated successfully' }, status: :ok
           end
@@ -17,7 +21,8 @@ module Spree
           private
 
           def load_taxon
-            @taxon = Spree::Taxon.find(params[:taxon_id])
+            parent_taxon = Spree::Taxon.find(params[:taxon_id])
+            @taxons = parent_taxon.children
           end
         end
       end

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

@@ -0,0 +1,63 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        module QueueCart
+          class LineItemsController < CartController
+            before_action :ensure_order, only: :create
+            before_action :load_variant, only: :create
+
+            # override
+            def create
+              spree_authorize! :update, spree_current_order, order_token
+              spree_authorize! :show, @variant
+
+              availability_checker = SpreeCmCommissioner::Stock::AvailabilityChecker.new(@variant, add_item_params[:options])
+
+              unless availability_checker.can_supply?(add_item_params[:quantity].to_i)
+                return render_error_payload(availability_checker.error_message || I18n.t('variant_availability.items_out_of_stock'))
+              end
+
+              job = SpreeCmCommissioner::EnqueueCart::AddItemJob.perform_later(
+                order_id: spree_current_order.id,
+                variant_id: @variant.id,
+                quantity: add_item_params[:quantity],
+                public_metadata: add_item_params[:public_metadata],
+                private_metadata: add_item_params[:private_metadata],
+                options: add_item_params[:options]
+              )
+
+              return render_error_payload('Failed to enqueue the job') unless job
+
+              result = SpreeCmCommissioner::EnqueueCart::AddItemStatusMarker.call(
+                order_number: spree_current_order.number,
+                job_id: job.job_id,
+                status: 'processing',
+                queued_at: Time.current,
+                variant_id: @variant.id,
+                quantity: add_item_params[:quantity]
+              )
+
+              line_item_queue = SpreeCmCommissioner::QueueItem.new(
+                id: job.job_id,
+                status: result.firestore_status,
+                queued_at: result.firestore_queued_at,
+                collection_reference: result.firestore_collection_reference,
+                document_reference: result.firestore_document_reference
+              )
+
+              render_serialized_payload do
+                serialize_resource(line_item_queue)
+              end
+            end
+
+            # override
+            def resource_serializer
+              Spree::V2::Storefront::FirestoreQueueSerializer
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -34,7 +34,6 @@ module Spree
 
             ActiveRecord::Base.transaction do
               resource.save!
-              recalculate_cart(resource.line_item)
               run_dynamic_fields(resource)
               resource.save_and_move_to_next_stage
             end
@@ -49,7 +48,6 @@ module Spree
               run_dynamic_fields(resource) if guest_params[:guest_dynamic_fields_attributes]
               resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
               resource.save!
-              recalculate_cart(resource.line_item)
               resource.save_and_move_to_next_stage
             end
 
@@ -89,8 +87,6 @@ module Spree
               :other_organization,
               :expectation,
               :upload_later,
-              :age_group,
-              :nationality_group,
               guest_dynamic_fields_attributes: %i[
                 id
                 dynamic_field_id
@@ -115,10 +111,6 @@ module Spree
           def handle_record_not_found(exception)
             render_error_payload({ base: [exception.message] }, 404)
           end
-
-          def recalculate_cart(line_item)
-            ::Spree::Dependencies.cart_recalculate_service.constantize.call(line_item: line_item, order: spree_current_order)
-          end
         end
       end
     end

data/app/controllers/spree_cm_commissioner/orders_controller.rb

@@ -3,26 +3,14 @@ module SpreeCmCommissioner
     layout 'spree_cm_commissioner/layouts/order_mailer'
     helper 'spree/mail'
 
-    def show # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def show
       @order = if params[:id].match?(/^R\d{9,}-([A-Za-z0-9_\-]+)$/)
                  Spree::Order.search_by_qr_data!(params[:id])
                else
-                 result = SpreeCmCommissioner::Orders::JwtToken::Verify.call(token: params[:t])
-                 unless result.success?
-                   @title = I18n.t('views.sign_in.errors.request_invalid')
-                   @message = I18n.t('views.sign_in.errors.request_invalid_message')
-
-                   return render(
-                     template: 'shared_console/errors/request_invalid',
-                     layout: 'error'
-                   )
-                 end
-
-                 result.value[:order]
+                 SpreeCmCommissioner::Orders::JwtToken::Verify.call(token: params[:t]).value[:order]
                end
 
       @product_type = @order.products.first&.product_type || 'accommodation'
-      @expired_at = Time.zone.at(result&.value&.dig(:payload, 'exp')) if result&.value&.dig(:payload, 'exp')
 
       if @order.tenant.present?
         @name = @order.tenant.name

data/app/helpers/spree/base_helper_decorator.rb

@@ -21,7 +21,7 @@ module Spree
     end
 
     def custom_product_line_item_url(line_item)
-      main_app.url_for("/a/#{line_item.internal_qr_data}")
+      main_app.url_for("/a/#{line_item.qr_data}")
     end
   end
 end

data/app/helpers/spree_cm_commissioner/admin/service_calendars_helper.rb

@@ -5,16 +5,9 @@ module SpreeCmCommissioner
         label = resource.active ? 'Active' : 'Disabled'
         btn_active_class = resource.active ? 'btn-primary' : 'btn-warning'
 
-        # Determine the correct URL based on the calendarable type
-        url = if resource.calendarable_type == 'Spree::Product'
-                update_status_admin_product_product_service_calendar_path(resource.calendarable, resource)
-              else
-                update_status_admin_vendor_vendor_service_calendar_url(resource.calendarable, resource)
-              end
-
         button_to(
           label,
-          url,
+          update_status_admin_vendor_vendor_service_calendar_url(resource.calendarable, resource),
           form: { data: { confirm: 'Are you sure?' }, class: "btn btn-sm btn-active #{btn_active_class}" },
           method: :patch
         )

data/app/interactors/spree_cm_commissioner/conversion_pre_calculator.rb

@@ -0,0 +1,64 @@
+module SpreeCmCommissioner
+  class ConversionPreCalculator < BaseInteractor
+    delegate :product_taxon, to: :context
+
+    def call
+      update_conversion
+      reassign_guests_event_id
+      refinalize_guests
+    end
+
+    def update_conversion
+      product_taxon.update(
+        total_count: total_count,
+        revenue: revenue
+      )
+    end
+
+    # reassign event_id if it's wrong.
+    def reassign_guests_event_id
+      return if event_id.blank?
+
+      SpreeCmCommissioner::Guest
+        .where(line_item_id: product_taxon.line_items.pluck(:id))
+        .where('event_id IS NULL OR event_id != ?', event_id)
+        .find_each do |guest|
+        guest.event_id = event_id
+        guest.save!
+      end
+    end
+
+    def refinalize_guests
+      return if event_id.blank?
+
+      SpreeCmCommissioner::Guest
+        .complete
+        .where(event_id: event_id)
+        .none_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
+      return nil unless product_taxon.taxon&.event?
+
+      context.event_id ||= product_taxon.taxon&.parent_id
+    end
+
+    def total_count
+      product_taxon.complete_line_items.pluck(:quantity).compact.sum
+    end
+
+    def revenue
+      product_taxon.complete_line_items.map(&:amount).compact.sum
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/enqueue_cart/add_item.rb

@@ -0,0 +1,43 @@
+module SpreeCmCommissioner
+  module EnqueueCart
+    class AddItem < BaseInteractor
+      delegate :order_id, :variant_id, :job_id, :quantity, :public_metadata, :private_metadata, :options, to: :context
+
+      def call
+        result = add_item_to_cart
+        if result.success?
+          update_status('completed')
+        else
+          update_status('failed')
+        end
+      end
+
+      def add_item_to_cart
+        Spree::Cart::AddItem.call(
+          order: order,
+          variant: variant,
+          quantity: quantity,
+          public_metadata: public_metadata,
+          private_metadata: private_metadata,
+          options: options
+        )
+      end
+
+      def update_status(status)
+        SpreeCmCommissioner::EnqueueCart::AddItemStatusMarker.call(
+          order_number: order.number,
+          job_id: job_id,
+          status: status
+        )
+      end
+
+      def order
+        @order ||= Spree::Order.find(order_id)
+      end
+
+      def variant
+        @variant ||= Spree::Variant.find(variant_id)
+      end
+    end
+  end
+end