dscf-marketplace 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82b1976ad1b3d99364b621d51ce06c5ac51e8eb818e10527580419d61f5aeb3d
-  data.tar.gz: 6264cf89e35f2f24cc756f0eeaa48336af30b2e20473bab859453faf3964691e
+  metadata.gz: 60c2cbf7461bd253837b481338ec8105fc47e5ff3927855341efc9261bf193f5
+  data.tar.gz: 3d10a078bab90804d176823e1cf0e44ed74f617ca3f0adeff657339438404642
 SHA512:
-  metadata.gz: 9a4e05d5b18d0bc545d036b9f623eaa65345b3e641cc069a1bde5fc0a7179fa0a0aa7bc4cd2d3243406c32dd4d5e0ee6ed3fbb05133770f9da638161a7a7341d
-  data.tar.gz: 0eaa365be89d92f5320e5a7fca4ee74f300f19b4c5ad325740428bf456126cad807f9fbc700565262c289a912c2fe23661246308b9c9a192631a3a4388d9211d
+  metadata.gz: 96051d9c835dc17d0f8c7b495c28dd48b2b45a9690711be8d9a5650f6f36643498605d4d8bfdeaf6df6a7cea2f04567b6aff8479a444c525fb68ddbc60ebf41b
+  data.tar.gz: 6e35c21f3b43d962d838b1f5bbfb577db65e2c004c0665e340356994a93fb1e89d594d02358209af2670a6ea8638fc909347f80a8cbdd470e40d975520433af1

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

@@ -0,0 +1,105 @@
+module Dscf::Marketplace
+  class Order < ApplicationRecord
+    enum :order_type, {rfq_based: 0, direct_listing: 1}
+    enum :status, {pending: 0, confirmed: 1, processing: 2, completed: 3, cancelled: 4}
+
+    belongs_to :quotation, optional: true
+    belongs_to :listing, optional: true
+    belongs_to :user, class_name: "Dscf::Core::User"
+    has_many :order_items, dependent: :destroy
+
+    validates :order_type, presence: true
+    validates :status, presence: true
+    validates :user, presence: true
+    validate :quotation_or_listing_present
+
+    before_save :calculate_total_amount
+
+    def self.create_from_quotation(quotation)
+      return nil unless quotation.accepted?
+
+      order = create!(
+        order_type: :rfq_based,
+        status: :pending,
+        quotation: quotation,
+        user: quotation.request_for_quotation.user,
+        total_amount: quotation.total_price
+      )
+
+      quotation.quotation_items.each do |item|
+        order.order_items.create!(
+          quotation_item: item,
+          product: item.product,
+          unit: item.unit,
+          quantity: item.quantity,
+          unit_price: item.unit_price,
+          status: :pending
+        )
+      end
+
+      order
+    end
+
+    def self.create_from_listing(listing, user, quantity)
+      return nil unless listing.status == "active" && quantity <= listing.quantity
+
+      order = create!(
+        order_type: :direct_listing,
+        status: :pending,
+        listing: listing,
+        user: user,
+        total_amount: listing.price * quantity
+      )
+
+      order.order_items.create!(
+        listing: listing,
+        product: listing.supplier_product.product,
+        unit: listing.supplier_product.product.unit,
+        quantity: quantity,
+        unit_price: listing.price,
+        status: :pending
+      )
+
+      order
+    end
+
+    def total_amount
+      # Return stored value if it exists and is greater than 0, otherwise calculate
+      stored_value = super
+      calculated_value = order_items.sum { |item| item.quantity * item.unit_price }
+
+      # Return stored value if it's set and valid, otherwise return calculated value
+      return stored_value if stored_value.present? && stored_value > 0
+      calculated_value
+    end
+
+    def supplier
+      if rfq_based?
+        quotation&.business
+      elsif direct_listing?
+        listing&.business
+      end
+    end
+
+    def confirm!
+      return false unless pending?
+
+      update!(status: :confirmed)
+      # Update order items without reloading to avoid association issues
+      order_items.update_all(status: OrderItem.statuses[:confirmed])
+      true
+    end
+
+    def calculate_total_amount
+      self.total_amount = order_items.sum { |item| item.quantity * item.unit_price }
+    end
+
+    private
+
+    def quotation_or_listing_present
+      unless quotation.present? || listing.present?
+        errors.add(:base, "Either quotation or listing must be present")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Dscf::Marketplace
+  class OrderItem < ApplicationRecord
+    enum :status, {pending: 0, confirmed: 1, processing: 2, fulfilled: 3, cancelled: 4}
+
+    belongs_to :order, optional: true
+    belongs_to :quotation_item, optional: true
+    belongs_to :listing, optional: true
+    belongs_to :product
+    belongs_to :unit
+
+    validates :quantity, presence: true, numericality: {greater_than: 0}
+    validates :unit_price, presence: true, numericality: {greater_than_or_equal_to: 0}
+    validates :status, presence: true
+    validates :product, presence: true
+    validates :unit, presence: true
+    validate :quotation_item_or_listing_present
+
+    def subtotal
+      quantity * unit_price
+    end
+
+    private
+
+    def quotation_item_or_listing_present
+      unless quotation_item.present? || listing.present?
+        errors.add(:base, "Either quotation_item or listing must be present")
+      end
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ module Dscf
       belongs_to :business, class_name: "Dscf::Core::Business", optional: true if defined?(Dscf::Core)
 
       has_many :quotation_items, class_name: "Dscf::Marketplace::QuotationItem", dependent: :destroy
