dscf-marketplace 0.13.10 → 0.13.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ceef3327d3d9ce4e71a2b412bc95c909aef51e1fc86a3b9888035473825ffb5
-  data.tar.gz: 5f326b8b1ead9bdf266ee04ac629961ebd3f9f4aa615c310058c70b48b2765a4
+  metadata.gz: 7dd1a186494d212b2e44fe094c3f31440f21764924868264316894e1152a7160
+  data.tar.gz: 03f4880b762fcf7ecebd26cc7368b07ee215b8445df4b61173b17a59dabca686
 SHA512:
-  metadata.gz: afa2ef1d16856d57808dc61721c6d1c56384d5c5b9a1d58d81aa263c5dd2a60bcd1ef57c4f32d4e3d0107e79cc0046adb1d057ed3a491964eebe2c1670b79e21
-  data.tar.gz: b8d4a631aa5917d4eb0cee9facd1daeaf8c8db6af9fd0b699268ca9f4a1d92293215d20466c4cd3778d1467b4f6f73c8884da6fd52c492db05e070a04c2dedd0
+  metadata.gz: 25a80f9a800788bb55dcfd6d44bf991b6bcf8ae25a11d4a5aa539b8db3154d0351107a990ca8844096d59a7bb4405979e52e4d8c8a0e1efc132dedbebfe2a412
+  data.tar.gz: 8efd86df8d48b449a15921f8acddd728b957e677840180111614d8680fb0c08c723b8533a110d7da13b5e126121eba73a9de5f18ff93ec49fd91864ef92221c5

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

@@ -5,7 +5,12 @@ module Dscf
 
       def feed
         authorize @clazz.new, :index?
