dscf-marketplace 0.16.2 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be5ac84a6073e85553af278f37aed96cab1d39d3284817361e76060ca789f638
-  data.tar.gz: 2dfbf53884b07ea2e894e46b8dc3c99f8843b997ff6174a9a154ee1299ce6993
+  metadata.gz: 83971fbd3793351ab03991240943191a793a6e77ca81ab81672384a19c8fb176
+  data.tar.gz: e199d4d635856cdec45f68c10a2cdf8cbd0964aef04b3cd6691af21c3b473b8e
 SHA512:
-  metadata.gz: 3e6c001c6f0af07cda0207acda610c20cb6eabd41c2a3fd24f8c4ea026c46e1b0dc8b6c7a84b5d3fcf22ec4b0bf974c434cdfe668a50049d4320260005d2b34c
-  data.tar.gz: 5115dad31f5607464892aea0b3dbee5d6761b84f21c81e26cc73febe091a13a1c7358911f89b21c37c618f78cbbd5f32a437ea131627502ae0872f5be486a538
+  metadata.gz: 173d35332f91c1b9bdba15b1a7b0be9b8d2d0eb407bd9c6a93e7598552d75904e05e7a8eab3a312a792f03ddc87aa9375b61a6b436d527f1a00458142efc9e69
+  data.tar.gz: 438054a1bc9e478185960e1aea04757dee9f4ab9246b041a7712d53bb392dee0ad0de180f995731dc20ed410c5a1281f9719eb3e88b0c9040ed0518714b7ce78

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

@@ -7,40 +7,21 @@ module Dscf
       skip_before_action :authenticate_user, only: [ :register ]
 
       def register
-        ActiveRecord::Base.transaction do
-          user = Dscf::Core::User.new(
-            phone: registration_params[:phone],
-            password: registration_params[:password],
-            password_confirmation: registration_params[:password_confirmation]
-          )
-
-          # `authenticate_user` is skipped for this action so self-service
-          # registration stays public, but `current_user` still resolves
-          # whatever Bearer token was sent — an agent onboarding a retailer
-          # on their behalf attaches their own token, so we derive the
-          # onboarding agent from it rather than trusting a client-supplied
-          # agent_id. Guard on current_user first: `find_by(user_id: nil)`
-          # matches any Agent row with a null user_id, which silently
-          # attributed every anonymous self-signup to a random agent.
-          onboarding_agent = current_user && Dscf::Marketplace::Agent.find_by(user_id: current_user.id)
-
-          retailer = Dscf::Marketplace::Retailer.new(
-            name: registration_params[:name],
-            phone: registration_params[:phone],
-            tin_number: registration_params[:tin_number],
-            location: registration_params[:location],
-            status: :active,
-            agent: onboarding_agent,
-            onboarded_at: (Time.current if onboarding_agent)
-          )
-
-          user.save!
-          assign_default_role(user, "RETAILER")
-          retailer.user = user
-          retailer.save!
+        registration = Dscf::Marketplace::Retailer::Registration.new(
+          user_attributes: user_registration_params,
+          retailer_attributes: retailer_registration_params,
+          address_attributes: address_registration_params,
+          actor: current_user,
+          obsolete_profile_address: obsolete_profile_address?
+        ).create!
 
-          render_success("retailers.success.register", data: retailer, status: :created)
-        end
+        render_success(
+          "retailers.success.register",
+          data: registration.retailer,
+          status: :created
+        )
+      rescue Dscf::Marketplace::Retailer::Registration::InvalidInput => e
+        render_error("retailers.errors.register", errors: e.errors, status: :unprocessable_entity)
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved => e
         errors = e.respond_to?(:record) && e.record ? e.record.errors.full_messages : [ e.message ]
         render_error("retailers.errors.register", errors: errors, status: :unprocessable_entity)
@@ -63,15 +44,43 @@ module Dscf
 
       def model_params
         params.require(:retailer).permit(
-          :name, :phone, :tin_number, :location, :agent_id
+          :name, :phone, :tin_number, :location, :agent_id, :branch_count,
+          preferred_category_ids: []
         )
       end
 