+      has_one :order, class_name: "Dscf::Marketplace::Order", dependent: :destroy
 
       validates :request_for_quotation_id, presence: true
       validates :business_id, presence: true
@@ -79,9 +80,19 @@ module Dscf
 
         update_columns(status: "accepted")
         request_for_quotation.update!(status: "selected", selected_quotation: self)
+
+        # Create order from accepted quotation
+        create_order_from_quotation
+
         true
       end
 
+      def create_order_from_quotation
+        return if order.present?
+
+        Order.create_from_quotation(self)
+      end
+
       def reject!
         return false unless sent?
 
@@ -113,6 +124,32 @@ module Dscf
         quotation_items.exists? && quotation_items.all? { |item| item.unit_price.present? }
       end
 
+      def create_order_from_quotation
+        return if order.present?
+
+        order = Dscf::Marketplace::Order.create!(
+          order_type: :rfq_based,
+          status: :pending,
+          quotation: self,
+          user: request_for_quotation.user,
+          total_amount: total_price
+        )
+
+        quotation_items.each do |item|
+          Dscf::Marketplace::OrderItem.create!(
+            order: order,
+            quotation_item: item,
+            product: item.product,
+            unit: item.unit,
+            quantity: item.quantity,
+            unit_price: item.unit_price,
+            status: :pending
+          )
+        end
+
+        order
+      end
+
       private
 
       def calculate_total_price

data/db/migrate/20250828115509_create_dscf_marketplace_orders.rb

@@ -0,0 +1,19 @@
+class CreateDscfMarketplaceOrders < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_orders do |t|
+      t.integer :order_type
+      t.integer :status
+      t.references :quotation, null: true, foreign_key: {to_table: :dscf_marketplace_quotations}
+      t.references :listing, null: true, foreign_key: {to_table: :dscf_marketplace_listings}
+      t.references :user, null: false, foreign_key: {to_table: :dscf_core_users}
+      t.decimal :total_amount
+
+      t.timestamps
+    end
+
+    add_index :dscf_marketplace_orders, :user_id, name: "user_id_on_dm_orders_idx"
+    add_index :dscf_marketplace_orders, :quotation_id, name: "quotation_id_on_dm_orders_idx"
+    add_index :dscf_marketplace_orders, :listing_id, name: "listing_id_on_dm_orders_idx"
+    add_index :dscf_marketplace_orders, :status, name: "status_on_dm_orders_idx"
+  end
+end

data/db/migrate/20250828115525_create_dscf_marketplace_order_items.rb

@@ -0,0 +1,22 @@
+class CreateDscfMarketplaceOrderItems < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_order_items do |t|
+      t.references :order, null: false, foreign_key: {to_table: :dscf_marketplace_orders}
+      t.references :quotation_item, null: true, foreign_key: {to_table: :dscf_marketplace_quotation_items}
+      t.references :listing, null: true, foreign_key: {to_table: :dscf_marketplace_listings}
+      t.references :product, null: false, foreign_key: {to_table: :dscf_marketplace_products}
+      t.references :unit, null: false, foreign_key: {to_table: :dscf_marketplace_units}
+      t.decimal :quantity, precision: 15, scale: 6
+      t.decimal :unit_price
+      t.integer :status
+
+      t.timestamps
+    end
+
+    add_index :dscf_marketplace_order_items, :order_id, name: "order_id_on_dm_order_items_idx"
+    add_index :dscf_marketplace_order_items, :quotation_item_id, name: "quotation_item_id_on_dm_order_items_idx"
+    add_index :dscf_marketplace_order_items, :listing_id, name: "listing_id_on_dm_order_items_idx"
+    add_index :dscf_marketplace_order_items, :product_id, name: "product_id_on_dm_order_items_idx"
+    add_index :dscf_marketplace_order_items, :unit_id, name: "unit_id_on_dm_order_items_idx"
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.1.6".freeze
+    VERSION = "0.1.7".freeze
   end
 end

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

@@ -1,10 +1,22 @@
 FactoryBot.define do
-  factory :dscf_marketplace_listing, class: 'Dscf::Marketplace::Listing' do
-    business { create(:dscf_core_business) }
-    supplier_product { create(:dscf_marketplace_supplier_product) }
+  factory :dscf_marketplace_listing, class: "Dscf::Marketplace::Listing" do
+    association :business, factory: :dscf_core_business
+    association :supplier_product, factory: :dscf_marketplace_supplier_product
     price { 500.00 }
     quantity { 100.0 }
     description { "High quality product listing" }
-    status { :draft }
+    # status defaults to :draft from model
+
+    trait :active do
+      status { :active }
+    end
+
+    trait :draft do
+      status { :draft }
+    end
+
+    trait :paused do
+      status { :paused }
+    end
   end
 end

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

@@ -0,0 +1,49 @@
+FactoryBot.define do
+  factory :dscf_marketplace_order_item, class: "Dscf::Marketplace::OrderItem" do
+    # Don't create order by default, let tests specify
+    quantity { 5 }
+    unit_price { 10.0 }
+    status { :pending }
+    quotation_item { nil } # Don't create by default
+    listing { nil } # Don't create by default
+
+    # Set product and unit based on quotation_item or listing
+    after(:build) do |item|
+      if item.quotation_item
+        item.product ||= item.quotation_item.product
+        item.unit ||= item.quotation_item.unit
+      elsif item.listing
+        item.product ||= item.listing.supplier_product.product
+        item.unit ||= item.listing.supplier_product.product.unit
+      else
+        item.product ||= create(:dscf_marketplace_product)
+        item.unit ||= create(:dscf_marketplace_unit)
+      end
+    end
+
+    trait :from_quotation do
+      association :quotation_item, factory: :dscf_marketplace_quotation_item
+    end
+
+    trait :from_listing do
+      association :listing, factory: :dscf_marketplace_listing
+      quotation_item { nil }
+    end
+
+    trait :confirmed do
+      status { :confirmed }
+    end
+
+    trait :processing do
+      status { :processing }
+    end
+
+    trait :fulfilled do
+      status { :fulfilled }
+    end
+
+    trait :cancelled do
+      status { :cancelled }
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+FactoryBot.define do
+  factory :dscf_marketplace_order, class: "Dscf::Marketplace::Order" do
+    order_type { :rfq_based }
+    status { :pending }
+    association :user, factory: :dscf_core_user
+    quotation { nil }
+    listing { nil }
+
+    trait :rfq_based do
+      order_type { :rfq_based }
+      association :quotation, factory: :dscf_marketplace_quotation
+    end
+
+    trait :direct_listing do
+      order_type { :direct_listing }
+      association :listing, factory: :dscf_marketplace_listing
+      quotation { nil }
+    end
+
+    trait :confirmed do
+      status { :confirmed }
+    end
+
+    trait :processing do
+      status { :processing }
+    end
+
+    trait :completed do
+      status { :completed }
+    end
+
+    trait :cancelled do
+      status { :cancelled }
+    end
+  end
+end

data/spec/factories/dscf/marketplace/{dscf/marketplace/quotation_items.rb → quotation_items.rb}

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :dscf_marketplace_quotation_item, class: 'Dscf::Marketplace::QuotationItem' do
+  factory :dscf_marketplace_quotation_item, class: "Dscf::Marketplace::QuotationItem" do
     association :quotation, factory: :dscf_marketplace_quotation
     association :rfq_item, factory: :dscf_marketplace_rfq_item
     product { rfq_item.product }

data/spec/factories/dscf/marketplace/{dscf/marketplace/quotations.rb → quotations.rb}

@@ -1,11 +1,11 @@
 FactoryBot.define do
-  factory :dscf_marketplace_quotation, class: 'Dscf::Marketplace::Quotation' do
+  factory :dscf_marketplace_quotation, class: "Dscf::Marketplace::Quotation" do
     association :request_for_quotation, factory: :dscf_marketplace_request_for_quotation
     association :business, factory: :dscf_core_business
     total_price { nil }
     delivery_date { 5.days.from_now.to_date }
     valid_until { 15.days.from_now }
-    status { "draft" }
+    status { :draft }
     notes { "Sample quotation notes" }
 
     trait :expired do
@@ -15,11 +15,11 @@ FactoryBot.define do
     end
 
     trait :sent do
-      status { "sent" }
+      status { :sent }
     end
 
     trait :accepted do
-      status { "accepted" }
+      status { :accepted }
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-08-28 00:00:00.000000000 Z
+date: 2025-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -423,6 +423,8 @@ files:
 - app/models/dscf/marketplace/application_record.rb
 - app/models/dscf/marketplace/category.rb
 - app/models/dscf/marketplace/listing.rb
+- app/models/dscf/marketplace/order.rb
+- app/models/dscf/marketplace/order_item.rb
 - app/models/dscf/marketplace/product.rb
 - app/models/dscf/marketplace/quotation.rb
 - app/models/dscf/marketplace/quotation_item.rb
@@ -445,6 +447,8 @@ files:
 - db/migrate/20250828090300_create_dscf_marketplace_quotation_items.rb
 - db/migrate/20250828090400_change_rfq_status_to_integer.rb
 - db/migrate/20250828090500_change_quotation_status_to_integer.rb
+- db/migrate/20250828115509_create_dscf_marketplace_orders.rb
+- db/migrate/20250828115525_create_dscf_marketplace_order_items.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
 - lib/dscf/marketplace/version.rb
@@ -453,12 +457,14 @@ files:
 - spec/factories/dscf/core/businesses.rb
 - spec/factories/dscf/core/users.rb
 - spec/factories/dscf/marketplace/categories.rb
-- spec/factories/dscf/marketplace/dscf/marketplace/quotation_items.rb
-- spec/factories/dscf/marketplace/dscf/marketplace/quotations.rb
-- spec/factories/dscf/marketplace/dscf/marketplace/request_for_quotations.rb
-- spec/factories/dscf/marketplace/dscf/marketplace/rfq_items.rb
 - spec/factories/dscf/marketplace/listings.rb
+- spec/factories/dscf/marketplace/order_items.rb
+- spec/factories/dscf/marketplace/orders.rb
 - spec/factories/dscf/marketplace/products.rb
+- spec/factories/dscf/marketplace/quotation_items.rb
+- spec/factories/dscf/marketplace/quotations.rb
+- spec/factories/dscf/marketplace/request_for_quotations.rb
+- spec/factories/dscf/marketplace/rfq_items.rb
 - spec/factories/dscf/marketplace/supplier_products.rb
 - spec/factories/dscf/marketplace/unit_conversions.rb
 - spec/factories/dscf/marketplace/units.rb