spree_cm_commissioner 2.5.0.pre.pre7 → 2.5.0.pre.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd65c0e3f9c574eac1886f0dd7872516ee4b06ce9de12c91cd56e9101ea37914
-  data.tar.gz: 223b2e1bc19876a282cf764cbfd45da3aeb3e13b671a9bafeaf697bed5938380
+  metadata.gz: ea2a829c1d2491dbd13af86ebaa5ebe0a8731dc07b3f8ffe7349a243d2f143f1
+  data.tar.gz: 5ed54a23f9138d529fd3023daad09ee00b0dc8f51d8a827104147b2a89e37ca5
 SHA512:
-  metadata.gz: 959b4855a961019439474b8dc5fb987650e65ecb96c6e3b9a12355d3487d6d067c5824317cc825c882c858cee64c23e21695448999c3caf6b852e7c7d73fbfdc
-  data.tar.gz: c3fe124a224836d629669bf723d80162253e1e732512870d1ddfbaf8bd2c115bb081eb058e7f9dc2acc1bdbe23b425bf9ad19ad2134d31c523c11163016eee0f
+  metadata.gz: 69a48d10783b6c7bb5310653aa6237ef0f9846bec57c8b29ba167e6a6a062feb788ef62b25b48244a6063373c6bb2be4025f71f4429b1db506e73f0052ba7975
+  data.tar.gz: 686be50cd3f6c12396a0ef534011abf8e99cc15800ff5ad56a1ae25f730e92ab5c54646bf9fda6dc8141852dc0dab5852ab3ebf57e8710f829bf8d03b180dbe7

data/.bundle/config

@@ -1,3 +1,4 @@
 ---
-BUNDLE_RETRY: "3"
-BUNDLE_JOBS: "4"
+BUNDLE_PATH: "/home/runner/work/commissioner/commissioner/vendor/bundle"
+BUNDLE_DEPLOYMENT: "true"
+BUNDLE_JOBS: "2"

data/.github/workflows/test_and_build_gem.yml

@@ -5,12 +5,11 @@ on:
   pull_request:
     types:
       - opened
-      - edited
       - synchronize
       - reopened
     branches:
       - develop
-      - 3114-external-integration-milestone
+      - "*-milestone" # matches any branch with suffix *-milestone, eg. external-integration-milestone
   push:
     tags:
       - "*"
@@ -20,7 +19,7 @@ jobs:
 
     steps:
       - name: Check PR title format
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request' && !contains(github.head_ref, '-milestone')
         uses: actions/github-script@v7
         with:
           script: |
@@ -38,8 +37,7 @@ jobs:
               console.log("PR title format is correct.");
             }
       - name: Check commit messages format
-        # skip validation if the PR is from the milestone-77-scalable-design branch for temporary
-        if: github.event_name == 'pull_request' && github.head_ref != 'milestone-77-scalable-design'
+        if: github.event_name == 'pull_request' && !contains(github.head_ref, '-milestone')
         uses: actions/github-script@v7
         with:
           script: |
@@ -71,7 +69,7 @@ jobs:
               console.log("All commit messages are correctly formatted.");
             }
       - name: Check for unresolved review threads
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request' && !contains(github.head_ref, '-milestone')
         uses: actions/github-script@v7
         with:
           script: |
@@ -117,9 +115,8 @@ jobs:
               console.log("✅ All review threads are resolved.");
             }
 
-  test_and_build_gem:
+  setup:
     needs: [validate-commits]
-    # if: github.head_ref != '2572-enforce-pr-workflow' || github.base_ref != 'develop'
     runs-on: ubuntu-latest
 
     services:
@@ -152,22 +149,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # - uses: borales/actions-yarn@v2.0.0
-      #   with:
-      #     cmd: install
-
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.2.0"
-
-          # bundle-cache might cause problem when upgrading ruby. Disable it when upgrading to solve the problem.
-          # bundler-cache: true
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get -yqq install libpq-dev
-          gem install bundler
-          bundle install --jobs 4 --retry 3
+          bundler-cache: true
 
       - name: Quality
         env:
@@ -181,56 +166,137 @@ jobs:
         run: |
           bundle exec brakeman
 