-      def registration_params
+      def retailer_registration_params
         params.require(:retailer).permit(
-          :name, :phone, :tin_number, :location, :password, :password_confirmation
+          :name, :phone, :tin_number, :location, :branch_count,
+          preferred_category_ids: []
+        )
+      end
+
+      def user_registration_params
+        if params[:user].present?
+          params.require(:user).permit(
+            :email, :phone, :password, :password_confirmation, :temp_password,
+            user_profile_attributes: %i[first_name last_name gender date_of_birth]
+          )
+        else
+          legacy = params.require(:retailer).permit(
+            :phone, :password, :password_confirmation
+          )
+
+          legacy.slice(:phone, :password, :password_confirmation)
+        end
+      end
+
+      def address_registration_params
+        params.fetch(:address, {}).permit(
+          :country, :city, :sub_city, :woreda, :kebele,
+          :house_numbers, :po_box, :latitude, :longitude
         )
       end
+
+      def obsolete_profile_address?
+        params.dig(:user, :user_profile_attributes)&.key?(:address)
+      end
     end
   end
 end

data/app/models/dscf/marketplace/retailer/registration.rb

@@ -0,0 +1,155 @@
+module Dscf
+  module Marketplace
+    class Retailer
+      class Registration
+        include Dscf::Core::RoleAssignable
+
+        class InvalidInput < StandardError
+          attr_reader :errors
+
+          def initialize(*errors)
+            @errors = errors.flatten
+            super(@errors.join(", "))
+          end
+        end
+
+        attr_reader :user, :retailer, :address
+
+        def initialize(user_attributes:, retailer_attributes:, address_attributes: {}, actor: nil,
+                       obsolete_profile_address: false)
+          @user_attributes = user_attributes.to_h.deep_symbolize_keys
+          @retailer_attributes = retailer_attributes.to_h.deep_symbolize_keys
+          @address_attributes = address_attributes.to_h.deep_symbolize_keys
+          @actor = actor
+          @obsolete_profile_address = obsolete_profile_address
+        end
+
+        def create!
+          validate_obsolete_profile_address!
+          validate_phone!
+
+          coordinates = registration_coordinates
+          categories = preferred_categories
+
+          ActiveRecord::Base.transaction do
+            @user = Dscf::Core::User.create!(@user_attributes)
+            assign_default_role(@user, "RETAILER")
+            @retailer = create_retailer!(coordinates)
+            @address = create_address!(coordinates)
+            @retailer.preferred_categories = categories
+          end
+
+          self
+        end
+
+        private
+
+        def validate_obsolete_profile_address!
+          return unless @obsolete_profile_address
+
+          raise InvalidInput,
+                "user.user_profile_attributes.address is unsupported; send a top-level address object"
+        end
+
+        def validate_phone!
+          user_phone = @user_attributes[:phone].presence
+          retailer_phone = @retailer_attributes[:phone].presence
+
+          raise InvalidInput, "user.phone is required for retailer registration" unless user_phone
+          return unless retailer_phone && retailer_phone != user_phone
+
+          raise InvalidInput, "retailer.phone must match user.phone"
+        end
+
+        def registration_coordinates
+          @address_attributes.present? ? coordinates_from_address : coordinates_from_location
+        end
+
+        def coordinates_from_address
+          latitude = @address_attributes[:latitude]
+          longitude = @address_attributes[:longitude]
+
+          unless latitude.is_a?(Numeric) && longitude.is_a?(Numeric)
+            raise InvalidInput, "address.latitude and address.longitude must both be numeric"
+          end
+
+          validate_coordinates!(latitude.to_d, longitude.to_d)
+        end
+
+        def coordinates_from_location
+          location = @retailer_attributes[:location].to_s
+          parts = location.split(",", -1).map(&:strip)
+
+          unless parts.size == 2 && parts.all? { |part| decimal_string?(part) }
+            raise InvalidInput, "retailer.location must be a valid \"latitude,longitude\" pair"
+          end
+
+          validate_coordinates!(BigDecimal(parts.first), BigDecimal(parts.last))
+        end
+
+        def decimal_string?(value)
+          value.match?(/\A[+-]?(?:\d+(?:\.\d+)?|\.\d+)\z/)
+        end
+
+        def validate_coordinates!(latitude, longitude)
+          errors = []
+          errors << "latitude must be between -90 and 90 and cannot be zero" unless latitude.between?(-90, 90) && !latitude.zero?
+          errors << "longitude must be between -180 and 180 and cannot be zero" unless longitude.between?(-180, 180) && !longitude.zero?
+          raise InvalidInput, errors if errors.any?
+
+          {latitude: latitude, longitude: longitude}
+        end
+
+        def preferred_categories
+          ids = Array(@retailer_attributes.delete(:preferred_category_ids)).compact.map do |id|
+            Integer(id, exception: false)
+          end
+
+          raise InvalidInput, "preferred_category_ids must contain integers" if ids.any?(&:nil?)
+
+          ids = ids.uniq
+          categories = Dscf::Marketplace::Category.where(id: ids).index_by(&:id)
+          missing_ids = ids - categories.keys
+          raise InvalidInput, "Unknown preferred category ids: #{missing_ids.join(", ")}" if missing_ids.any?
+
+          ids.map { |id| categories.fetch(id) }
+        end
+
+        def create_retailer!(coordinates)
+          agent = @actor && Dscf::Marketplace::Agent.find_by(user_id: @actor.id)
+
+          Dscf::Marketplace::Retailer.create!(
+            @retailer_attributes.except(:preferred_category_ids).merge(
+              phone: @user.phone,
+              location: format_location(coordinates),
+              status: :active,
+              user: @user,
+              agent: agent,
+              onboarded_at: (Time.current if agent)
+            )
+          )
+        end
+
+        def create_address!(coordinates)
+          permitted_attributes = @address_attributes.slice(
+            :country, :city, :sub_city, :woreda, :kebele, :house_numbers, :po_box
+          )
+
+          Dscf::Core::Address.create!(
+            permitted_attributes.merge(
+              user: @user,
+              address_type: :shipping,
+              country: permitted_attributes[:country].presence || "Ethiopia",
+              latitude: coordinates[:latitude],
+              longitude: coordinates[:longitude]
+            )
+          )
+        end
+
+        def format_location(coordinates)
+          "#{coordinates[:latitude].to_s("F")},#{coordinates[:longitude].to_s("F")}"
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,12 @@ module Dscf::Marketplace
     # Associations
     belongs_to :user, class_name: "Dscf::Core::User", optional: true
     belongs_to :agent, class_name: "Dscf::Marketplace::Agent", optional: true
