dscf-marketplace 0.2.98 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa719a9c13e73b2dd1a928fd2c2e182c4196d6c3831c023a13b612395102cf69
-  data.tar.gz: 9d66ef00f600abc13ad2df68c2d856077859fb24336f188148d44c0b02ba52fd
+  metadata.gz: c6a085b77e0df306ff423707aef06677341c982e2583981b5cb29af086e49a02
+  data.tar.gz: 1fe59b7b90e392c0719a53e58da437a45e49627655ace2c9ee83e6cb32501c0a
 SHA512:
-  metadata.gz: 59c804e4d74b708ef0d689c5c8c74f8f1681439ea5f6e3661c62868dfe645071857e248305b8c2cbd7ba7c4e29073d5c7d12ac5a6e971db5a4928247e1689640
-  data.tar.gz: ce84b03ce6d48bc24b11df097504b92763d6cd6d953c3d79ce764b810ea1b313fdb50b7ef398f8fbfcf9575e58d9e85c59aad3780a91950bd66febe1778246a6
+  metadata.gz: a8bd980e7ba25145aebdedf2a3d759aefcd1df8a85af56c7740f22fb4a3ab9c90e045049ae596efdd34eab2d571e32fa16edcd0a4ec294437da93bf313a92a50
+  data.tar.gz: 7f6cd84b1f789ed6f770ad71f4b47c3d6599307622b46385119898f077c569813e1e0f5f3dacbc1c71609fe05fdacc165b0727021f41ecbf0de04974554da6f5

data/app/controllers/dscf/marketplace/delivery_orders_controller.rb

@@ -4,8 +4,68 @@ module Dscf
       include Dscf::Core::Common
 
       def index
-        @objs = DeliveryOrder.all
-        render_success("delivery_orders.index.success", data: @objs, serializer_options: {include: default_serializer_includes[:index]})
+        # Custom implementation to avoid JSON field issues
+        delivery_orders = @clazz.all
+
+        # Apply Ransack filtering if q params present
+        if params[:q].present?
+          # Filter out any parameters that might reference JSON fields
+          filtered_params = params[:q].reject { |key, _| key.to_s.include?("optimized_route") }
+          if filtered_params.present?
+            delivery_orders = delivery_orders.ransack(filtered_params).result
+          end
+        end
+
+        # Apply eager loading if defined
+        delivery_orders = delivery_orders.includes(eager_loaded_associations) if eager_loaded_associations.present?
+
+        # Apply pagination if requested
+        if params[:page]
+          total_count = delivery_orders.count
+          delivery_orders = delivery_orders.then(&paginate)
+          total_pages = (total_count.to_f / per_page).ceil
+          count = delivery_orders.is_a?(Array) ? delivery_orders.length : delivery_orders.count
+
+          pagination_meta = {
+            current_page: page_no,
+            per_page: per_page,
+            count: count,
+            total_count: total_count,
+            total_pages: total_pages,
+            links: pagination_links(total_pages)
+          }
+        end
+
+        # Add serializer includes
+        includes = serializer_includes_for_action(:index)
+        options = {}
+        options[:include] = includes if includes.present?
+        options[:pagination] = pagination_meta if params[:page]
+
+        render_success(data: delivery_orders, serializer_options: options)
+      end
+
+      def filter
+        delivery_orders = @clazz.all
+
+        # Apply Ransack filtering if q params present
+        if params[:q].present?
+          # Filter out any parameters that might reference JSON fields
+          filtered_params = params[:q].reject { |key, _| key.to_s.include?("optimized_route") }
+          if filtered_params.present?
+            delivery_orders = delivery_orders.ransack(filtered_params).result
+          end
+        end
+
+        # Apply eager loading
+        delivery_orders = delivery_orders.includes(eager_loaded_associations) if eager_loaded_associations.present?
+
+        # Add serializer includes
+        includes = serializer_includes_for_action(:index)
+        options = {}
+        options[:include] = includes if includes.present?
+
+        render_success(data: delivery_orders, serializer_options: options)
       end
 
       def pickup

data/app/controllers/dscf/marketplace/orders_controller.rb

@@ -3,6 +3,25 @@ module Dscf
     class OrdersController < ApplicationController
       include Dscf::Core::Common
 
+      def filter
+        orders = @clazz.all
+
+        # Apply Ransack filtering if q params present
+        if params[:q].present?
+          orders = orders.ransack(params[:q]).result
+        end
+
+        # Apply eager loading
+        orders = orders.includes(eager_loaded_associations) if eager_loaded_associations.present?
+
+        # Add serializer includes
+        includes = serializer_includes_for_action(:index)
+        options = {}
+        options[:include] = includes if includes.present?
+
+        render_success(data: orders, serializer_options: options)
+      end
+
       def confirm
         @obj = find_record
         if @obj.confirm!

data/app/controllers/dscf/marketplace/products_controller.rb