-      - name: Run test
+  test:
+    needs: [setup]
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+
+    strategy:
+      fail-fast: false
+      matrix:
+        spec_group: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+
+    services:
+      db:
+        image: postgres:12
+        env:
+          POSTGRES_HOST_AUTH_METHOD: trust
+          POSTGRES_USER: myuser
+          POSTGRES_PASSWORD: mypassword
+          POSTGRES_DB: test_db
+        ports: ["5432:5432"]
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -yqq libpq-dev
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.2.0"
+          bundler-cache: true
+
+      # Cache Strategy: Speed up test runs by ~40 seconds
+      # ================================================
+      # We split test app setup into 2 parts:
+      #   1. Generate files (slow ~40s, cacheable) - rake test_app:generate
+      #   2. Setup database (fast ~20s, always run) - rake test_app:db
+      #
+      # Cache Key: test-app-{OS}-{hash of Gemfile.lock + db/migrate files}
+      #   - If Gemfile.lock or migrations change → new cache key → regenerate files
+      #   - If unchanged → restore cached spec/dummy → skip generation
+      #
+      # Example:
+      #   First run:  Generate files (40s) + Setup DB (20s) = 60s total
+      #   Cache hit:  Restore cache (5s) + Setup DB (20s) = 25s total
+      #   Savings:    ~35-40 seconds per test job (10 parallel jobs = 350-400s saved!)
+      #
+      # What's cached: spec/dummy directory containing:
+      #   - Generated Rails app files
+      #   - Spree installation files
+      #   - Extension installation files
+      #   - Config files (database.yml, routes.rb, etc.)
+      #
+      # What's NOT cached (always regenerated):
+      #   - Database itself (PostgreSQL data)
+      #   - Test results
+      #   - Coverage reports
+      - name: Cache test app files
+        uses: actions/cache@v3
+        with:
+          path: spec/dummy
+          key: test-app-${{ runner.os }}-${{ hashFiles('Gemfile.lock', 'db/migrate/*.rb') }}
+          restore-keys: |
+            test-app-${{ runner.os }}-
+
+      # Generate dummy Rails app for testing (cacheable part)
+      # This step checks if spec/dummy exists and skips generation if found
+      # Defined in: gems/spree_cm_commissioner/Rakefile (test_app:generate task)
+      - name: Generate test app files
         env:
           DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
           REDIS_URL: redis://localhost:6379/0
+        run: |
+          bundle exec rake test_app:generate
 
-        if: github.event_name == 'pull_request'
+      # Setup database (always runs, fast ~20s)
+      # Drops/creates database and runs migrations
+      # Defined in: gems/spree_cm_commissioner/Rakefile (test_app:db task)
+      - name: Setup database
+        env:
+          DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
+          REDIS_URL: redis://localhost:6379/0
         run: |
-          bundle exec rake
-
-      # 2405-build-and-publish-gem
-      # - name: Rename long migration files
-      #   env:
-      #     DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
-      #   # if: startsWith(github.ref, 'refs/tags/') # Only on tag pushes
-      #   if: github.ref == 'refs/heads/2405-build-and-publish-gem'
-
-      #   run: |
-      #     cd db/migrate
-      #     for file in *.rb; do
-      #       if [ ${#file} -gt 60 ]; then  # Adjust threshold if needed
-      #         # Extract timestamp (first 14 chars) and shorten the rest
-      #         timestamp=${file:0:14}
-      #         suffix=$(echo "$file" | sed 's/^[0-9]\{14\}_//' | sed 's/\.rb$//')
-      #         short_suffix=$(echo "$suffix" | cut -c1-40) # Limit suffix to 40 chars
-      #         new_name="${timestamp}_${short_suffix}.rb"
-      #         mv "$file" "$new_name"
-      #         echo "Renamed $file to $new_name"
-      #       fi
-      #     done
+          bundle exec rake test_app:db
 
-      # Build the gem
-      - name: Build gem
+      # Run specs in parallel groups (1-12)
+      # Each group runs ~1/12th of total spec files
+      # Script: bin/run_spec_group shows which files are in each group
+      - name: Run test (Group ${{ matrix.spec_group }}/12)
         env:
           DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
+          REDIS_URL: redis://localhost:6379/0
+        run: |
+          bin/run_spec_group ${{ matrix.spec_group }} 12
+
+  build_and_publish:
+    needs: [setup]
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
+
+    steps:
+      - uses: actions/checkout@v3
 