+    has_many :retailer_category_preferences,
+             class_name: "Dscf::Marketplace::RetailerCategoryPreference",
+             dependent: :destroy
+    has_many :preferred_categories,
+             through: :retailer_category_preferences,
+             source: :category
 
     # Enums
     enum :status, {active: 0, inactive: 1, suspended: 2}, default: :active
@@ -12,13 +18,18 @@ module Dscf::Marketplace
     validates :phone, presence: true
     # TIN is optional — retailers onboarded in the field may not have one yet.
     validates :location, presence: true
+    validates :branch_count, numericality: {only_integer: true, greater_than: 0}, allow_nil: true
 
     # Scopes
     scope :by_agent, ->(id) { where(agent_id: id) }
 
     # Ransack
     def self.ransackable_attributes(_auth_object = nil)
-      %w[id name phone tin_number location status agent_id onboarded_at created_at updated_at]
+      %w[id name phone tin_number location status agent_id branch_count onboarded_at created_at updated_at]
+    end
+
+    def shipping_address
+      user&.addresses&.shipping&.order(:id)&.first
     end
   end
 end

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

@@ -0,0 +1,10 @@
+module Dscf
+  module Marketplace
+    class RetailerCategoryPreference < ApplicationRecord
+      belongs_to :retailer, class_name: "Dscf::Marketplace::Retailer"
+      belongs_to :category, class_name: "Dscf::Marketplace::Category"
+
+      validates :category_id, uniqueness: {scope: :retailer_id}
+    end
+  end
+end

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

@@ -2,9 +2,11 @@ module Dscf
   module Marketplace
     class RetailerSerializer < ActiveModel::Serializer
       attributes :id, :name, :phone, :tin_number, :location, :status,
-                 :agent_id, :onboarded_at, :created_at, :updated_at
+                 :agent_id, :branch_count, :preferred_category_ids,
+                 :onboarded_at, :created_at, :updated_at
 
       belongs_to :agent
+      has_one :shipping_address, serializer: Dscf::Core::AddressSerializer
     end
   end
 end

data/db/migrate/20260730000001_add_registration_details_to_dscf_marketplace_retailers.rb

@@ -0,0 +1,26 @@
+class AddRegistrationDetailsToDscfMarketplaceRetailers < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_marketplace_retailers, :branch_count, :integer
+    add_check_constraint :dscf_marketplace_retailers,
+                         "branch_count IS NULL OR branch_count > 0",
+                         name: "retailers_branch_count_positive"
+
+    create_table :dscf_marketplace_retailer_category_preferences do |t|
+      t.references :retailer,
+                   null: false,
+                   index: {name: "retailer_on_dm_category_preferences_idx"},
+                   foreign_key: {to_table: :dscf_marketplace_retailers}
+      t.references :category,
+                   null: false,
+                   index: {name: "category_on_dm_retailer_preferences_idx"},
+                   foreign_key: {to_table: :dscf_marketplace_categories}
+
+      t.timestamps
+    end
+
+    add_index :dscf_marketplace_retailer_category_preferences,
+              %i[ retailer_id category_id ],
+              unique: true,
+              name: "unique_dm_retailer_category_preferences_idx"
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.16.2".freeze
+    VERSION = "0.17.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.17.0
 platform: ruby
 authors:
 - Asrat
