dscf-marketplace 0.2.99 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3149c8bf4129b29d6b05fe56bd6e05517db77cb8ca06eef00ec7fae37cc5d64
-  data.tar.gz: 9c5e3d3f97ceb0503d07e0e35643ca81e7eb7fa6ea8a13ed5b5e85627c996ab7
+  metadata.gz: c6a085b77e0df306ff423707aef06677341c982e2583981b5cb29af086e49a02
+  data.tar.gz: 1fe59b7b90e392c0719a53e58da437a45e49627655ace2c9ee83e6cb32501c0a
 SHA512:
-  metadata.gz: 32a35f9601525853e8b2f8ec0d4d0a5fdb3bb8b40d0c6caddd88c7565057efcbb02fe544b877b25618634332c8d5468b32a16dec6709e49c13798f66fed5ed6f
-  data.tar.gz: 8d744415e4936f1aeb6a0916e46ebdcf8786437735b05d0797d3ed2dbd0e49ddf4542ce758960cd84e75bb92c2cbe1d2227ee2b96df31ed91b65ba3e511c8aca
+  metadata.gz: a8bd980e7ba25145aebdedf2a3d759aefcd1df8a85af56c7740f22fb4a3ab9c90e045049ae596efdd34eab2d571e32fa16edcd0a4ec294437da93bf313a92a50
+  data.tar.gz: 7f6cd84b1f789ed6f770ad71f4b47c3d6599307622b46385119898f077c569813e1e0f5f3dacbc1c71609fe05fdacc165b0727021f41ecbf0de04974554da6f5

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

@@ -45,6 +45,29 @@ module Dscf
         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
         @obj = find_record
         if @obj.pickup!

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

@@ -3,18 +3,23 @@ module Dscf
     class OrdersController < ApplicationController
       include Dscf::Core::Common
 
-      def index
-        super do
-          # Get base query with proper filtering
-          orders = @clazz.all
+      def filter
+        orders = @clazz.all
 
-          # Apply Ransack filtering if q params present
-          if params[:q].present?
-            orders = orders.ransack(params[:q]).result
-          end
-
-          orders
+        # 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

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,18 +3,23 @@ module Dscf
     class QuotationsController < ApplicationController
       include Dscf::Core::Common
 
-      def index
-        super do
-          # Get base query with proper filtering
-          quotations = @clazz.all
+      def filter
+        quotations = @clazz.all
 
-          # Apply Ransack filtering if q params present
-          if params[:q].present?
-            quotations = quotations.ransack(params[:q]).result
-          end
-
-          quotations
+        # 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

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

@@ -3,18 +3,23 @@ module Dscf
     class RequestForQuotationsController < ApplicationController
       include Dscf::Core::Common
 
-      def index
-        super do
-          # Get base query with proper filtering
-          rfqs = @clazz.all
+      def filter
+        rfqs = @clazz.all
 
-          # Apply Ransack filtering if q params present
-          if params[:q].present?
-            rfqs = rfqs.ransack(params[:q]).result
-          end
-
-          rfqs
+        # 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

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.99".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.99
+  version: 0.3.0
 platform: ruby
 authors:
 - Asrat