-        # if: startsWith(github.ref, 'refs/tags/') # Only on tag pushes
-        if: |
-          startsWith(github.ref, 'refs/tags/')
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.2.0"
+          bundler-cache: true
+
+      # Build the gem
+      - name: Build gem
         run: |
           gem build *.gemspec
 
       # Publish the gem
       - name: Publish gem
-        env:
-          DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
-
-        # if: startsWith(github.ref, 'refs/tags/') # Only on tag pushes
-        # (github.event_name == 'push' && github.ref == 'refs/heads/2405-build-and-publish-gem')
-        if: |
-          startsWith(github.ref, 'refs/tags/')
         run: |
           mkdir -p ~/.gem
           echo ":rubygems_api_key: ${{ secrets.RUBYGEMS_API_KEY }}" > ~/.gem/credentials

data/Gemfile.lock

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

data/Rakefile

@@ -17,34 +17,60 @@ end
 # Copied from:
 # spree_core:lib/spree/testing_support/common_rake.rb
 # But refactored to skip frontend & backend setup.
+
+namespace :test_app do
+  desc 'Generate dummy app files (cacheable)'
+  task :generate do
+    require 'spree_cm_commissioner'
+    require "generators/spree_cm_commissioner/install/install_generator"
+
+    Rails.env = ENV['RAILS_ENV'] = 'test'
+
+    # Skip if already generated
+    if Dir.exist?('spec/dummy') && File.exist?('spec/dummy/config/database.yml')
+      puts '✓ Test app files already exist, skipping generation...'
+    else
+      puts 'Generating test app files...'
+      Spree::DummyGeneratorHelper.inject_extension_requirements = true
+      Spree::DummyGenerator.start ["--lib_name=spree_cm_commissioner", '--quiet']
+      Spree::InstallGenerator.start [
+        "--lib_name=spree_cm_commissioner",
+        '--auto-accept',
+        '--migrate=false',
+        '--seed=false',
+        '--sample=false',
+        '--quiet',
+        '--copy_storefront=false',
+        "--install_storefront=false",
+        "--install_admin=false",
+        "--user_class=Spree::User"
+      ]
+
+      puts 'Generating dummy model...'
+      Spree::DummyModelGenerator.start
+
+      puts 'Running extension installation generator...'
+      SpreeCmCommissioner::Generators::InstallGenerator.start(['--auto-run-migrations'])
+
+      puts '✓ Test app files generated'
+    end
+  end
+
+  desc 'Setup database'
+  task :db do
+    Rails.env = ENV['RAILS_ENV'] = 'test'
+
+    puts 'Setting up dummy database...'
+    Dir.chdir('spec/dummy') do
+      system('RAILS_ENV=test bundle exec rake db:drop db:create')
+      system('RAILS_ENV=test bundle exec rake db:migrate')
+      puts '✓ Database setup complete'
+    end
+  end
+end
+
 desc 'Generates a dummy app for testing'
-task :test_app do |_t, args|
-  require 'spree_cm_commissioner'
-  require "generators/spree_cm_commissioner/install/install_generator"
-
-  Rails.env = ENV['RAILS_ENV'] = 'test'
-
-  Spree::DummyGeneratorHelper.inject_extension_requirements = true
-  Spree::DummyGenerator.start ["--lib_name=spree_cm_commissioner", '--quiet']
-  Spree::InstallGenerator.start [
-    "--lib_name=spree_cm_commissioner",
-    '--auto-accept',
-    '--migrate=false',
-    '--seed=false',
-    '--sample=false',
-    '--quiet',
-    '--copy_storefront=false',
-    "--install_storefront=false",
-    "--install_admin=false",
-    "--user_class=Spree::User"
-  ]
-
-  puts 'Setting up dummy database...'
-  system('bin/rails db:environment:set RAILS_ENV=test')
-  system('bundle exec rake db:drop db:create')
-  Spree::DummyModelGenerator.start
-  system('bundle exec rake db:migrate')
-
-  puts 'Running extension installation generator...'
-  SpreeCmCommissioner::Generators::InstallGenerator.start(['--auto-run-migrations'])
+task :test_app do
+  Rake::Task['test_app:generate'].invoke
+  Rake::Task['test_app:db'].invoke
 end

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

