dscf-marketplace 0.9.8 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96faa437c564d4a08d4df63b8e1143c8e69da546d8e576e03d30bd2c99443e50
-  data.tar.gz: 58eeb5fed2f4afea0a88dd25f55d2bfc791a7d7f488a7be46357fcc4b79597fb
+  metadata.gz: 007d71d7d41ca79db79fe7097cda7d169eb5ad0cc973523a8aa6d8ce52555bee
+  data.tar.gz: 7b57bd0640a1dc86b8d67e89a4fd93699d1386aab09202266c6bd93ea98de3a8
 SHA512:
-  metadata.gz: cd51195fca94e7f6018aca92c64620f1f686a5b1584858add1afb1ceb0ee8a34b09e90fd27e9681dadbaef3a514741109c5a293aee3aa57c905f11df962cda4f
-  data.tar.gz: c9bc4eefa1acdd394eb3d23ae3a57f60126ccdb5dd698e64050c4ca8f48d2364a99c06266aff03b9d84b90a9d45ea2881e847d98a2b58a51335ee2751f245230
+  metadata.gz: 1a52333ddfbb43afed4d019777f07aabbb2b5bd9fbbdfee5e386075f9e3bc3baa6778d8924ffd7db8c90cf781aa9a4f92418e69610be388ec2d9b3056507a501
+  data.tar.gz: f2fd36c7e8073ebbac241432c22639df6b84528f3893045eb686bd6cc4fda94cd145368cb95f548734cab064219323696b2921d1fb6c23a2b7a1346c19bcf5f8

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

@@ -5,7 +5,7 @@ module Dscf
 
       def feed
         authorize @clazz.new, :index?