-        listings = @clazz.active.includes(:product, {supplier_product: :product}, {sub_supplier_product: :product})
+        # Retailer-facing feed: only listings that are truly offerable — own
+        # status :active AND (for supplier-sourced) the supplier hasn't paused
+        # or run out of stock. A listing whose supplier paused drops out here.
+        listings = @clazz.active
+          .includes(:product, {supplier_product: :product}, {sub_supplier_product: :product})
+          .select(&:available?)
 
         options = {
           include: default_serializer_includes[:index] || [],

data/app/models/concerns/dscf/marketplace/attachment_urls.rb

@@ -0,0 +1,29 @@
+module Dscf
+  module Marketplace
+    # Shared Active Storage URL helpers. Produces a host-aware proxy URL that
+    # works behind the API's `/api` script_name — unlike `only_path: true`,
+    # which drops the script_name and 404s when the client resolves the path.
+    module AttachmentUrls
+      extend ActiveSupport::Concern
+
+      private
+
+      def attachment_url_for(attachment)
+        return unless attachment.present?
+        return if attachment.respond_to?(:attached?) && !attachment.attached?
+
+        Rails.application.routes.url_helpers.rails_storage_proxy_url(attachment, **active_storage_url_options)
+      end
+
+      def active_storage_url_options
+        url_options = Rails.application.config.x.active_storage_url_options.presence ||
+          Rails.application.routes.default_url_options.presence ||
+          Rails.application.config.action_controller.default_url_options.presence ||
+          Rails.application.config.action_mailer.default_url_options.presence ||
+          {}
+
+        url_options.to_h.symbolize_keys.compact
+      end
+    end
+  end
+end

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

@@ -1,5 +1,7 @@
 module Dscf::Marketplace
   class Agent < ApplicationRecord
+    include Dscf::Marketplace::AttachmentUrls
+
     # Associations
     belongs_to :user, class_name: "Dscf::Core::User", optional: true
     belongs_to :onboarded_by, class_name: "Dscf::Core::Business", optional: true
@@ -44,15 +46,11 @@ module Dscf::Marketplace
     end
 
     def photo_url
-      return nil unless photo.attached?
-
-      Rails.application.routes.url_helpers.rails_storage_proxy_url(photo, only_path: true)
+      attachment_url_for(photo)
     end
 
     def national_id_url
-      return nil unless national_id.attached?
-
-      Rails.application.routes.url_helpers.rails_storage_proxy_url(national_id, only_path: true)
+      attachment_url_for(national_id)
     end
 
     private

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

@@ -14,6 +14,12 @@ module Dscf::Marketplace
     # 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
 
+    # At listing time the quantity for supplier/sub_supplier sources is the
+    # supplier's own maintained stock — the aggregator never types it in. Seed it
+    # from upstream on create; afterwards it's decremented by order fulfilment
+    # like any listing, so we don't re-sync on update.
+    before_validation :sync_quantity_from_source, on: :create
+
     validates :price, numericality: {greater_than: 0}, presence: true
     # Quantity must be positive while the listing is orderable, but a sold-out
     # listing legitimately holds 0 — that's exactly the state set when the last
@@ -86,12 +92,44 @@ module Dscf::Marketplace
       supplier_product&.business if supplier?
     end
 
+    # Is the upstream source still offering this? For supplier/sub_supplier
+    # sources, an aggregator listing must follow the supplier: when the supplier
+    # pauses (deactivates their supplier product) or runs out of stock, the
+    # listing is no longer offerable even if its own status is still :active.
+    # Catalog listings have no upstream — the aggregator fulfils them directly.
+    def upstream_active?
+      case source_kind
+      when "supplier" then supplier_product&.active? && supplier_product.available_quantity.to_i.positive?
+      when "sub_supplier" then sub_supplier_product.present?
+      else true
+      end
+    end
+
+    # Status as retailers/aggregator should see it: a listing whose own status is
+    # :active but whose supplier has paused reads as :paused (auto-followed),
+    # without mutating the stored status.
+    def effective_status
+      return "paused" if active? && !upstream_active?
+
+      status
+    end
+
     def available?
-      active? && quantity > 0
+      active? && quantity.to_i.positive? && upstream_active?
     end
 
     def total_value
       price * quantity
     end
+
+    private
+
+    def sync_quantity_from_source
+      case source_kind
+      when "supplier" then self.quantity = supplier_product&.available_quantity
+      when "sub_supplier" then self.quantity = sub_supplier_product&.quantity
+        # catalog: aggregator sets its own quantity
+      end
+    end
   end
 end

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

@@ -1,6 +1,8 @@
 module Dscf
   module Marketplace
     class Product < ApplicationRecord
+      include Dscf::Marketplace::AttachmentUrls
+
       belongs_to :category, class_name: "Dscf::Marketplace::Category"
       belongs_to :unit, class_name: "Dscf::Marketplace::Unit"
 
@@ -65,23 +67,6 @@ module Dscf
         images.map { |image| attachment_url_for(image) }
       end
 
-      private
-        def attachment_url_for(attachment)
-          return unless attachment.present?
-          return if attachment.respond_to?(:attached?) && !attachment.attached?
-
-          Rails.application.routes.url_helpers.rails_storage_proxy_url(attachment, **active_storage_url_options)
-        end
-
-        def active_storage_url_options
-          url_options = Rails.application.config.x.active_storage_url_options.presence ||
-            Rails.application.routes.default_url_options.presence ||
-            Rails.application.config.action_controller.default_url_options.presence ||
-            Rails.application.config.action_mailer.default_url_options.presence ||
-            {}
-
-          url_options.to_h.symbolize_keys.compact
-      end
     end
   end
 end

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

@@ -1,6 +1,7 @@
 module Dscf::Marketplace
   class Supplier < ApplicationRecord
     include Dscf::Core::ReviewableModel
+    include Dscf::Marketplace::AttachmentUrls
 
     belongs_to :business, class_name: "Dscf::Core::Business"
     has_many :supplier_products, class_name: "Dscf::Marketplace::SupplierProduct",
@@ -92,9 +93,7 @@ module Dscf::Marketplace
     def document_urls
       return [] unless documents.attached?
 
-      documents.map do |doc|
-        Rails.application.routes.url_helpers.rails_storage_proxy_url(doc, only_path: true)
-      end
+      documents.map { |doc| attachment_url_for(doc) }
     end
 
     private

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

@@ -3,7 +3,7 @@ module Dscf
     class AggregatorListingSerializer < ActiveModel::Serializer
       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?,
+                 :status, :effective_status, :created_at, :updated_at, :total_value, :available?,
                  :product_name, :product_description, :thumbnail_url, :images_urls,
                  :source_label
 

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.13.10".freeze
+    VERSION = "0.13.11".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.13.10
+  version: 0.13.11
 platform: ruby
 authors:
 - Asrat
@@ -446,6 +446,7 @@ files:
 - app/controllers/dscf/marketplace/units_controller.rb
 - app/jobs/dscf/marketplace/application_job.rb
 - app/mailers/dscf/marketplace/application_mailer.rb
+- app/models/concerns/dscf/marketplace/attachment_urls.rb
 - app/models/dscf/marketplace/agent.rb
 - app/models/dscf/marketplace/aggregator_listing.rb
 - app/models/dscf/marketplace/application_record.rb