@@ -61,11 +61,11 @@ module Spree
           api_patterns = api_patterns_map[model]
 
           if api_patterns.is_a?(Array)
-            api_patterns.each { |pattern| SpreeCmCommissioner::InvalidateCacheRequestJob.perform_later(pattern) }
+            api_patterns.each { |pattern| SpreeCmCommissioner::InvalidateCacheRequestJob.perform_later(pattern: pattern) }
           elsif api_patterns.is_a?(String)
-            SpreeCmCommissioner::InvalidateCacheRequestJob.perform_later(api_patterns)
+            SpreeCmCommissioner::InvalidateCacheRequestJob.perform_later(pattern: api_patterns)
           elsif params[:api_pattern].present?
-            SpreeCmCommissioner::InvalidateCacheRequestJob.perform_later(params[:api_pattern])
+            SpreeCmCommissioner::InvalidateCacheRequestJob.perform_later(pattern: params[:api_pattern])
           end
         end
         redirect_back fallback_location: admin_root_path

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

@@ -17,7 +17,12 @@ module Spree
         import_order = build_import_order(name, imported_file)
 
         if import_order.save
-          SpreeCmCommissioner::ImportOrderJob.perform_later(import_order.id, spree_current_user.id, import_order.import_type)
+          SpreeCmCommissioner::ImportOrderJob.perform_later(
+            import_order_id: import_order.id,
+            import_by_user_id: spree_current_user.id,
+
+            import_type: import_order.import_type
+          )
           flash[:success] = I18n.t('import_orders.success_message')
         else
           flash[:error] = I18n.t('import_orders.error_message')

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

@@ -5,7 +5,7 @@ module Spree
 
       def recalculate_conversions
         @taxon.products.each do |product|
-          SpreeCmCommissioner::ConversionPreCalculatorJob.perform_later(product.id)
+          SpreeCmCommissioner::ConversionPreCalculatorJob.perform_later(product_id: product.id)
         end
 
         flash[:success] = flash_message_for(@taxon, :successfully_updated)

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

@@ -5,7 +5,7 @@ module Spree
         customer_notification_id = params[:notification_id]
         user_ids = params[:send_all] == 'true' ? nil : params[:user_ids]
 
-        SpreeCmCommissioner::CustomerNotificationSenderJob.perform_later(customer_notification_id, user_ids)
+        SpreeCmCommissioner::CustomerNotificationSenderJob.perform_later(customer_notification_id: customer_notification_id, user_ids: user_ids)
 
         redirect_to admin_customer_notifications_path
       end

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

@@ -19,7 +19,8 @@ module Spree
           # override
           def collection
             @collection ||= collection_finder.new.execute(
-              route_type: params[:route_type]
+              route_type: params[:route_type],
+              query: params[:query]
             )
           end
 
@@ -51,6 +52,11 @@ module Spree
             )
           end
 
+          # override
+          def required_schema
+            SpreeCmCommissioner::PopularRoutePlacesRequestSchema
+          end
+
           def include_vendors?
             resource_includes.include?(:vendors) || false
           end

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