@@ -35,14 +35,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.15
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
@@ -467,6 +467,8 @@ files:
 - app/models/dscf/marketplace/quotation_item.rb
 - app/models/dscf/marketplace/request_for_quotation.rb
 - app/models/dscf/marketplace/retailer.rb
+- app/models/dscf/marketplace/retailer/registration.rb
+- app/models/dscf/marketplace/retailer_category_preference.rb
 - app/models/dscf/marketplace/rfq_item.rb
 - app/models/dscf/marketplace/sub_supplier.rb
 - app/models/dscf/marketplace/sub_supplier_product.rb
@@ -537,7 +539,6 @@ files:
 - config/environments/production.rb
 - config/locales/en.yml
 - config/routes.rb
-- db/antigravity_seeds.rb
 - db/demo_seeds.rb
 - db/migrate/20250827172043_create_dscf_marketplace_categories.rb
 - db/migrate/20250827173526_update_dscf_marketplace_categories_indexes.rb
@@ -602,6 +603,7 @@ files:
 - db/migrate/20260708000002_make_product_gross_weight_optional.rb
 - db/migrate/20260709000001_remove_supplier_from_dscf_marketplace_sub_suppliers.rb
 - db/migrate/20260725000001_add_parent_order_to_dscf_marketplace_orders.rb
+- db/migrate/20260730000001_add_registration_details_to_dscf_marketplace_retailers.rb
 - db/seeds.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb

data/db/antigravity_seeds.rb