@@ -3,6 +3,25 @@ module Dscf
     class ProductsController < ApplicationController
       include Dscf::Core::Common
 
+      def filter
+        products = @clazz.all
+
+        # Apply Ransack filtering if q params present
+        if params[:q].present?
+          products = products.ransack(params[:q]).result
+        end
+
+        # Apply eager loading
+        products = products.includes(eager_loaded_associations) if eager_loaded_associations.present?
+
+        # Add serializer includes
+        includes = serializer_includes_for_action(:index)
+        options = {}
+        options[:include] = includes if includes.present?
+
+        render_success(data: products, serializer_options: options)
+      end
+
       private
 
       def model_params

data/app/controllers/dscf/marketplace/quotations_controller.rb

@@ -3,6 +3,25 @@ module Dscf
     class QuotationsController < ApplicationController
       include Dscf::Core::Common
 
+      def filter
+        quotations = @clazz.all
+
+        # Apply Ransack filtering if q params present
+        if params[:q].present?
+          quotations = quotations.ransack(params[:q]).result
+        end
+
+        # Apply eager loading
+        quotations = quotations.includes(eager_loaded_associations) if eager_loaded_associations.present?
+
+        # Add serializer includes
+        includes = serializer_includes_for_action(:index)
+        options = {}
+        options[:include] = includes if includes.present?
+
+        render_success(data: quotations, serializer_options: options)
+      end
+
       def accept
         @obj = find_record
         if @obj.accept!

data/app/controllers/dscf/marketplace/request_for_quotations_controller.rb

@@ -3,6 +3,25 @@ module Dscf
     class RequestForQuotationsController < ApplicationController
       include Dscf::Core::Common
 
+      def filter
+        rfqs = @clazz.all
+
+        # Apply Ransack filtering if q params present
+        if params[:q].present?
+          rfqs = rfqs.ransack(params[:q]).result
+        end
+
+        # Apply eager loading
+        rfqs = rfqs.includes(eager_loaded_associations) if eager_loaded_associations.present?
+
+        # Add serializer includes
+        includes = serializer_includes_for_action(:index)
+        options = {}
+        options[:include] = includes if includes.present?
+
+        render_success(data: rfqs, serializer_options: options)
+      end
+
       def create
         obj = @clazz.new(model_params)
         if obj.save

data/app/models/dscf/marketplace/delivery_order.rb

@@ -23,10 +23,31 @@ module Dscf::Marketplace
       %w[id driver_id pickup_address_id delivery_vehicle_id status vehicle_type estimated_delivery_price actual_delivery_price estimated_delivery_time actual_delivery_time delivery_notes created_at updated_at]
     end
 
-    # Override ransack to handle JSON fields
+    # Override ransack to handle JSON fields and filtering
     def self.ransack(params = {}, options = {})
       params ||= {}
-      super(params.except("optimized_route"), options)
+
+      # Remove JSON fields that can't be filtered
+      filtered_params = params.except("optimized_route")
+
+      # Also remove any q parameters that reference JSON fields
+      if filtered_params["q"].present?
+        q_params = filtered_params["q"]
+        # Remove any predicates that reference the optimized_route field
+        q_params = q_params.reject { |key, _| key.to_s.include?("optimized_route") }
+        filtered_params["q"] = q_params
+      end
+
+      # Call super with filtered params
+      result = super(filtered_params, options)
+
+      # If result is a relation, ensure we don't select JSON fields that might cause issues
+      if result.is_a?(ActiveRecord::Relation)
+        # Force selection of only the columns we want to avoid JSON field issues
+        result = result.select(column_names - [ "optimized_route" ])
+      end
+
+      result
     end
 
     def self.ransackable_associations(_auth_object = nil)

data/config/routes.rb

@@ -8,6 +8,9 @@ Dscf::Marketplace::Engine.routes.draw do
   resources :products do
     resources :listings, only: [ :index ]
     get "supplier_products", on: :member
+    collection do
+      get "filter"
+    end
   end
 
   resources :units do
@@ -54,6 +57,7 @@ Dscf::Marketplace::Engine.routes.draw do
     end
     collection do
       get "my_rfqs"
+      get "filter"
     end
   end
 
@@ -68,6 +72,7 @@ Dscf::Marketplace::Engine.routes.draw do
     end
     collection do
       get "my_quotes"
+      get "filter"
     end
   end
 
@@ -83,6 +88,7 @@ Dscf::Marketplace::Engine.routes.draw do
     end
     collection do
       get "my_orders"
+      get "filter"
     end
   end
 
@@ -97,6 +103,9 @@ Dscf::Marketplace::Engine.routes.draw do
       post "complete_delivery"
       post "mark_failed"
     end
+    collection do
+      get "filter"
+    end
   end
 
   resources :delivery_order_items, only: [ :index, :show, :update, :create ] do

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.2.98".freeze
+    VERSION = "0.3.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.2.98
+  version: 0.3.0
 platform: ruby
 authors:
 - Asrat