spree_cm_commissioner 2.5.1 → 2.5.2.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b7e70b6ad87db5a4bd6b3879754f7ce8a753e1323d07ac754adea1426ef74b4
-  data.tar.gz: 699aa89f466074b9d86b8b0ddf39a7a8bf41f6edb4dda640f647dd33651bc9eb
+  metadata.gz: dbcd427457c152b80d8c5aa1f87a1633e29ba0c39b99c3ee856f88187e54ff6e
+  data.tar.gz: 372de4f3e2a8ab6df9fb2ba94287a5ae2f676633808c02593685ae93f5b201a8
 SHA512:
-  metadata.gz: 9f60f4b8646f3537f616fe2d15b4f49b0bfa335acd1f61d4a97c6d25dc4a891ced787c0d2983f0dc327b2a125f643adebdc1a9ce59025436d74c507761a773f1
-  data.tar.gz: 18584fa23c8784b390a5b076fd7a855fb101db7c6bd5ea60159e6fdf6072fcac9441a9daddb2f9bc3f89351faf03b2792b6ef7864b63b081429752ce98d1f11a
+  metadata.gz: 7d944b5af7b8fc624cce7d0ce5428060b7094429eb1619147790d606102d13dbf88702686d4723208feb531339eac39d87c9011320bb8f18b897a12267e699a3
+  data.tar.gz: 5a2896cb596c6bf3ed41c2a860e794ced42c3a317f7af71de69873fec33869a146cbc2cc4953eddce256d7a36d2a45f5b8e1319bc8d0836692b7a1a37dc1e397

data/.github/workflows/test_and_build_gem.yml

@@ -45,7 +45,7 @@ jobs:
             const commits_url = pr.commits_url;
 
             const commits = await github.request(commits_url);
-            const pattern = /^Close\s+#\d+\s.+/;
+            const pattern = /^(Close flow|Close\s+#\d+\s.+|Merge.*)/;
 
             let invalidCommits = [];
 
@@ -63,7 +63,7 @@ jobs:
               core.setFailed(
                 `The following commit messages are not in the correct format:\n\n${invalidCommits.join(
                   '\n'
-                )}\n\nEach commit message must start with "Close #<issue_number> <message>"`
+                )}\n\nEach commit message must start with "Close #<issue_number> <message>" or "Merge pull request #<number>"`
               );
             } else {
               console.log("All commit messages are correctly formatted.");

data/Gemfile.lock

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

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

@@ -3,79 +3,59 @@ module Spree
     class InventoryItemsController < StockManagementsController
       before_action :load_parent
 
-      # GET /products/:slug/variants/:variant_id/inventory_items/:id
-      def show
-        @inventory_item = @product.inventory_items.find(params[:id])
-        @default_prices = @inventory_item.variant.prices.to_a.index_by(&:currency)
-
-        @prices = @inventory_item.prices.to_a
-        supported_currencies_for_all_stores.each do |currency|
-          @prices << @inventory_item.prices.new(currency: currency) if @prices.none? { |price| price.currency == currency }
-        end
+      # GET /products/:slug/inventory_items/prices?inventory_ids=1,2,3
+      def prices
+        inventory_ids = params[:inventory_ids].to_s.split(',').map(&:to_i)
+        @inventory_items = @product.inventory_items.where(id: inventory_ids)
+      end
 
-        @cached_inventory_item = ::SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new([@inventory_item])
-                                                                                               .call
-                                                                                               .index_by(&:inventory_item_id)[@inventory_item.id]
+      # GET /products/:slug/inventory_items/stocks?inventory_ids=1,2,3
+      def stocks
+        inventory_ids = params[:inventory_ids].to_s.split(',').map(&:to_i)
+        @inventory_items = @product.inventory_items.where(id: inventory_ids)
       end
 
-      # POST /products/:slug/variants/:variant_id/inventory_items
-      def create
-        variant = @product.variants.find(params[:variant_id])
-        inventory_item = variant.create_default_non_permanent_inventory_item!
+      # PATCH /products/:slug/inventory_items/bulk_update_prices
+      def bulk_update_prices # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+        inventory_ids = params[:inventory_ids].to_s.split(',').map(&:to_i)
+        inventory_items = @product.inventory_items.where(id: inventory_ids)
 
-        if inventory_item.present?
-          result = SpreeCmCommissioner::Stock::InventoryItemResetter.call(inventory_item: inventory_item)
+        inventory_items.each do |inventory_item|
+          params[:prices]&.values&.each do |price_params|
+            next if price_params[:price].empty?
 
-          if result.success?
-            flash[:success] = flash_message_for(result.inventory_item, :successfully_created)
-          else
-            flash[:error] = result.message
+            price = inventory_item.prices.find_or_initialize_by(currency: price_params[:currency])
+            price.price = price_params[:price]
+            price.compare_at_price = price_params[:compare_at_price].empty? ? nil : price_params[:compare_at_price]
+            price.variant_id = inventory_item.variant_id
+            price.save! if (price.new_record? && price.price) || (!price.new_record? && price.changed?)
           end
         end
 
+        flash[:success] = "Successfully updated prices for #{inventory_items.count} items"
         redirect_back fallback_location: admin_product_stock_managements_path(@product)
       end
 
-      # PATCH /products/:slug/variants/:variant_id/inventory_items/:id/reset
-      def reset
-        inventory_item = @product.inventory_items.find(params[:id])
-        result = SpreeCmCommissioner::Stock::InventoryItemResetter.call(inventory_item: inventory_item)
-
-        if result.success?
-          flash[:success] = flash_message_for(result.inventory_item, :successfully_updated)
-        else
-          flash[:error] = result.message
-        end
-
-        redirect_back fallback_location: admin_product_stock_managements_path(@product)
-      end
-
-      # PATCH /products/:slug/variants/:variant_id/inventory_items/:id/update_prices
-      def update_prices
-        inventory_item = @product.inventory_items.find(params[:id])
+      # PATCH /products/:slug/inventory_items/bulk_update_stocks
+      def bulk_update_stocks
+        inventory_ids = params[:inventory_ids].to_s.split(',').map(&:to_i)
+        inventory_items = @product.inventory_items.where(id: inventory_ids)
+        target_quantity = params[:quantity].to_i
 
-        params[:prices]&.values&.each do |price_params|
-          price = inventory_item.prices.find_or_initialize_by(currency: price_params[:currency])
-          price.price = price_params[:price].empty? ? nil : price_params[:price]
-          price.compare_at_price = price_params[:compare_at_price].empty? ? nil : price_params[:compare_at_price]
-          price.variant_id = inventory_item.variant_id
-          price.save! if (price.new_record? && price.price) || (!price.new_record? && price.changed?)
+        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
 
-        flash[:success] = flash_message_for(inventory_item, :successfully_updated)
-        redirect_back fallback_location: admin_product_stock_managements_path(@product)
-      end
-
-      # PATCH /products/:slug/variants/:variant_id/inventory_items/:id/delete_prices
-      def delete_prices
-        inventory_item = @product.inventory_items.find(params[:id])
+        inventory_items.each do |inventory_item|
+          # Calculate the difference between target and current quantity
+          quantity_change = target_quantity - inventory_item.quantity_available
 
-        if inventory_item.prices.destroy_all
-          flash[:success] = flash_message_for(inventory_item, :successfully_removed)
-        else
-          flash[:error] = inventory_item.errors.full_messages.join(', ')
+          # Use adjust_quantity! to update max_capacity, quantity_available, and sync to Redis
+          inventory_item.adjust_quantity!(quantity_change) if quantity_change != 0
         end
 
+        flash[:success] = "Successfully updated stocks for #{inventory_items.count} items"
         redirect_back fallback_location: admin_product_stock_managements_path(@product)
       end
     end

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

@@ -12,7 +12,7 @@ module Spree
       end
 
       def index
-        @variants = @product.variants.includes(:images, stock_items: :stock_location, option_values: :option_type)
+        @variants = @product.variants.includes(:images, :default_price, stock_items: :stock_location, option_values: :option_type)
         @variants = [@product.master] if @variants.empty?
         @stock_locations = (@variants.flat_map(&:stock_locations) + @product.vendor.stock_locations).uniq
 
@@ -36,14 +36,25 @@ module Spree
         redirect_back fallback_location: admin_product_stock_managements_path(@product)
       end
 
-      # GET /products/:slug/stock_managements/calendar?year=
+      # GET /products/:slug/stock_managements/calendar?year=&selected_variant_id=
       def calendar
         @year = params[:year].present? ? params[:year].to_i : Time.zone.today.year
 
         from_date = Date.new(@year, 1, 1).beginning_of_year
         to_date = Date.new(@year, 1, 1).end_of_year
 
-        @inventory_items = @product.inventory_items.includes(:variant, :prices).where(inventory_date: from_date..to_date).to_a
+        @variants = @product.variants
+        @inventory_items = if params[:selected_variant_id].present?
+                             @product.inventory_items.includes(:variant, :prices).where(
+                               inventory_date: from_date..to_date,
+                               variant_id: params[:selected_variant_id]
+                             ).to_a
+                           else
+                             @product.inventory_items.includes(:variant, :prices).where(
+                               inventory_date: from_date..to_date
+                             ).to_a
+                           end
+
         @cached_inventory_items = ::SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new(@inventory_items)
                                                                                                 .call
                                                                                                 .index_by(&:inventory_item_id)

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

@@ -31,7 +31,7 @@ module Spree
 
           # override
           def collection_finder
-            SpreeCmCommissioner::Routes::FindPopular
+            SpreeCmCommissioner::RouteMetrics::FindPopular
           end
 
           # override
@@ -41,7 +41,7 @@ module Spree
 
           # override
           def resource_serializer
-            SpreeCmCommissioner::V2::Storefront::RouteSerializer
+            SpreeCmCommissioner::V2::Storefront::RouteMetricSerializer
           end
 
           # override

data/app/controllers/spree/api/v2/storefront/transit/draft_orders_controller.rb

@@ -15,7 +15,7 @@ module Spree
               @outbound_legs = params[:outbound_legs].is_a?(Array) && params[:outbound_legs].any? ? build_legs(:outbound, params[:outbound_legs]) : []
               @inbound_legs  = params[:inbound_legs].is_a?(Array) && params[:inbound_legs].any? ? build_legs(:inbound, params[:inbound_legs]) : []
 
-              context = SpreeCmCommissioner::Transit::DraftOrderCreator.call(
+              result = SpreeCmCommissioner::TransitOrder::Create.call(
                 outbound_date: params[:outbound_date]&.to_date,
                 inbound_date: params[:inbound_date]&.to_date,
                 outbound_legs: @outbound_legs,
@@ -23,10 +23,10 @@ module Spree
                 user: spree_current_user
               )
 
-              if context.success?
-                render_serialized_payload { serialize_resource(context.order) }
+              if result.success?
+                render_serialized_payload { serialize_resource(result.value[:order]) }
               else
-                render_error_payload(context.message)
+                render_error_payload(result.error)
               end
             end
 

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

@@ -0,0 +1,60 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class PopularRoutePlacesController < BaseController
+          private
+
+          # override
+          def collection
+            @collection ||= collection_finder.new(
+              tenant: @tenant,
+              route_type: params[:route_type]
+            ).execute
+          end
+
+          # override
+          def default_resource_includes
+            %w[origin_place destination_place]
+          end
+
+          # override
+          def collection_finder
+            SpreeCmCommissioner::Routes::FindPopular
+          end
+
+          # override
+          def collection_serializer
+            resource_serializer
+          end
+
+          # override
+          def resource_serializer
+            SpreeCmCommissioner::V2::Storefront::RouteSerializer
+          end
+
+          # override
+          def serializer_params
+            super.merge(
+              include_vendors: include_vendors?,
+              include_nearby_places: include_nearby_places?
+            )
+          end
+
+          # override
+          def required_schema
+            SpreeCmCommissioner::PopularRoutePlacesRequestSchema
+          end
+
+          def include_vendors?
+            resource_includes.include?(:vendors) || false
+          end
+
+          def include_nearby_places?
+            resource_includes.include?(:nearby_places) || false
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class RoutesController < BaseController
+          private
+
+          # override
+          def collection
+            @collection ||= collection_finder.new(
+              tenant: @tenant,
+              params: params
+            ).execute
+          end
+
+          # override
+          def collection_finder
+            SpreeCmCommissioner::Routes::Find
+          end
+
+          # override
+          def collection_serializer
+            SpreeCmCommissioner::V2::Storefront::RouteSerializer
+          end
+
+          # override
+          def serializer_params
+            super.merge(
+              include_vendors: include_vendors?,
+              include_nearby_places: include_nearby_places?
+            )
+          end
+
+          # override
+          def required_schema
+            SpreeCmCommissioner::PopularRoutePlacesRequestSchema
+          end
+
+          def include_vendors?
+            resource_includes.include?(:vendors) || false
+          end
+
+          def include_nearby_places?
+            resource_includes.include?(:nearby_places) || false
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/transit/draft_orders_controller.rb

@@ -0,0 +1,46 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        module Transit
+          class DraftOrdersController < BaseController
+            # Creates a draft transit order for tenant.
+            # Endpoint: POST /api/v2/tenant/transit/draft_orders
+            # Params:
+            # - outbound_date: Date of outbound transit (optional)
+            # - inbound_date: Date of inbound transit (optional)
+            # - outbound_legs: Array of outbound leg details (required)
+            # - inbound_legs: Array of inbound leg details (optional)
+            def create
+              @outbound_legs = params[:outbound_legs].is_a?(Array) && params[:outbound_legs].any? ? build_legs(:outbound, params[:outbound_legs]) : []
+              @inbound_legs  = params[:inbound_legs].is_a?(Array) && params[:inbound_legs].any? ? build_legs(:inbound, params[:inbound_legs]) : []
+
+              result = SpreeCmCommissioner::TransitOrder::Create.call(
+                outbound_date: params[:outbound_date]&.to_date,
+                inbound_date: params[:inbound_date]&.to_date,
+                outbound_legs: @outbound_legs,
+                inbound_legs: @inbound_legs,
+                user: spree_current_user
+              )
+
+              if result.success?
+                render_serialized_payload { serialize_resource(result.value[:order]) }
+              else
+                render_error_payload(result.error)
+              end
+            end
+
+            def build_legs(direction, legs_params)
+              SpreeCmCommissioner::Transit::LegsBuilderService.new(direction: direction, legs_params: legs_params).call
+            end
+
+            # override
+            def resource_serializer
+              Spree::V2::Tenant::TransitCartSerializer
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/transit/trips_controller.rb

@@ -48,13 +48,13 @@ module Spree
         boarding_points_attributes = (cm_params.delete('boarding_points') || []).compact_blank
                                                                                 .map do |point_id|
           trip_stop = trip_stops.delete(point_id.to_i)
-          { stop_id: point_id, stop_type: 'boarding', id: trip_stop.try(:id) }
+          { stop_id: point_id, allow_boarding: true, id: trip_stop.try(:id) }
         end
 
         drop_off_points_attributes = (cm_params.delete('drop_off_points') || []).compact_blank
                                                                                 .map do |point_id|
           trip_stop = trip_stops.delete(point_id.to_i)
-          { stop_id: point_id, stop_type: 'drop_off', id: trip_stop.try(:id) }
+          { stop_id: point_id, allow_drop_off: true, id: trip_stop.try(:id) }
         end
 
         trip_stops.each_value do |trip_stop|
@@ -74,7 +74,7 @@ module Spree
           :origin_id, :destination_id, :vehicle_id, :hours, :minutes, :seconds,
           'departure_time(1i)', 'departure_time(2i)', 'departure_time(3i)',
           'departure_time(4i)', 'departure_time(5i)', :product_id,
-          trip_stops_attributes: %i[stop_id stop_type _destroy id]
+          trip_stops_attributes: %i[stop_id allow_boarding allow_drop_off _destroy id]
         )
       end
 

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

@@ -1,20 +1,20 @@
-# Finds places connected via routes with optional filtering.
+# Finds places connected via route metrics with optional filtering.
 #
 # @param place_type [String] Required. 'origin' or 'destination'
 # @param place_id [Integer] Optional. Filter by connected place ID
 # @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)
+# @param route_type [Symbol, String] Optional. Filter by route type from route metrics (e.g., :ferry, :bus)
 #
 # @return [ActiveRecord::Relation<SpreeCmCommissioner::Place>]
 #
 # Modes:
 #   - place_id only: returns connected places (origins TO or destinations FROM given place)
 #   - query only: filters by name
-#   - route_type only: filters by trip route types on those routes
+#   - route_type only: filters by route type on route metrics
 #   - combinations: connected places filtered by name and/or route type
-#   - neither: all origins/destinations in routes
+#   - neither: all origins/destinations in route metrics
 #
-# @example Origins with ferry trips to place 123
+# @example Origins with ferry route metrics to place 123
 #   FindWithRoute.new(place_type: 'origin', place_id: 123, route_type: :ferry).execute
 #
 # @example Destinations filtered by query and route type
@@ -46,14 +46,14 @@ module SpreeCmCommissioner
       def scope
         return SpreeCmCommissioner::Place.none unless valid_place_type?
 
-        base_scope = origin? ? SpreeCmCommissioner::Place.with_routes_as_origin : SpreeCmCommissioner::Place.with_routes_as_destination
+        base_scope = origin? ? SpreeCmCommissioner::Place.with_route_metrics_as_origin : SpreeCmCommissioner::Place.with_route_metrics_as_destination
 
         return base_scope if place_id.blank?
 
         if origin?
-          base_scope.where(routes_as_origin: { destination_place_id: place_id })
+          base_scope.where(route_metrics_as_origin: { destination_place_id: place_id })
         else
-          base_scope.where(routes_as_destination: { origin_place_id: place_id })
+          base_scope.where(route_metrics_as_destination: { origin_place_id: place_id })
         end
       end
 
@@ -62,10 +62,10 @@ module SpreeCmCommissioner
       end
 
       def apply_route_type_filter(result)
-        trips_association = origin? ? :trips_as_origin : :trips_as_destination
-        result.joins(trips_association)
-              .where(cm_trips: { route_type: route_type.to_sym })
-              .distinct
+        # Use the association name as the table alias in the WHERE clause
+        # This works whether the association is already joined or not
+        association_name = origin? ? :route_metrics_as_origin : :route_metrics_as_destination
+        result.where(association_name => { route_type: route_type.to_sym })
       end
 
       def origin?

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

@@ -0,0 +1,44 @@
+# Finds route metrics ordered by popularity based on order metrics.
+#
+# Route metrics are sorted by:
+# 1. fulfilled_order_count (completed orders) - DESC
+# 2. order_count (total orders including incomplete) - DESC
+#
+# @param route_type [Symbol, String] Optional. Filter by route type (e.g., :ferry, :bus)
+#
+# @return [ActiveRecord::Relation<SpreeCmCommissioner::RouteMetric>] Route metrics with origin and destination places loaded,
+#   ordered from most to least popular
+#
+# @example Get all popular route metrics
+#   finder = SpreeCmCommissioner::RouteMetrics::FindPopular.new
+#   finder.execute # => Returns all route metrics sorted by fulfillment and order counts
+#
+# @example Get popular ferry route metrics
+#   finder = SpreeCmCommissioner::RouteMetrics::FindPopular.new
+#   finder.execute(route_type: :ferry) # => Returns ferry route metrics sorted by popularity
+#
+# @example Get popular bus route metrics
+#   finder = SpreeCmCommissioner::RouteMetrics::FindPopular.new
+#   finder.execute(route_type: :bus) # => Returns bus route metrics sorted by popularity
+
+module SpreeCmCommissioner
+  module RouteMetrics
+    class FindPopular
+      def execute(route_type: nil, query: nil)
+        scope(route_type: route_type, query: query)
+      end
+
+      private
+
+      def scope(route_type:, query:)
+        result = SpreeCmCommissioner::RouteMetric.all
+
+        result = result.where(route_type: route_type.to_sym) if route_type.present?
+        result = result.where('cm_route_metrics.route_name ILIKE ?', "%#{query}%") if query.present?
+
+        result.includes(:origin_place, :destination_place)
+              .order(fulfilled_order_count: :desc, order_count: :desc)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,94 @@
+# Finder for Route records with common filtering options.
+# Usage:
+#   finder = SpreeCmCommissioner::Routes::Find.new(vendor: vendor, params: params)
+#   finder = SpreeCmCommissioner::Routes::Find.new(tenant: tenant, params: params)
+#   finder.execute
+#   returns ActiveRecord::Relation of SpreeCmCommissioner::Route
+
+module SpreeCmCommissioner
+  module Routes
+    class Find
+      def initialize(vendor: nil, tenant: nil, params: {})
+        @vendor = vendor
+        @tenant = tenant
+        @params = params || {}
+
+        @ids = Array(@params[:ids]).map(&:to_s)
+        @name = @params.dig(:filter, :name) || @params[:name]
+        @route_type = @params.dig(:filter, :route_type) || @params[:route_type]
+        @origin_place_id = @params.dig(:filter, :origin_place_id)
+        @destination_place_id = @params.dig(:filter, :destination_place_id)
+        @query = @params.dig(:filter, :query) || @params[:query]
+        @limit = (@params[:limit] || @params.dig(:page, :limit) || 50).to_i
+        @order = @params[:order] || 'created_at DESC'
+      end
+
+      def execute
+        results = base_scope
+        results = by_ids(results) if ids?
+        results = by_name(results) if name?
+        results = by_route_type(results) if route_type?
+        results = by_origin_place(results) if origin_place_id.present?
+        results = by_destination_place(results) if destination_place_id.present?
+        results = by_query(results) if query?
+
+        results.order(order_clause).limit(limit)
+      end
+
+      private
+
+      attr_reader :vendor, :tenant, :params, :ids, :name, :route_type, :origin_place_id, :destination_place_id, :query, :limit, :order
+
+      def base_scope
+        scope = SpreeCmCommissioner::Route.includes(:origin_place, :destination_place, :route_photos)
+        scope = scope.where(vendor_id: vendor.id) if vendor.present?
+        scope = scope.where(tenant_id: tenant.id) if tenant.present?
+        scope
+      end
+
+      def ids?
+        ids.present?
+      end
+
+      def name?
+        name.present?
+      end
+
+      def route_type?
+        route_type.present?
+      end
+
+      def query?
+        query.present?
+      end
+
+      def by_ids(scope)
+        scope.where(id: ids)
+      end
+
+      def by_name(scope)
+        scope.where('cm_routes.route_name ILIKE ?', "%#{name}%")
+      end
+
+      def by_route_type(scope)
+        scope.where(route_type: route_type.to_s)
+      end
+
+      def by_origin_place(scope)
+        scope.where(origin_place_id: origin_place_id)
+      end
+
+      def by_destination_place(scope)
+        scope.where(destination_place_id: destination_place_id)
+      end
+
+      def by_query(scope)
+        scope.where('cm_routes.route_name ILIKE :q OR cm_routes.short_name ILIKE :q', q: "%#{query}%")
+      end
+
+      def order_clause
+        order
+      end
+    end
+  end
+end