dscf-marketplace 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70190000bbbdf144579c8e6c27608664b18a4a8460ac43350f9dc1162c355b0a
-  data.tar.gz: 1e661035af4d825af27418bf07a7342eaa641d39ea6e20fd1cc62dd64aecbd75
+  metadata.gz: 6369ee5595ca023697c774365dee93c16a985614fc46057ee9effd1e2120a244
+  data.tar.gz: 696e16ed8bac9ba0b214979d69b3b133c3ea5a32374bc44dd7ef9db0253bac6c
 SHA512:
-  metadata.gz: 1a1fb37f55cd3d15a6a89098f435dd8f7797748440dff0f68aac15be45a92c1e3b7807ef2307013846cdab795153a8b956fdc50eaa569424a9ec88695f77763e
-  data.tar.gz: a18369805514a3d9d24562ada719551baf8e06621a5bb5b806afafd900f8245dbdc16568f6514ec77953055c6faece98fa937961ba05a28d9c8aaed853393828
+  metadata.gz: 218769eb0baba77cb42ec31c7519ea60ad1ed2483135446a98970cf18b928dc1ccc29a44dcdc941c144ac94cdf9098400628b9e521b4956f8bfe10c51913616b
+  data.tar.gz: aedbbb4601fab05aa6ce8e60470609286b71d5b3b6e7f9da201337073e12b5255c151fc16de074083c9511cbf10c6ff1d86d140cee6ae66bb95d1bf20df93d21

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

@@ -8,25 +8,61 @@ module Dscf
         render_success("business.success.has_business_check", data: {has_business: has_business})
       end
 
+      def create
+        business = @clazz.new(model_params.except(:business_license))
+        if business.save
+          # Add document upload after save
+          if params[:business][:business_license].present?
+            document = Dscf::Core::Document.new(
+              documentable: business,
+              document_type: :business_license
+            )
+            document.file.attach(params[:business][:business_license])
+            document.save!
+          end
+
+          business = @clazz.includes(eager_loaded_associations).find(business.id) if eager_loaded_associations.present?
+          includes = serializer_includes_for_action(:create)
+          options = {include: includes} if includes.present?
+          render_success(data: business, serializer_options: options, status: :created)
+        else
+          render_error(errors: business.errors.full_messages[0], status: :unprocessable_entity)
+        end
+      rescue => e
+        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
         params.require(:business).permit(
           :name, :description, :contact_email, :contact_phone, :tin_number,
-          :business_type_id, :user_id
+          :business_type_id, :user_id, business_license: :file
         )
       end
 
       def eager_loaded_associations
-        [ :business_type, :user ]
+        [ :business_type, :user, :documents ]
       end
 
       def default_serializer_includes
         {
-          index: [ :business_type, :user ],
-          show: [ :business_type, :user ],
-          create: [ :business_type, :user ],
-          update: [ :business_type, :user ]
+          index: [ :business_type, :user, :documents ],
+          show: [ :business_type, :user, :documents ],
+          create: [ :business_type, :user, :documents ],
+          update: [ :business_type, :user, :documents ]
         }
       end
     end

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

@@ -30,6 +30,18 @@ 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
+
       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/serializers/dscf/marketplace/business_serializer.rb

@@ -6,6 +6,7 @@ module Dscf
 
       belongs_to :business_type
       belongs_to :user
+      has_many :documents
     end
   end
 end

data/app/serializers/dscf/marketplace/document_serializer.rb

@@ -0,0 +1,7 @@
+module Dscf
+  module Marketplace
+    class DocumentSerializer < ActiveModel::Serializer
+      attributes :id, :document_type, :file_url, :is_verified, :verified_at, :created_at, :updated_at
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+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
+
+      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,9 @@ Dscf::Marketplace::Engine.routes.draw do
       post "pause"
       post "sold_out"
     end
+    collection do
+      get "my_listings"
+    end
   end
 
   # RFQ System
@@ -43,6 +50,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 +64,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 +79,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.1".freeze
+    VERSION = "0.2.3".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Asrat
@@ -456,6 +456,7 @@ files:
 - app/serializers/dscf/marketplace/delivery_order_item_serializer.rb
 - app/serializers/dscf/marketplace/delivery_order_serializer.rb
 - app/serializers/dscf/marketplace/delivery_vehicle_serializer.rb
+- app/serializers/dscf/marketplace/document_serializer.rb
 - app/serializers/dscf/marketplace/listing_serializer.rb
 - app/serializers/dscf/marketplace/order_item_serializer.rb
 - app/serializers/dscf/marketplace/order_serializer.rb
@@ -467,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