dscf-marketplace 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f0f591983cea40d4d2f6a5c4467b7d545de79760fc7911ab344859f7511c77a
-  data.tar.gz: 99b10ebe989e7152e2727da4c789dc857a33bf348192f706618f041c22bddc71
+  metadata.gz: f20dc6ec95c1bd2483126bf1f0b241ba3403999673a705b9f0e72e214ec29889
+  data.tar.gz: 6233b5ae039cd138f26ca51d70db6a9458e51b25d29a2ba21d37a142b103b933
 SHA512:
-  metadata.gz: 81582f57d99751874955a157a46e73588352f38e1c93ae2ac08a11f2f5b7419df0cbd16076a4d0653aa0026d219a9e183b58ee7cb432077aed6365a6bc79dfc5
-  data.tar.gz: fe8a10f50d36184274dceeb2d36d09406d5beda9665b064d0a45b6858a6e4088fd6ad5bcf053f56d8e3cba9f7fa37a9e860a23c5e3d71645f8a3dcf6facb281e
+  metadata.gz: b852b81aa1b9ea52cc219e40b1056691d4ed7d464e0fd684bf1395abf4219cd35bf07c2f7fa67ab6fc5397f438a95e420a98e826465e331002d1ebebe672ef8c
+  data.tar.gz: 0e32006533ed1f96fead2d9eb34b03cc74ed5eaf62a4ad5eb0eeb7e7c36b167d58559d0d27d5c023f5d67fef2c80a48783da0f13e08a7888c3fac93ce505cea4

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

@@ -33,6 +33,47 @@ module Dscf
         end
       end
 
+      def promote
+        @obj = find_record
+        authorize @obj, :promote?
+        if @obj.update(
+          orchestrator_promoted: true,
+          orchestrator_promoted_at: Time.current,
+          promoted_by: current_user
+        )
+          render_success("listings.success.promoted", data: @obj)
+        else
+          render_error("listings.errors.promote_failed")
+        end
+      end
+
+      def unpromote
+        @obj = find_record
+        authorize @obj, :unpromote?
+        if @obj.update(
+          orchestrator_promoted: false,
+          orchestrator_promoted_at: nil,
+          promoted_by: nil
+        )
+          render_success("listings.success.unpromoted", data: @obj)
+        else
+          render_error("listings.errors.unpromote_failed")
+        end
+      end
+
+      # Public feed: only visible listings (computed by 3 conditions)
+      def visible
+        authorize @clazz.new, :visible?
+        listings = @clazz.visible.includes(eager_loaded_associations)
+
+        options = {
+          include: default_serializer_includes[:index] || [],
+          meta: { resource_type: "visible_listings" }
+        }
+
+        render_success(data: listings, serializer_options: options)
+      end
+
       def my_listings
         authorize @clazz.new, :my_listings?
         service = MyResourceService.new(current_user)
@@ -40,7 +81,7 @@ module Dscf
 
         options = {
           include: default_serializer_includes[:index] || [],
-          meta: {resource_type: "my_listings"}
+          meta: { resource_type: "my_listings" }
         }
 
         render_success("listings.success.index", data: listings, serializer_options: options)
@@ -50,7 +91,6 @@ module Dscf
         authorize @clazz.new, :listings_by_supplier?
         supplier_id = params[:supplier_id]
 
-        # Validate supplier exists
         supplier = Dscf::Core::Business.find_by(id: supplier_id)
         return render_error("listings.errors.supplier_not_found") unless supplier
 
@@ -71,6 +111,10 @@ module Dscf
 
       private
 
