dscf-marketplace 0.13.11 → 0.13.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dd1a186494d212b2e44fe094c3f31440f21764924868264316894e1152a7160
-  data.tar.gz: 03f4880b762fcf7ecebd26cc7368b07ee215b8445df4b61173b17a59dabca686
+  metadata.gz: f9046b11415bd21ad907cc8c1c91cbc686c20a1ee190ed05d37e237462bcade4
+  data.tar.gz: 4e40a8e77aa18c7c650b8e7eb134834548a6e4d8de414c29f3cbf07336e08f98
 SHA512:
-  metadata.gz: 25a80f9a800788bb55dcfd6d44bf991b6bcf8ae25a11d4a5aa539b8db3154d0351107a990ca8844096d59a7bb4405979e52e4d8c8a0e1efc132dedbebfe2a412
-  data.tar.gz: 8efd86df8d48b449a15921f8acddd728b957e677840180111614d8680fb0c08c723b8533a110d7da13b5e126121eba73a9de5f18ff93ec49fd91864ef92221c5
+  metadata.gz: a42817c825294cdf7446c52f1e091b4e808973aba691f07b7d0d8f6e7ebfd51ffc56e2ae3ef58f2ebef15fd3c8e32028e840c878371e50cb21db6d7f8088b693
+  data.tar.gz: f73775c91a7bdcf29be33684066f7b3c17a9d21035cd40f8365d7cf18cb400cefe67846abc84fe232a82828e6bbcb289b6db8d8e2e90890befdd9dc23a7bae32

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

@@ -8,7 +8,7 @@ module Dscf
       def model_params
         params.require(:sub_supplier).permit(
           :business_name, :contact_person_name, :contact_person_phone,
-          :city, :sub_city, :woreda, :supplier_id, :business_license
+          :city, :sub_city, :woreda, :business_license
         )
       end
     end

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

@@ -1,7 +1,10 @@
 module Dscf::Marketplace
   class SubSupplier < ApplicationRecord
-    # Associations
-    belongs_to :supplier, class_name: "Dscf::Marketplace::Supplier"
+    include Dscf::Marketplace::AttachmentUrls
+
+    # Sub-suppliers are independent, offline entities the aggregator manages
+    # directly — never linked to a Supplier. (Requirements doc: sub-suppliers
+    # "don't act directly on the system"; see AggregatorListing#confirming_business.)
 
     # Active Storage
     has_one_attached :business_license
@@ -16,17 +19,18 @@ module Dscf::Marketplace
     validates :city, presence: true
     validates :code, presence: true, uniqueness: true
 
-    # Scopes
-    scope :by_supplier, ->(id) { where(supplier_id: id) }
-
     # Ransack
     def self.ransackable_attributes(_auth_object = nil)
-      %w[id supplier_id business_name contact_person_name contact_person_phone
+      %w[id business_name contact_person_name contact_person_phone
          city sub_city woreda code created_at updated_at]
     end
 
     def self.ransackable_associations(_auth_object = nil)
-      %w[supplier business_license_attachment business_license_blob]
+      %w[business_license_attachment business_license_blob]
+    end
+
+    def business_license_url
+      attachment_url_for(business_license)
     end
 
     private

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

@@ -2,13 +2,11 @@ module Dscf
   module Marketplace
     class SubSupplierSerializer < ActiveModel::Serializer
       attributes :id, :code, :business_name, :contact_person_name, :contact_person_phone,
-                 :city, :sub_city, :woreda, :supplier_id, :business_license_url,
+                 :city, :sub_city, :woreda, :business_license_url,
                  :created_at, :updated_at
 
       def business_license_url
-        return nil unless object.business_license.attached?
-
-        Rails.application.routes.url_helpers.rails_storage_proxy_url(object.business_license, only_path: true)
+        object.business_license_url
       end
     end
   end

data/db/migrate/20260709000001_remove_supplier_from_dscf_marketplace_sub_suppliers.rb

@@ -0,0 +1,10 @@
+class RemoveSupplierFromDscfMarketplaceSubSuppliers < ActiveRecord::Migration[8.0]
+  def change
+    # Sub-suppliers are never linked to a supplier — that relationship was
+    # modeled by mistake; sub-suppliers are independent, offline entities the
+    # aggregator manages directly (see AggregatorListing#confirming_business).
+    remove_reference :dscf_marketplace_sub_suppliers, :supplier,
+                      foreign_key: {to_table: :dscf_marketplace_suppliers},
+                      index: {name: "supplier_on_dm_sub_suppliers_indx"}
+  end
+end

data/lib/dscf/marketplace/version.rb

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

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

@@ -6,6 +6,5 @@ FactoryBot.define do
     city { Faker::Address.city }
     sub_city { Faker::Address.community }
     woreda { Faker::Address.street_name }
-    association :supplier, factory: :dscf_marketplace_supplier
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.13.11
+  version: 0.13.12
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2026-07-08 00:00:00.000000000 Z
+date: 2026-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -600,6 +600,7 @@ files:
 - db/migrate/20260704000002_create_dscf_marketplace_otp_verifications.rb
 - db/migrate/20260708000001_make_retailer_tin_number_optional.rb
 - db/migrate/20260708000002_make_product_gross_weight_optional.rb
+- db/migrate/20260709000001_remove_supplier_from_dscf_marketplace_sub_suppliers.rb
 - db/seeds.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb