dscf-marketplace 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b03c9932cc3e31e46ea8ac2689f410b4f78b0cd950340a780b52e67abba8693c
-  data.tar.gz: cef9643cb87044521d76d31f930affdeb899cc35a7ab67f9f129b346fd05dfdf
+  metadata.gz: 9c6753e6a99d5fcd1f3a5f3c81e9ea36bef71439a4eb3840ed3f7d8f4deb1f5f
+  data.tar.gz: edbf169441292502b45e8d67ab61bee187816d574a17e27c6b8a0a4bfb4b4bf5
 SHA512:
-  metadata.gz: cd00154351d1e038a1f375c2016db715d75ddb8808f8a1e30cebb234eb1f25f4dbaa160bdd8446b897a8542a08f064bee63b89e981dc36b05bd589b2638c4533
-  data.tar.gz: c0f0e1b6c4fb9f5dcc8f1bd442058fc9494f0366819e0561ef228141755e3870217ff8512052894857655c55657114c395dd69aa5e84d77f6163bbd42db01395
+  metadata.gz: 367c4df2d4a125126c527c123668eafd975fb52a7082a2f792e69bfbacf6978ecaac8742a745470a2eca82c9db13ee6da6dfa847c434a999e9343c6dbdaed7f5
+  data.tar.gz: 5199ecec95982d83a2fb842c95921ff2037cd479f3f0127dc0d930a3c471dea767e743898ff9dc1a1df0c18b3dcff75a15fbe8eab91b04e21665f3f46e7149d7

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

@@ -32,6 +32,18 @@ module Dscf
         render_error(error: e.message)
       end
 
+      def my_businesses
+        service = MyResourceService.new(current_user)
+        businesses = service.my_businesses(params)
+
+        options = {
+          include: default_serializer_includes[:index] || [],
+          meta: {resource_type: "my_businesses"}
+        }
+
+        render_success("businesses.success.index", data: businesses, serializer_options: options)
+      end
+
       private
 
       def model_params

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

@@ -30,6 +30,40 @@ module Dscf
         end
       end
 
+      def my_listings
+        service = MyResourceService.new(current_user)
+        listings = service.my_listings(params)
+
+        options = {
+          include: default_serializer_includes[:index] || [],
+          meta: {resource_type: "my_listings"}
+        }
+
+        render_success("listings.success.index", data: listings, serializer_options: options)
+      end
+
+      def listings_by_supplier
+        supplier_id = params[:supplier_id]
+
+        # Validate supplier exists
+        supplier = Dscf::Core::Business.find_by(id: supplier_id)
+        return render_error("Supplier not found") unless supplier
+
+        service = MyResourceService.new(current_user)
+        listings = service.listings_by_supplier(supplier_id, params)
+
+        options = {
+          include: default_serializer_includes[:index] || [],
+          meta: {
+            resource_type: "listings_by_supplier",
+            supplier_id: supplier_id,
+            supplier_name: supplier.name
+          }
+        }
+
+        render_success("listings.success.index", data: listings, serializer_options: options)
+      end
+
       private
 
       def model_params

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

@@ -32,6 +32,18 @@ module Dscf
         end
       end
 
+      def my_orders
+        service = MyResourceService.new(current_user)
+        orders = service.my_orders(params)
+
+        options = {
+          include: default_serializer_includes[:index] || [],
+          meta: {resource_type: "my_orders"}
+        }
+
+        render_success("orders.success.index", data: orders, serializer_options: options)
+      end
+
       private
 
       def model_params

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

@@ -30,6 +30,18 @@ module Dscf
         end
       end
 
+      def my_quotes
+        service = MyResourceService.new(current_user)
+        quotes = service.my_quotes(params)
+
+        options = {
+          include: default_serializer_includes[:index] || [],
+          meta: {resource_type: "my_quotes"}
+        }
+
+        render_success("quotations.success.index", data: quotes, serializer_options: options)
+      end
+
       private
 
       def model_params

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

@@ -21,6 +21,18 @@ module Dscf
         end
       end
 
+      def my_rfqs
+        service = MyResourceService.new(current_user)
+        rfqs = service.my_rfqs(params)
+
+        options = {
+          include: default_serializer_includes[:index] || [],
+          meta: {resource_type: "my_rfqs"}
+        }
+
+        render_success("request_for_quotations.success.index", data: rfqs, serializer_options: options)
+      end
+
       private
 
       def model_params

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

@@ -3,6 +3,18 @@ module Dscf
     class SupplierProductsController < ApplicationController
       include Dscf::Core::Common
 