-        listings = @clazz.active.includes(supplier_product: :product)
+        listings = @clazz.active.includes(:product, {supplier_product: :product}, {sub_supplier_product: :product})
 
         options = {
           include: default_serializer_includes[:index] || [],
@@ -18,7 +18,7 @@ module Dscf
       def my_listings
         authorize @clazz.new, :my_listings?
         businesses = current_user.businesses.pluck(:id)
-        listings = @clazz.where(aggregator_id: businesses).includes(supplier_product: :product)
+        listings = @clazz.where(aggregator_id: businesses).includes(:product, {supplier_product: :product}, {sub_supplier_product: :product})
 
         options = {
           include: default_serializer_includes[:index] || [],
@@ -32,7 +32,8 @@ module Dscf
 
       def model_params
         params.require(:aggregator_listing).permit(
-          :aggregator_id, :supplier_product_id, :price, :quantity, :status
+          :aggregator_id, :source_kind, :supplier_product_id, :product_id,
+          :sub_supplier_product_id, :price, :quantity, :status
         )
       end
     end

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

@@ -314,7 +314,12 @@ module Dscf
             order.status = :pending
             order.ordered_to = aggregator_listing.aggregator
 
-            product = aggregator_listing.supplier_product.product
+            product = aggregator_listing.product
+            # Order lines from the aggregator feed are auto-sourced to the originating
+            # AggregatorListing (regardless of source_kind) — the aggregator already
+            # knows the source, so there's no manual pick at split time. The listing's
+            # source_kind carries who ultimately fulfils it (self / sub-supplier /
+            # supplier), surfaced via source_name for display and confirmation routing.
             order.order_items.build(
               source: aggregator_listing,
               product: product,

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

@@ -0,0 +1,29 @@
+module Dscf
+  module Marketplace
+    class SubSupplierProductsController < ApplicationController
+      include Dscf::Core::Common
+
+      private
+
+      def model_params
+        params.require(:sub_supplier_product).permit(
+          :sub_supplier_id, :product_id, :sub_supplier_price,
+          :aggregator_price, :quantity, :listed
+        )
+      end
+
+      def eager_loaded_associations
+        [ :sub_supplier, :product ]
+      end
+
+      def default_serializer_includes
+        {
+          index: [ :sub_supplier, :product ],
+          show: [ :sub_supplier, :product ],
+          create: [ :sub_supplier, :product ],
+          update: [ :sub_supplier, :product ]
+        }
+      end
+    end
+  end
+end

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

@@ -1,32 +1,74 @@
 module Dscf::Marketplace
   class AggregatorListing < ApplicationRecord
     belongs_to :aggregator, class_name: "Dscf::Core::Business"
-    belongs_to :supplier_product, class_name: "Dscf::Marketplace::SupplierProduct"
+    belongs_to :supplier_product, class_name: "Dscf::Marketplace::SupplierProduct", optional: true
+    belongs_to :product, class_name: "Dscf::Marketplace::Product", optional: true
+    belongs_to :sub_supplier_product, class_name: "Dscf::Marketplace::SubSupplierProduct", optional: true
 
     has_many :order_items, class_name: "Dscf::Marketplace::OrderItem", as: :source, dependent: :nullify
 
     delegate :name, :description, :thumbnail_url, :images_urls, to: :product, allow_nil: true
 
     enum :status, {active: 0, draft: 1, paused: 2, sold_out: 3}, default: :draft
+    # How the aggregator sourced this listing. Drives which reference is required,
+    # how the product/cost resolve, and who fulfils an order line placed against it.
+    enum :source_kind, {catalog: 0, supplier: 1, sub_supplier: 2}, default: :catalog
 
     validates :price, numericality: {greater_than: 0}, presence: true
     validates :quantity, numericality: {greater_than: 0}, presence: true
     validates :aggregator, presence: true
-    validates :supplier_product_id, presence: true, uniqueness: {scope: :aggregator_id}
+
+    # Each kind requires (and is unique on) exactly one reference.
+    validates :supplier_product_id, presence: true, uniqueness: {scope: :aggregator_id}, if: :supplier?
+    validates :product_id, presence: true, uniqueness: {scope: :aggregator_id}, if: :catalog?
+    validates :sub_supplier_product_id, presence: true, uniqueness: {scope: :aggregator_id}, if: :sub_supplier?
 
     scope :active, -> { where(status: :active) }
     scope :by_aggregator, ->(aggregator_id) { where(aggregator_id: aggregator_id) }
 
     def self.ransackable_attributes(_auth_object = nil)
-      %w[id aggregator_id supplier_product_id price quantity status created_at updated_at]
+      %w[id aggregator_id supplier_product_id product_id sub_supplier_product_id source_kind price quantity status created_at updated_at]
     end
 
     def self.ransackable_associations(_auth_object = nil)
-      %w[aggregator supplier_product]
+      %w[aggregator supplier_product product sub_supplier_product]
     end
 
+    # Resolves the catalogue product regardless of how the listing was sourced.
     def product
-      supplier_product&.product
+      case source_kind
+      when "supplier" then supplier_product&.product
+      when "sub_supplier" then sub_supplier_product&.product
+      else super
+      end
+    end
+
+    # The aggregator's cost basis for this listing (nil for catalog — the aggregator
+    # sets a selling price directly with no upstream cost to compare against).
+    def cost_price
+      case source_kind
+      when "supplier" then supplier_product&.supplier_price
+      when "sub_supplier" then sub_supplier_product&.sub_supplier_price
+      end
+    end
+
+    def margin
+      return nil unless cost_price
+      price - cost_price
+    end
+
+    # Human-readable name of who ultimately fulfils a line placed against this
+    # listing. An order line is auto-sourced to the AggregatorListing itself, so
+    # this drives the "Product source name" the requirements ask for:
+    #   catalog      -> the aggregator (self-fulfilled)
+    #   supplier     -> the supplier's business name
+    #   sub_supplier -> the sub-supplier's business name
+    def source_label
+      case source_kind
+      when "supplier" then supplier_product&.business&.name
+      when "sub_supplier" then sub_supplier_product&.sub_supplier&.business_name
+      else aggregator&.name
+      end
     end
 
     def available?

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

@@ -22,7 +22,7 @@ module Dscf::Marketplace
     validates :status, presence: true
     validates :product, presence: true
     validates :unit, presence: true
-    validate :quotation_item_or_listing_present
+    validate :orderable_source_present
 
     # Ransack configuration for secure filtering
     def self.ransackable_attributes(_auth_object = nil)
@@ -55,10 +55,15 @@ module Dscf::Marketplace
 
     private
 
-    def quotation_item_or_listing_present
-      unless quotation_item.present? || listing.present? || (source_type == "Dscf::Marketplace::AggregatorListing" && source_id.present?)
-        errors.add(:base, "Either quotation_item, listing, or aggregator listing source must be present")
-      end
+    # A line must trace back to something orderable: an RFQ quotation item, a
+    # supplier listing, or any assigned polymorphic source (aggregator listing,
+    # sub-supplier, other supplier/business). The last case is what lets the
+    # aggregator reassign a line to another source during splitting.
+    def orderable_source_present
+      return if quotation_item.present? || listing.present?
+      return if source_type.present? && source_id.present?
+
+      errors.add(:base, "Either a quotation item, a listing, or an assigned source must be present")
     end
   end
 end

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

@@ -1,9 +1,11 @@
 module Dscf
   module Marketplace
     class AggregatorListingSerializer < ActiveModel::Serializer
-      attributes :id, :aggregator_id, :supplier_product_id, :price, :quantity,
+      attributes :id, :aggregator_id, :source_kind, :supplier_product_id, :product_id,
+                 :sub_supplier_product_id, :price, :quantity, :cost_price, :margin,
                  :status, :created_at, :updated_at, :total_value, :available?,
-                 :product_name, :product_description, :thumbnail_url, :images_urls
+                 :product_name, :product_description, :thumbnail_url, :images_urls,
+                 :source_label
 
       belongs_to :aggregator
 

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

@@ -16,6 +16,8 @@ module Dscf
       def source_name
         return nil unless object.source
         case object.source_type
+        when 'Dscf::Marketplace::AggregatorListing'
+          object.source.try(:source_label)
         when 'Dscf::Marketplace::SubSupplier'
           object.source.try(:business_name) || object.source.try(:name)
         when 'Dscf::Marketplace::Supplier'

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

@@ -0,0 +1,34 @@
+module Dscf
+  module Marketplace
+    class SubSupplierProductSerializer < ActiveModel::Serializer
+      attributes :id, :sub_supplier_id, :product_id,
+                 :sub_supplier_price, :aggregator_price, :quantity, :listed,
+                 :created_at, :updated_at,
+                 :product_name, :product_sku, :thumbnail_url, :images_urls,
+                 :sub_supplier_name
+
+      belongs_to :sub_supplier
+      belongs_to :product
+
+      def product_name
+        object.product&.name
+      end
+
+      def product_sku
+        object.product&.sku
+      end
+
+      def thumbnail_url
+        object.product&.thumbnail_url
+      end
+
+      def images_urls
+        object.product&.images_urls
+      end
+
+      def sub_supplier_name
+        object.sub_supplier&.business_name
+      end
+    end
+  end
+end

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

@@ -51,8 +51,17 @@ module Dscf
         item
       end
 
+      # Returns the current price/quantity reference for an item. This is duck-typed:
+      # any object responding to #price and #quantity works (Listing or
+      # AggregatorListing), since validate_item only reads those two fields.
       private_class_method def self.find_current_active_listing(item)
-        # Prefer the original listing if still active
+        # Lines placed from the aggregator feed are sourced to their AggregatorListing —
+        # validate against that listing's live price/quantity, not a supplier listing.
+        if item.source.is_a?(AggregatorListing)
+          return AggregatorListing.active.find_by(id: item.source_id)
+        end
+
+        # Prefer the original supplier listing if still active
         if item.listing && Listing.active.exists?(id: item.listing.id)
           return item.listing
         end

data/config/routes.rb

@@ -33,6 +33,7 @@ Dscf::Marketplace::Engine.routes.draw do
   end
 
   resources :sub_suppliers
+  resources :sub_supplier_products
 
   # Aggregator Feed
   resources :aggregator_listings do

data/db/migrate/20260702000001_unify_aggregator_listing_source.rb

@@ -0,0 +1,58 @@
+class UnifyAggregatorListingSource < ActiveRecord::Migration[8.0]
+  def up
+    # New polymorphic-style source discriminator.
+    # 0 = catalog (aggregator lists a master-catalogue product directly)
+    # 1 = supplier (aggregator resells a supplier_product)      <- the only kind that existed before
+    # 2 = sub_supplier (aggregator lists a sub-supplier product)
+    add_column :dscf_marketplace_aggregator_listings, :source_kind, :integer, default: 0, null: false
+
+    # Catalog / sub-supplier sourced listings don't have a supplier_product.
+    change_column_null :dscf_marketplace_aggregator_listings, :supplier_product_id, true
+
+    add_column :dscf_marketplace_aggregator_listings, :product_id, :bigint
+    add_column :dscf_marketplace_aggregator_listings, :sub_supplier_product_id, :bigint
+
+    add_index :dscf_marketplace_aggregator_listings, :product_id, name: "product_on_dm_al_indx"
+    add_index :dscf_marketplace_aggregator_listings, :sub_supplier_product_id, name: "ssp_on_dm_al_indx"
+
+    # Existing rows are all supplier-sourced; backfill kind + denormalised product_id.
+    execute(<<~SQL.squish)
+      UPDATE dscf_marketplace_aggregator_listings al
+      SET source_kind = 1,
+          product_id = sp.product_id
+      FROM dscf_marketplace_supplier_products sp
+      WHERE al.supplier_product_id = sp.id
+        AND al.supplier_product_id IS NOT NULL
+    SQL
+
+    # The old unique index assumed supplier_product_id is always present. Replace it
+    # with one partial unique index per kind so an aggregator can't double-list the
+    # same catalogue product / supplier_product / sub_supplier_product.
+    remove_index :dscf_marketplace_aggregator_listings, name: "unique_aggregator_sp_indx"
+
+    add_index :dscf_marketplace_aggregator_listings, [:aggregator_id, :supplier_product_id],
+              unique: true, where: "source_kind = 1", name: "uniq_agg_supplier_product_indx"
+    add_index :dscf_marketplace_aggregator_listings, [:aggregator_id, :product_id],
+              unique: true, where: "source_kind = 0", name: "uniq_agg_catalog_product_indx"
+    add_index :dscf_marketplace_aggregator_listings, [:aggregator_id, :sub_supplier_product_id],
+              unique: true, where: "source_kind = 2", name: "uniq_agg_sub_supplier_product_indx"
+  end
+
+  def down
+    remove_index :dscf_marketplace_aggregator_listings, name: "uniq_agg_supplier_product_indx"
+    remove_index :dscf_marketplace_aggregator_listings, name: "uniq_agg_catalog_product_indx"
+    remove_index :dscf_marketplace_aggregator_listings, name: "uniq_agg_sub_supplier_product_indx"
+
+    remove_index :dscf_marketplace_aggregator_listings, name: "product_on_dm_al_indx"
+    remove_index :dscf_marketplace_aggregator_listings, name: "ssp_on_dm_al_indx"
+
+    remove_column :dscf_marketplace_aggregator_listings, :product_id
+    remove_column :dscf_marketplace_aggregator_listings, :sub_supplier_product_id
+    remove_column :dscf_marketplace_aggregator_listings, :source_kind
+
+    # Restore the original unique index. Rows must be supplier-sourced for this to hold.
+    change_column_null :dscf_marketplace_aggregator_listings, :supplier_product_id, false
+    add_index :dscf_marketplace_aggregator_listings, [:aggregator_id, :supplier_product_id],
+              unique: true, name: "unique_aggregator_sp_indx"
+  end
+end

data/lib/dscf/marketplace/engine.rb

@@ -28,6 +28,9 @@ module Dscf
               resource :units, actions: %i[index show create update destroy]
               resource :unit_conversions, actions: %i[index show create update destroy]
               resource :supplier_products, actions: %i[index show create update destroy my_products]
+              resource :sub_suppliers, actions: %i[index show create update destroy]
+              resource :sub_supplier_products, actions: %i[index show create update destroy]
+              resource :aggregator_listings, actions: %i[index show create update destroy feed my_listings]
               resource :listings, actions: %i[index show create update destroy activate pause sold_out my_listings listings_by_supplier]
               resource :request_for_quotations, actions: %i[index show create update destroy send_rfq close respond my_rfqs filter]
               resource :rfq_items, actions: %i[index show create update destroy]

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.9.8".freeze
+    VERSION = "0.10.0".freeze
   end
 end

data/spec/factories/dscf/marketplace/aggregator_listings.rb

@@ -1,9 +1,24 @@
 FactoryBot.define do
   factory :dscf_marketplace_aggregator_listing, class: "Dscf::Marketplace::AggregatorListing" do
     association :aggregator, factory: :dscf_core_business
-    association :supplier_product, factory: :dscf_marketplace_supplier_product
     price { 250.00 }
     quantity { 50.0 }
     status { :active }
+
+    # Default: supplier-sourced (resells a supplier_product), matching pre-existing data.
+    source_kind { :supplier }
+    association :supplier_product, factory: :dscf_marketplace_supplier_product
+
+    trait :catalog do
+      source_kind { :catalog }
+      supplier_product { nil }
+      association :product, factory: :dscf_marketplace_product
+    end
+
+    trait :sub_supplier do
+      source_kind { :sub_supplier }
+      supplier_product { nil }
+      association :sub_supplier_product, factory: :dscf_marketplace_sub_supplier_product
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.10.0
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2026-06-30 00:00:00.000000000 Z
+date: 2026-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -438,6 +438,7 @@ files:
 - app/controllers/dscf/marketplace/request_for_quotations_controller.rb
 - app/controllers/dscf/marketplace/retailers_controller.rb
 - app/controllers/dscf/marketplace/rfq_items_controller.rb
+- app/controllers/dscf/marketplace/sub_supplier_products_controller.rb
 - app/controllers/dscf/marketplace/sub_suppliers_controller.rb
 - app/controllers/dscf/marketplace/supplier_products_controller.rb
 - app/controllers/dscf/marketplace/suppliers_controller.rb
@@ -514,6 +515,7 @@ files:
 - app/serializers/dscf/marketplace/request_for_quotation_serializer.rb
 - app/serializers/dscf/marketplace/retailer_serializer.rb
 - app/serializers/dscf/marketplace/rfq_item_serializer.rb
+- app/serializers/dscf/marketplace/sub_supplier_product_serializer.rb
 - app/serializers/dscf/marketplace/sub_supplier_serializer.rb
 - app/serializers/dscf/marketplace/supplier_product_serializer.rb
 - app/serializers/dscf/marketplace/supplier_serializer.rb
@@ -590,6 +592,7 @@ files:
 - db/migrate/20260619210001_add_user_id_to_dscf_marketplace_agents.rb
 - db/migrate/20260619210002_add_user_id_to_dscf_marketplace_retailers.rb
 - db/migrate/20260622000001_add_validation_and_source_fields_to_dscf_marketplace_order_items.rb
+- db/migrate/20260702000001_unify_aggregator_listing_source.rb
 - db/seeds.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb