dscf-marketplace 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57b94e7df1ac8fe6e08df594a8a5509a16b2b6383071208a636a8981a0a6618a
-  data.tar.gz: 78f4ea4db87b33c9ad5027b40a710f5c5070a928c54f2fd3c351321c378d7ef5
+  metadata.gz: 483c018a55aced4c97a7dc9443c45721ba6571dd16100736e36281349bdb65a3
+  data.tar.gz: 49feba6deeec8f69dd7ad693e61c7f6e8c648480b35a8da2d97acd3ddf9152db
 SHA512:
-  metadata.gz: b0b2b27060010f601b6469c685302927b20d6559d13af18fac98ca6abaf0212a255739c1010952f63aeac14033283199fcfee734fdc97fa81f4b8ccdfa301fa6
-  data.tar.gz: 250396abdd9c4f188a0ecb7be10ff9a9c52aafccb0811201b7d923994b56f3fe2e892a6eb3d9a28261788f9dc04e1eb7e5173a7049c840c77b87b5f2924ced9b
+  metadata.gz: 72d2b07581b5bbc8942c0b133d7a01b81be9238adc3a303a68c60f421a89145cf7d634c07fd77f7f2fa7b637d3ade0dd39f687442d7c678edc22edd52bc9b694
+  data.tar.gz: 4ac74190a143f232210958073b6720c5142da6f15052275121384dd162c08ea93f68f3e86ec59ddc2b161f5e745fdb9a7cc680a6f445d469bacf8b964300d42c

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

@@ -0,0 +1,62 @@
+module Dscf
+  module Marketplace
+    class Product < ApplicationRecord
+      belongs_to :category, class_name: "Dscf::Marketplace::Category"
+      belongs_to :unit, class_name: "Dscf::Marketplace::Unit"
+
+      has_many :supplier_products, class_name: "Dscf::Marketplace::SupplierProduct"
+      has_many :listings, class_name: "Dscf::Marketplace::Listing"
+      has_many :order_items, class_name: "Dscf::Marketplace::OrderItem"
+      has_many :rfq_items, class_name: "Dscf::Marketplace::RfqItem"
+      has_many :quotation_items, class_name: "Dscf::Marketplace::QuotationItem"
+
+      has_one_attached :thumbnail
+      has_many_attached :images
+
+      validates :sku, presence: true, uniqueness: true, length: {maximum: 50}
+      validates :name, presence: true, length: {maximum: 200}
+      validates :description, length: {maximum: 2000}, allow_blank: true
+      validates :category_id, presence: true
+      validates :base_price, presence: true, numericality: {greater_than: 0}
+      validates :business_only, inclusion: {in: [ true, false ]}
+      validates :unit_id, presence: true
+      validates :base_quantity, presence: true, numericality: {greater_than: 0}
+
+      scope :business_only, -> { where(business_only: true) }
+      scope :public_products, -> { where(business_only: false) }
+      scope :by_category, ->(category_id) { where(category_id: category_id) }
+      scope :by_unit, ->(unit_id) { where(unit_id: unit_id) }
+
+      def display_name
+        "#{name} (#{sku})"
+      end
+
+      def price_per_unit
+        return nil unless base_price && base_quantity && base_quantity > 0
+        base_price / base_quantity
+      end
+
+      def category_path
+        return nil unless category
+        category.ancestry_path
+      end
+
+      def convertible_to_units
+        return [] unless unit
+        unit.convertible_units
+      end
+
+      def thumbnail_url
+        return nil unless thumbnail.attached?
+        Rails.application.routes.url_helpers.rails_blob_url(thumbnail, only_path: true)
+      end
+
+      def images_urls
+        return [] unless images.attached?
+        images.map do |image|
+          Rails.application.routes.url_helpers.rails_blob_url(image, only_path: true)
+        end
+      end
+    end
+  end
+end

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

@@ -30,10 +30,10 @@ module Dscf
 
       def convertible_to?(other_unit)
         return false if other_unit.nil?
+        return true if id == other_unit.id
 
-        # NOTE: UnitConversion model not yet implemented
-        # For now, return false - will be implemented when UnitConversion is created
-        false
+        unit_conversions.exists?(to_unit: other_unit) ||
+          other_unit.unit_conversions.exists?(to_unit: self)
       end
     end
   end

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

@@ -0,0 +1,33 @@
+module Dscf
+  module Marketplace
+    class UnitConversion < ApplicationRecord
+      belongs_to :from_unit, class_name: "Dscf::Marketplace::Unit"
+      belongs_to :to_unit, class_name: "Dscf::Marketplace::Unit"
+
+      validates :from_unit_id, presence: true
+      validates :to_unit_id, presence: true
+      validates :conversion_factor, presence: true, numericality: {greater_than: 0}
+      validates :notes, length: {maximum: 500}, allow_blank: true
+
+      validate :units_must_be_different
+
+      def units_must_be_different
+        return unless from_unit_id && to_unit_id
+
+        return unless from_unit_id == to_unit_id
+
+        errors.add(:to_unit_id, "must be different from from_unit")
+      end
+
+      def reverse_conversion_factor
+        return nil unless conversion_factor && conversion_factor != 0
+
+        1.0 / conversion_factor
+      end
+
+      def description
+        "#{from_unit&.display_name} → #{to_unit&.display_name} (×#{conversion_factor})"
+      end
+    end
+  end
+end