+      def my_products
+        service = MyResourceService.new(current_user)
+        products = service.my_products(params)
+
+        options = {
+          include: default_serializer_includes[:index] || [],
+          meta: {resource_type: "my_products"}
+        }
+
+        render_success("supplier_products.success.index", data: products, serializer_options: options)
+      end
+
       private
 
       def model_params

data/app/services/dscf/marketplace/my_resource_service.rb

@@ -0,0 +1,70 @@
+module Dscf
+  module Marketplace
+    class MyResourceService
+      def initialize(current_user)
+        @current_user = current_user
+      end
+
+      def my_orders(params = {})
+        orders = Dscf::Marketplace::Order.where(user: @current_user)
+          .includes(:quotation, :listing, :user, :delivery_order, :order_items)
+
+        apply_filters(orders, params)
+      end
+
+      def my_rfqs(params = {})
+        rfqs = Dscf::Marketplace::RequestForQuotation.where(user: @current_user)
+          .includes(:user, :selected_quotation, :rfq_items, :quotations)
+
+        apply_filters(rfqs, params)
+      end
+
+      def my_quotes(params = {})
+        quotes = Dscf::Marketplace::Quotation.joins(:request_for_quotation)
+          .where(dscf_marketplace_request_for_quotations: {user_id: @current_user.id})
+          .includes(:request_for_quotation, :business, :quotation_items, :order)
+
+        apply_filters(quotes, params)
+      end
+
+      def my_businesses(params = {})
+        @current_user.businesses.includes(:business_type, :user, :documents)
+      end
+
+      def my_listings(params = {})
+        listings = Dscf::Marketplace::Listing.joins(:business)
+          .where(dscf_core_businesses: {user_id: @current_user.id})
+          .includes(:business, :supplier_product, :order_items)
+
+        apply_filters(listings, params)
+      end
+
+      def my_products(params = {})
+        products = Dscf::Marketplace::SupplierProduct.joins(:business)
+          .where(dscf_core_businesses: {user_id: @current_user.id})
+          .includes(:business, :product, :listings)
+
+        apply_filters(products, params)
+      end
+
+      def listings_by_supplier(supplier_id, params = {})
+        listings = Dscf::Marketplace::Listing.joins(:supplier_product)
+          .where(dscf_marketplace_supplier_products: {business_id: supplier_id})
+          .includes(:business, :supplier_product, :order_items)
+
+        apply_filters(listings, params)
+      end
+
+      private
+
+      def apply_filters(query, params)
+        # Apply Ransack filtering
+        if params[:q].present?
+          query = query.ransack(params[:q]).result
+        end
+
+        query
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -19,12 +19,16 @@ Dscf::Marketplace::Engine.routes.draw do
   resources :businesses do
     collection do
       get "has_business"
+      get "my_businesses"
     end
   end
 
   # Trading Models
   resources :supplier_products do
     resources :listings, only: [ :index ]
+    collection do
+      get "my_products"
+    end
   end
 
   resources :listings do
@@ -33,6 +37,10 @@ Dscf::Marketplace::Engine.routes.draw do
       post "pause"
       post "sold_out"
     end
+    collection do
+      get "my_listings"
+      get "by_supplier/:supplier_id", to: "listings#listings_by_supplier"
+    end
   end
 
   # RFQ System
@@ -43,6 +51,9 @@ Dscf::Marketplace::Engine.routes.draw do
       post "send_rfq"
       post "close"
     end
+    collection do
+      get "my_rfqs"
+    end
   end
 
   resources :rfq_items, only: [ :index, :show, :update, :create, :destroy ]
@@ -54,6 +65,9 @@ Dscf::Marketplace::Engine.routes.draw do
       post "reject"
       post "send_quotation"
     end
+    collection do
+      get "my_quotes"
+    end
   end
 
   resources :quotation_items, only: [ :index, :show, :update, :create, :destroy ]
@@ -66,6 +80,9 @@ Dscf::Marketplace::Engine.routes.draw do
       post "cancel"
       post "complete"
     end
+    collection do
+      get "my_orders"
+    end
   end
 
   resources :order_items, only: [ :index, :show, :update, :create, :destroy ]

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.2.2".freeze
+    VERSION = "0.2.4".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Asrat
@@ -468,6 +468,7 @@ files:
 - app/serializers/dscf/marketplace/supplier_product_serializer.rb
 - app/serializers/dscf/marketplace/unit_conversion_serializer.rb
 - app/serializers/dscf/marketplace/unit_serializer.rb
+- app/services/dscf/marketplace/my_resource_service.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20250827172043_create_dscf_marketplace_categories.rb