@@ -1,274 +0,0 @@
-# ════════════════════════════════════════════════════════════════════════════
-# ANTIGRAVITY SEEDS — Clean, collision-free, and fully idempotent demo data
-# ════════════════════════════════════════════════════════════════════════════
-# NOTE: This script does NOT delete any existing tables or database records.
-# It safely finds-or-creates our custom test ecosystem.
-
-puts "🌱 Initializing Antigravity test data safely..."
-
-# ── 1. Find Existing Super Admin ──
-admin = Dscf::Core::User.find_by(email: "admin@dscf.com")
-unless admin
-  puts "❌ admin@dscf.com not found! Creating default admin as fallback..."
-  admin = Dscf::Core::User.create!(
-    email: "admin@dscf.com",
-    phone: "+251999000000",
-    password: "Admin@2024",
-    verified_at: Time.current,
-    temp_password: false
-  )
-end
-
-sa_role = Dscf::Core::Role.find_or_create_by!(code: "SUPER_ADMIN") { |r| r.name = "Super Admin"; r.active = true }
-Dscf::Core::UserRole.find_or_create_by!(user: admin, role: sa_role)
-
-# Ensure SUPER_ADMIN has basic orders permissions
-orders_perms = Dscf::Core::Permission.where(resource: "orders")
-orders_perms.each do |perm|
-  Dscf::Core::RolePermission.find_or_create_by!(role: sa_role, permission: perm)
-end
-puts "✅ Super Admin configured."
-
-# ── 2. Find or Create Custom Antigravity Users safely ──
-retailer_user = Dscf::Core::User.find_by(email: "antigravity.retailer@example.com")
-unless retailer_user
-  phone = "+251977111111"
-  # Avoid phone collisions if already taken
-  while Dscf::Core::User.exists?(phone: phone)
-    phone = "+251977111#{rand(100..999)}"
-  end
-  
-  retailer_user = Dscf::Core::User.create!(
-    email: "antigravity.retailer@example.com",
-    phone: phone,
-    password: "password",
-    verified_at: Time.current,
-    temp_password: false
-  )
-end
-
-supplier_user = Dscf::Core::User.find_by(email: "antigravity.supplier@example.com")
-unless supplier_user
-  phone = "+251977222222"
-  # Avoid phone collisions if already taken
-  while Dscf::Core::User.exists?(phone: phone)
-    phone = "+251977222#{rand(100..999)}"
-  end
-  
-  supplier_user = Dscf::Core::User.create!(
-    email: "antigravity.supplier@example.com",
-    phone: phone,
-    password: "password",
-    verified_at: Time.current,
-    temp_password: false
-  )
-end
-
-# Assign default USER role
-user_role = Dscf::Core::Role.find_or_create_by!(code: "USER") { |r| r.name = "User"; r.active = true }
-Dscf::Core::UserRole.find_or_create_by!(user: retailer_user, role: user_role)
-Dscf::Core::UserRole.find_or_create_by!(user: supplier_user, role: user_role)
-
-# Assign marketplace permissions to USER role
-Dscf::Core::Permission.where(engine: "dscf-marketplace").find_each do |perm|
-  Dscf::Core::RolePermission.find_or_create_by!(role: user_role, permission: perm)
-end
-
-puts "✅ Custom users verified/created."
-
-# ── 3. Find or Create Custom Businesses safely ──
-bt_manufacturer = Dscf::Core::BusinessType.find_or_create_by!(name: "Manufacturer")
-bt_retailer = Dscf::Core::BusinessType.find_or_create_by!(name: "Retailer")
-
-retailer_biz = Dscf::Core::Business.find_by(tin_number: "TIN-AG-RET-001")
-unless retailer_biz
-  phone = "+251977111112"
-  while Dscf::Core::Business.exists?(contact_phone: phone)
-    phone = "+251977111#{rand(100..999)}"
-  end
-  
-  retailer_biz = Dscf::Core::Business.create!(
-    name: "Antigravity Supermarket",
-    user: retailer_user,
-    business_type: bt_retailer,
-    contact_phone: phone,
-    description: "Antigravity Premium Retailer Store",
-    tin_number: "TIN-AG-RET-001"
-  )
-end
-
-supplier_biz = Dscf::Core::Business.find_by(tin_number: "TIN-AG-SUP-001")
-unless supplier_biz
-  phone = "+251977222223"
-  while Dscf::Core::Business.exists?(contact_phone: phone)
-    phone = "+251977222#{rand(100..999)}"
-  end
-  
-  supplier_biz = Dscf::Core::Business.create!(
-    name: "Antigravity Coffee & Textile Wholesaler",
-    user: supplier_user,
-    business_type: bt_manufacturer,
-    contact_phone: phone,
-    description: "Premium Antigravity Wholesaler Export",
-    tin_number: "TIN-AG-SUP-001"
-  )
-end
-
-aggregator_biz = Dscf::Core::Business.find_by(tin_number: "TIN-AG-AGG-001")
-unless aggregator_biz
-  phone = "+251977333333"
-  while Dscf::Core::Business.exists?(contact_phone: phone)
-    phone = "+251977333#{rand(100..999)}"
-  end
-  
-  aggregator_biz = Dscf::Core::Business.create!(
-    name: "Antigravity Aggregators",
-    user: admin,
-    business_type: bt_manufacturer,
-    contact_phone: phone,
-    description: "Official Antigravity Marketplace Aggregator Hub",
-    tin_number: "TIN-AG-AGG-001"
-  )
-end
-
-puts "✅ Custom businesses verified/created."
-
-# ── 4. Categories & Units ──
-cat_coffee = Dscf::Marketplace::Category.find_or_create_by!(name: "Antigravity Coffee") do |c|
-  c.description = "Specialty roasted Ethiopian coffee"
-end
-
-cat_textile = Dscf::Marketplace::Category.find_or_create_by!(name: "Antigravity Textiles") do |c|
-  c.description = "Premium handwoven fabrics"
-end
-
-u_kg = Dscf::Marketplace::Unit.find_or_create_by!(code: "KG") do |u|
-  u.name = "Kilogram"
-  u.unit_type = :weight
-end
-
-u_meter = Dscf::Marketplace::Unit.find_or_create_by!(code: "M") do |u|
-  u.name = "Meter"
-  u.unit_type = :dimension
-end
-
-puts "✅ Categories & Units verified/created."
-
-# ── 5. Products ──
-p1 = Dscf::Marketplace::Product.find_or_create_by!(sku: "AG-COF-SID") do |p|
-  p.name = "Antigravity Sidamo Roasted Coffee"
-  p.description = "Premium washed Sidamo — Medium Roast"
-  p.category = cat_coffee
-  p.unit = u_kg
-  p.base_quantity = 1.0
-  p.gross_weight = 1.2
-end
-
-p2 = Dscf::Marketplace::Product.find_or_create_by!(sku: "AG-TEX-GAB") do |p|
-  p.name = "Antigravity Traditional Gabi Fabric"
-  p.description = "Handwoven thick cotton Gabi"
-  p.category = cat_textile
-  p.unit = u_meter
-  p.base_quantity = 1.0
-  p.gross_weight = 0.8
-end
-
-puts "✅ Products verified/created."
-
-# ── 6. Supplier Record ──
-supplier_record = Dscf::Marketplace::Supplier.find_or_create_by!(business_id: supplier_biz.id) do |s|
-  s.name = "Antigravity Wholesaler Outlet"
-  s.business_type = :manufacturer
-  s.contact_phone = supplier_biz.contact_phone
-  s.address = "Bole Sub-city, Addis Ababa"
-end
-
-# ── 7. Supplier Products ──
-sp1 = Dscf::Marketplace::SupplierProduct.find_or_create_by!(business_id: supplier_biz.id, product_id: p1.id) do |sp|
-  sp.supplier = supplier_record
-  sp.supplier_price = 400
-  sp.available_quantity = 1000
-  sp.minimum_order_quantity = 5
-  sp.status = :active
-end
-
-sp2 = Dscf::Marketplace::SupplierProduct.find_or_create_by!(business_id: supplier_biz.id, product_id: p2.id) do |sp|
-  sp.supplier = supplier_record
-  sp.supplier_price = 300
-  sp.available_quantity = 500
-  sp.minimum_order_quantity = 2
-  sp.status = :active
-end
-
-puts "✅ Supplier Products verified/created."
-
-# ── 8. Aggregator Listings (Sprint 2 Core Target) ──
-al1 = Dscf::Marketplace::AggregatorListing.find_or_create_by!(aggregator_id: aggregator_biz.id, supplier_product_id: sp1.id) do |al|
-  al.price = 550
-  al.quantity = 200
-  al.status = 0 # active/published
-end
-
-al2 = Dscf::Marketplace::AggregatorListing.find_or_create_by!(aggregator_id: aggregator_biz.id, supplier_product_id: sp2.id) do |al|
-  al.price = 420
-  al.quantity = 150
-  al.status = 0 # active/published
-end
-
-puts "✅ Aggregator Listings verified/created."
-
-# ── 9. Direct Listings ──
-Dscf::Marketplace::Listing.find_or_create_by!(business_id: supplier_biz.id, supplier_product_id: sp1.id) do |l|
-  l.price = 500
-  l.quantity = 300
-  l.status = :active
-  l.description = "Direct Sidamo Roasted Coffee from Antigravity Outlet"
-end
-
-Dscf::Marketplace::Listing.find_or_create_by!(business_id: supplier_biz.id, supplier_product_id: sp2.id) do |l|
-  l.price = 380
-  l.quantity = 200
-  l.status = :active
-  l.description = "Direct Traditional Handwoven Gabi from Antigravity Outlet"
-end
-
-puts "✅ Direct Listings verified/created."
-
-# ── 10. Demo Addresses & Agents ──
-address = Dscf::Core::Address.find_by(user_id: retailer_user.id)
-unless address
-  address = Dscf::Core::Address.create!(
-    user: retailer_user,
-    address_type: :shipping,
-    country: "Ethiopia",
-    city: "Addis Ababa",
-    sub_city: "Bole Sub-city",
-    woreda: "Woreda 03",
-    house_numbers: "Suite 4B"
-  )
-end
-
-agent = Dscf::Marketplace::Agent.find_by(onboarded_by_id: aggregator_biz.id)
-unless agent
-  agent_phone = "+251977444444"
-  while Dscf::Marketplace::Agent.exists?(phone: agent_phone)
-    agent_phone = "+251977444#{rand(100..999)}"
-  end
-  
-  Dscf::Marketplace::Agent.create!(
-    name: "Antigravity Logistics Agent",
-    phone: agent_phone,
-    service_area: "Bole Sub-city",
-    status: :active,
-    verification_status: :verified,
-    onboarded_by: aggregator_biz
-  )
-end
-
-puts "🎉 ALL ANTIGRAVITY SEEDS COMPLETED SUCCESSFULLY WITHOUT DELETING ANY DATA."
-puts "--------------------------------------------------------"
-puts "🔑 CREDENTIALS TO USE:"
-puts "Buyer (Retailer):      antigravity.retailer@example.com / password"
-puts "Supplier (Wholesaler): antigravity.supplier@example.com / password"
-puts "Super Admin:           admin@dscf.com / Admin@2024"
-puts "--------------------------------------------------------"