data/db/migrate/20250827185656_create_dscf_marketplace_unit_conversions.rb

@@ -0,0 +1,23 @@
+class CreateDscfMarketplaceUnitConversions < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_unit_conversions do |t|
+      t.references :from_unit,
+                   index: {name: "from_unit_on_dm_uc_indx"},
+                   null: false,
+                   foreign_key: {to_table: :dscf_marketplace_units}
+      t.references :to_unit,
+                   index: {name: "to_unit_on_dm_uc_indx"},
+                   null: false,
+                   foreign_key: {to_table: :dscf_marketplace_units}
+      t.decimal :conversion_factor, precision: 15, scale: 6, null: false
+      t.string :notes, limit: 500
+
+      t.timestamps
+    end
+
+    add_index :dscf_marketplace_unit_conversions,
+              %i[from_unit_id to_unit_id],
+              unique: true,
+              name: "unique_unit_conversion_indx"
+  end
+end

data/db/migrate/20250828062945_create_dscf_marketplace_products.rb

@@ -0,0 +1,30 @@
+class CreateDscfMarketplaceProducts < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_products do |t|
+      t.string :sku, null: false, limit: 50
+      t.string :name, null: false, limit: 200
+      t.text :description, limit: 2000
+      t.references :category,
+                   index: {name: "category_on_dm_products_indx"},
+                   null: false,
+                   foreign_key: {to_table: :dscf_marketplace_categories}
+      t.decimal :base_price, precision: 15, scale: 2, null: false
+      t.boolean :business_only, null: false, default: false
+      t.references :unit,
+                   index: {name: "unit_on_dm_products_indx"},
+                   null: false,
+                   foreign_key: {to_table: :dscf_marketplace_units}
+      t.decimal :base_quantity, precision: 15, scale: 6, null: false
+
+      t.timestamps
+    end
+
+    add_index :dscf_marketplace_products, :sku,
+              unique: true,
+              name: "sku_on_dm_products_indx"
+    add_index :dscf_marketplace_products, :business_only,
+              name: "business_only_on_dm_products_indx"
+    add_index :dscf_marketplace_products, [ :category_id, :business_only ],
+              name: "category_business_only_on_dm_products_indx"
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.1.2".freeze
+    VERSION = "0.1.4".freeze
   end
 end

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

@@ -0,0 +1,12 @@
+FactoryBot.define do
+  factory :dscf_marketplace_product, class: 'Dscf::Marketplace::Product' do
+    sequence(:sku) { |n| "PRD-#{n.to_s.rjust(3, '0')}" }
+    sequence(:name) { |n| "Product #{n}" }
+    description { "Product description" }
+    category { create(:dscf_marketplace_category) }
+    base_price { 99.99 }
+    business_only { false }
+    unit { create(:dscf_marketplace_unit) }
+    base_quantity { 1.0 }
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :dscf_marketplace_unit_conversion, class: "Dscf::Marketplace::UnitConversion" do
+    from_unit { create(:dscf_marketplace_unit) }
+    to_unit { create(:dscf_marketplace_unit) }
+    conversion_factor { 1.5 }
+    notes { "Conversion factor description" }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-08-27 00:00:00.000000000 Z
+date: 2025-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -422,16 +422,22 @@ files:
 - app/mailers/dscf/marketplace/application_mailer.rb
 - app/models/dscf/marketplace/application_record.rb
 - app/models/dscf/marketplace/category.rb
+- app/models/dscf/marketplace/product.rb
 - app/models/dscf/marketplace/unit.rb
+- app/models/dscf/marketplace/unit_conversion.rb
 - config/routes.rb
 - db/migrate/20250827172043_create_dscf_marketplace_categories.rb
 - db/migrate/20250827173526_update_dscf_marketplace_categories_indexes.rb
 - db/migrate/20250827182550_create_dscf_marketplace_units.rb
+- db/migrate/20250827185656_create_dscf_marketplace_unit_conversions.rb
+- db/migrate/20250828062945_create_dscf_marketplace_products.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
 - lib/dscf/marketplace/version.rb
 - lib/tasks/dscf/marketplace_tasks.rake
 - spec/factories/dscf/marketplace/categories.rb
+- spec/factories/dscf/marketplace/products.rb
+- spec/factories/dscf/marketplace/unit_conversions.rb
 - spec/factories/dscf/marketplace/units.rb
 homepage: https://mksaddis.com/
 licenses:
@@ -446,7 +452,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="