@@ -19,12 +19,12 @@ module Spree
               end
 
               job = SpreeCmCommissioner::EnqueueCart::AddItemJob.perform_later(
-                spree_current_order.id,
-                @variant.id,
-                add_item_params[:quantity],
-                add_item_params[:public_metadata],
-                add_item_params[:private_metadata],
-                add_item_params[:options]
+                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

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

@@ -3,22 +3,22 @@
 # GET /api/v2/storefront/route_places
 #
 # Finds places (origins or destinations) that are connected to a given place through existing routes.
-# Optionally filters results by keyword or route_type. Supports two modes:
+# Optionally filters results by query or route_type. Supports two modes:
 #
 # Usage 1: Connected places (requires place_id)
 #   - Finds places connected to a specific place via routes
 #   - Returns origins/destinations that have routes with the specified place
 #
-# Usage 2: Keyword search (requires query, place_id optional)
-#   - Searches all route places by keyword
-#   - Returns all origins/destinations matching the keyword
+# Usage 2: query search (requires query, place_id optional)
+#   - Searches all route places by query
+#   - Returns all origins/destinations matching the query
 #
 # Query Parameters:
 #   - place_type: [String] Required. Type of route place: 'origin' or 'destination'
 #     * 'origin': returns origins that have routes TO the specified place (if place_id provided)
 #     * 'destination': returns destinations that have routes FROM the specified place (if place_id provided)
 #   - place_id: [Integer] Optional. The place ID to find connected places for
-#   - query: [String] Optional. Keyword to filter place names (case-insensitive)
+#   - query: [String] Optional. query to filter place names (case-insensitive)
 #   - include: Optional comma-separated list (e.g., 'vendors,nearby_places')
 #
 # Response: Collection of places serialized with PlaceSerializer
@@ -27,15 +27,15 @@
 #   - Returns empty collection if place_type is invalid
 #   - If place_id provided: returns places connected to that place
 #   - If place_id blank: returns all origins/destinations
-#   - Filters results by keyword or route_type if provided
+#   - Filters results by query or route_type if provided
 #
 # @example Mode 1: Find destinations connected to origin place ID 123
 #   GET /api/v2/storefront/route_places?place_id=123&place_type=destination
 #
-# @example Mode 2: Search all destination places by keyword
+# @example Mode 2: Search all destination places by query
 #   GET /api/v2/storefront/route_places?place_type=destination&query=Phnom
 #
-# @example Combined: Find origins connected to place 456, filtered by keyword
+# @example Combined: Find origins connected to place 456, filtered by query
 #   GET /api/v2/storefront/route_places?place_id=456&place_type=origin&query=Siem
 module Spree
   module Api
@@ -49,7 +49,7 @@ module Spree
             @collection ||= collection_finder.new(
               place_type: params[:place_type],
               place_id: params[:place_id],
-              keyword: params[:query],
+              query: params[:query],
               route_type: params[:route_type]
             ).execute
           end

data/app/finders/spree_cm_commissioner/places/find_with_route.rb

@@ -2,14 +2,14 @@
 #
 # @param place_type [String] Required. 'origin' or 'destination'
 # @param place_id [Integer] Optional. Filter by connected place ID
-# @param keyword [String] Optional. Filter by place name (case-insensitive)
+# @param query [String] Optional. Filter by place name (case-insensitive)
 # @param route_type [Symbol, String] Optional. Filter by route type from associated trips (e.g., :ferry, :bus)
 #
 # @return [ActiveRecord::Relation<SpreeCmCommissioner::Place>]
 #
 # Modes:
 #   - place_id only: returns connected places (origins TO or destinations FROM given place)
-#   - keyword only: filters by name
+#   - query only: filters by name
 #   - route_type only: filters by trip route types on those routes
 #   - combinations: connected places filtered by name and/or route type
 #   - neither: all origins/destinations in routes
@@ -17,17 +17,17 @@
 # @example Origins with ferry trips to place 123
 #   FindWithRoute.new(place_type: 'origin', place_id: 123, route_type: :ferry).execute
 #
-# @example Destinations filtered by keyword and route type
-#   FindWithRoute.new(place_type: 'destination', keyword: 'Phnom', route_type: :bus).execute
+# @example Destinations filtered by query and route type
+#   FindWithRoute.new(place_type: 'destination', query: 'Phnom', route_type: :bus).execute
 module SpreeCmCommissioner
   module Places
     class FindWithRoute
-      attr_reader :place_type, :place_id, :keyword, :route_type
+      attr_reader :place_type, :place_id, :query, :route_type
 
-      def initialize(place_type:, place_id: nil, keyword: nil, route_type: nil)
+      def initialize(place_type:, place_id: nil, query: nil, route_type: nil)
         @place_type = place_type
         @place_id = place_id
-        @keyword = keyword
+        @query = query
         @route_type = route_type
       end
 
@@ -36,7 +36,7 @@ module SpreeCmCommissioner
         return SpreeCmCommissioner::Place.none if place_id.present? && !SpreeCmCommissioner::Place.exists?(place_id)
 
         result = scope
-        result = apply_keyword_filter(result) if keyword.present?
+        result = apply_query_filter(result) if query.present?
         result = apply_route_type_filter(result) if route_type.present?
         result
       end
@@ -57,8 +57,8 @@ module SpreeCmCommissioner
         end
       end
 
-      def apply_keyword_filter(result)
-        result.where('cm_places.name ILIKE ?', "%#{keyword}%")
+      def apply_query_filter(result)
+        result.where('cm_places.name ILIKE ?', "%#{query}%")
       end
 
       def apply_route_type_filter(result)

data/app/finders/spree_cm_commissioner/routes/find_popular.rb

@@ -24,26 +24,22 @@
 module SpreeCmCommissioner
   module Routes
     class FindPopular
-      def execute(route_type: nil)
-        scope(route_type: route_type)
+      def execute(route_type: nil, query: nil)
+        scope(route_type: route_type, query: query)
       end
 
       private
 
-      def scope(route_type: nil)
-        result = SpreeCmCommissioner::Route
-                 .includes(:origin_place, :destination_place)
+      def scope(route_type:, query:)
+        includes_associations = %i[origin_place destination_place]
+        includes_associations << :trips if route_type.present?
+        result = SpreeCmCommissioner::Route.includes(*includes_associations)
 
-        if route_type.present?
-          # Filter routes that have trips with the specified route_type
-          route_scope = SpreeCmCommissioner::Route
-                        .joins(:trips)
-                        .where(cm_trips: { route_type: route_type.to_sym })
-          result = result.where(id: route_scope.select(:id))
-        end
+        result = result.joins(:trips).where(cm_trips: { route_type: route_type.to_sym }) if route_type.present?
 
-        result.order(Arel.sql('COALESCE(fulfilled_order_count, 0) DESC'))
-              .order(Arel.sql('COALESCE(order_count, 0) DESC'))
+        result = result.where('cm_routes.route_name ILIKE ?', "%#{query}%") if query.present?
+
+        result.distinct.order(fulfilled_order_count: :desc, order_count: :desc)
       end
     end
   end

data/app/interactors/spree_cm_commissioner/create_event.rb

@@ -94,7 +94,7 @@ module SpreeCmCommissioner
     end
 
     def generate_reports
-      SpreeCmCommissioner::ReportsAssignerJob.perform_later(@parent_taxon.id, @parent_taxon.class.to_s)
+      SpreeCmCommissioner::ReportsAssignerJob.perform_later(queryable_id: @parent_taxon.id, queryable_type: @parent_taxon.class.to_s)
     end
   end
 end

data/app/interactors/spree_cm_commissioner/customer_notification_cron_executor.rb

@@ -11,7 +11,7 @@ module SpreeCmCommissioner
     end
 
     def enqueue_customer_notification_alert(customer_notification)
-      SpreeCmCommissioner::CustomerNotificationSenderJob.perform_later(customer_notification.id)
+      SpreeCmCommissioner::CustomerNotificationSenderJob.perform_later(customer_notification_id: customer_notification.id)
     end
   end
 end

data/app/interactors/spree_cm_commissioner/stock/stock_movement_creator.rb

@@ -23,8 +23,9 @@ module SpreeCmCommissioner
       private
 
       def adjust_inventory_items_async(variant_id, quantity)
-        CmAppLogger.log(label: "#{self.class.name}#adjust_inventory_items_async", data: { variant_id: variant_id, quantity: quantity }) do
-          SpreeCmCommissioner::Stock::InventoryItemsAdjusterJob.perform_later(variant_id: variant_id, quantity: quantity)
+        args = { variant_id: variant_id, quantity: quantity }
+        CmAppLogger.log(label: "#{self.class.name}#adjust_inventory_items_async", data: args) do
+          SpreeCmCommissioner::Stock::InventoryItemsAdjusterJob.perform_later(**args)
         end
       end
     end

data/app/jobs/spree_cm_commissioner/conversion_pre_calculator_job.rb

@@ -2,8 +2,8 @@ module SpreeCmCommissioner
   class ConversionPreCalculatorJob < ApplicationUniqueJob
     queue_as :default
 
-    def perform(product_id)
-      product = Spree::Product.find(product_id)
+    def perform(options = {})
+      product = Spree::Product.find(options[:product_id])
       product.classification_ids.each do |classification_id|
         SpreeCmCommissioner::ConversionPreCalculator.call(product_taxon: Spree::Classification.find(classification_id))
       end