+      def find_record
+        @clazz.find(params[:id])
+      end
+
       def model_params
         params.require(:listing).permit(
           :business_id, :supplier_product_id, :price, :quantity, :status

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

@@ -3,6 +3,7 @@ module Dscf::Marketplace
     # References
     belongs_to :business, class_name: "Dscf::Core::Business"
     belongs_to :supplier_product, class_name: "Dscf::Marketplace::SupplierProduct"
+    belongs_to :promoted_by, class_name: "Dscf::Core::User", optional: true
 
     # Relationships
     has_many :order_items, class_name: "Dscf::Marketplace::OrderItem"
@@ -20,14 +21,106 @@ module Dscf::Marketplace
     scope :active, -> { where(status: :active) }
     scope :by_business, ->(business_id) { where(business_id: business_id) }
     scope :owned_by, ->(business) { where(business: business) }
+    scope :promoted, -> { where(orchestrator_promoted: true) }
+    scope :not_promoted, -> { where(orchestrator_promoted: false) }
+
+    # Returns listings visible to end users based on 3 conditions:
+    # 1. Orchestrator promoted (manual override)
+    # 2. Sole provider — only one active listing for this product
+    # 3. Cheapest price — lowest price among active listings for the same product
+    scope :visible, -> {
+      active.where(<<~SQL.squish)
+        orchestrator_promoted = true
+        OR (
+          SELECT COUNT(*) FROM dscf_marketplace_listings l2
+          JOIN dscf_marketplace_supplier_products sp2 ON l2.supplier_product_id = sp2.id
+          WHERE sp2.product_id = (
+            SELECT sp.product_id FROM dscf_marketplace_supplier_products sp
+            WHERE sp.id = dscf_marketplace_listings.supplier_product_id
+          )
+          AND l2.status = #{Listing.statuses[:active]}
+        ) = 1
+        OR (
+          dscf_marketplace_listings.price = (
+            SELECT MIN(l3.price) FROM dscf_marketplace_listings l3
+            JOIN dscf_marketplace_supplier_products sp3 ON l3.supplier_product_id = sp3.id
+            WHERE sp3.product_id = (
+              SELECT sp.product_id FROM dscf_marketplace_supplier_products sp
+              WHERE sp.id = dscf_marketplace_listings.supplier_product_id
+            )
+            AND l3.status = #{Listing.statuses[:active]}
+          )
+        )
+      SQL
+    }
 
     # Ransack configuration for secure filtering
     def self.ransackable_attributes(_auth_object = nil)
-      %w[id business_id supplier_product_id price quantity status created_at updated_at]
+      %w[id business_id supplier_product_id price quantity status
+         orchestrator_promoted orchestrator_promoted_at promoted_by_id
+         created_at updated_at]
     end
 
     def self.ransackable_associations(_auth_object = nil)
-      %w[business supplier_product order_items]
+      %w[business supplier_product order_items promoted_by]
+    end
+
+    # Is this listing the only active listing for its product?
+    def sole_provider?
+      self.class.active
+        .joins(:supplier_product)
+        .where(supplier_product: { product_id: supplier_product.product_id })
+        .count == 1
+    end
+
+    # Does this listing have the lowest price for its product?
+    def cheapest?
+      self.class.active
+        .joins(:supplier_product)
+        .where(supplier_product: { product_id: supplier_product.product_id })
+        .minimum(:price) == price
+    end
+
+    # Should this listing be shown to end users?
+    def visible?
+      return false unless active? && quantity > 0
+      return true if orchestrator_promoted?
+
+      product_id = supplier_product.product_id
+      active_listings = self.class.active.joins(:supplier_product)
+        .where(supplier_product: { product_id: product_id })
+
+      active_listings.count == 1 || active_listings.minimum(:price) == price
+    end
+
+    # Returns :orchestrator_promoted, :sole_provider, :cheapest, or nil
+    def visibility_reason
+      return nil unless visible?
+      return :orchestrator_promoted if orchestrator_promoted?
+      return :sole_provider if sole_provider?
+      return :cheapest if cheapest?
+    end
+
+    # Market insight: how many active listings exist for this product
+    def total_listings_for_product
+      self.class.active.joins(:supplier_product)
+        .where(supplier_product: { product_id: supplier_product.product_id })
+        .count
+    end
+
+    # Market insight: lowest price across all businesses for this product
+    def cheapest_price_for_product
+      self.class.active.joins(:supplier_product)
+        .where(supplier_product: { product_id: supplier_product.product_id })
+        .minimum(:price)
+    end
+
+    # Market insight: this listing's price rank (1 = cheapest)
+    def price_rank
+      self.class.active.joins(:supplier_product)
+        .where(supplier_product: { product_id: supplier_product.product_id })
+        .where("price < ?", price)
+        .count + 1
     end
 
     # Custom methods

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

@@ -74,7 +74,7 @@ module Dscf::Marketplace
     end
 
     def self.create_from_listing(listing, user, quantity, dropoff_address = nil, payment_method = nil)
-      return nil unless listing.status == "active" && quantity <= listing.quantity
+      return nil unless listing.visible? && quantity <= listing.quantity
 
       attributes = {
         order_type: :direct_listing,

data/app/policies/dscf/marketplace/listing_policy.rb

@@ -13,6 +13,18 @@ module Dscf
         user.has_permission?("listings.sold_out")
       end
 
+      def promote?
+        user.has_permission?("listings.promote")
+      end
+
+      def unpromote?
+        user.has_permission?("listings.unpromote")
+      end
+
+      def visible?
+        true
+      end
+
       def my_listings?
         user.has_permission?("listings.my_listings")
       end

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

@@ -3,11 +3,43 @@ module Dscf
     class ListingSerializer < ActiveModel::Serializer
       attributes :id, :business_id, :supplier_product_id, :price, :quantity,
         :status, :created_at, :updated_at, :total_value, :margin,
-        :margin_percentage, :available?
+        :margin_percentage, :available?,
+        :visible, :visibility_reason, :orchestrator_promoted,
+        :orchestrator_promoted_at, :promoted_by_id,
+        :sole_provider, :cheapest,
+        :total_listings_for_product, :cheapest_price_for_product, :price_rank
 
       belongs_to :business
       belongs_to :supplier_product
       has_many :order_items
+
+      def visible
+        object.visible?
+      end
+
+      def visibility_reason
+        object.visibility_reason
+      end
+
+      def sole_provider
+        object.sole_provider?
+      end
+
+      def cheapest
+        object.cheapest?
+      end
+
+      def total_listings_for_product
+        object.total_listings_for_product
+      end
+
+      def cheapest_price_for_product
+        object.cheapest_price_for_product
+      end
+
+      def price_rank
+        object.price_rank
+      end
     end
   end
 end

data/config/locales/en.yml

@@ -102,6 +102,9 @@ en:
       activated: "Listing activated successfully"
       paused: "Listing paused successfully"
       sold_out: "Listing marked as sold out successfully"
+      promoted: "Listing promoted by orchestrator successfully"
+      unpromoted: "Listing unpromoted successfully"
+      visible: "Visible listings retrieved successfully"
     errors:
       index: "Failed to retrieve listings"
       show: "Failed to retrieve listing details"
@@ -109,6 +112,9 @@ en:
       update: "Failed to update listing"
       destroy: "Failed to delete listing"
       supplier_not_found: "Supplier not found"
+      promote_failed: "Failed to promote listing"
+      unpromote_failed: "Failed to unpromote listing"
+      visible_failed: "Failed to retrieve visible listings"
 
   request_for_quotations:
     success:

data/config/routes.rb

@@ -51,9 +51,12 @@ Dscf::Marketplace::Engine.routes.draw do
       post "activate"
       post "pause"
       post "sold_out"
+      post "promote"
+      post "unpromote"
     end
     collection do
       get "my_listings"
+      get "visible"
       get "by_supplier/:supplier_id", to: "listings#listings_by_supplier"
     end
   end

data/db/migrate/20260527000001_add_orchestrator_fields_to_listings.rb

@@ -0,0 +1,22 @@
+class AddOrchestratorFieldsToListings < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_marketplace_listings, :orchestrator_promoted, :boolean, default: false, null: false
+    add_column :dscf_marketplace_listings, :orchestrator_promoted_at, :datetime
+
+    add_reference :dscf_marketplace_listings, :promoted_by,
+                  foreign_key: { to_table: :dscf_core_users },
+                  index: { name: "promoted_by_on_dm_listings_indx" }
+
+    # Backfill: existing active listings remain visible after deploy
+    reversible do |dir|
+      dir.up do
+        execute <<~SQL.squish
+          UPDATE dscf_marketplace_listings
+          SET orchestrator_promoted = true,
+              orchestrator_promoted_at = NOW()
+          WHERE status = 0
+        SQL
+      end
+    end
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.8.0".freeze
+    VERSION = "0.8.1".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2026-05-24 00:00:00.000000000 Z
+date: 2026-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -550,6 +550,7 @@ files:
 - db/migrate/20260514000004_replace_base_price_with_gross_weight_on_products.rb
 - db/migrate/20260514000005_create_dscf_marketplace_aggregator_listings.rb
 - db/migrate/20260514000006_add_supplier_id_to_addresses.rb
+- db/migrate/20260527000001_add_orchestrator_fields_to_listings.rb
 - db/seeds.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb