dscf-marketplace 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cde6c4e0be884ac22882a61a3e8e0dbe2e195905a18ec4daf22733c581c0c23d
-  data.tar.gz: dbffce607b9df1020c5ea3d2a7d6b23cabe97ee22f2d8e36795d0fb0f5694da3
+  metadata.gz: 796eeeaf3921a9ddb0e478285af2b644a972cb51a53231a39e7062e7c4b53f0a
+  data.tar.gz: af123ae47644fd07cca78b7e3b4907ef79d530cf96dff069338499ebf908cd0e
 SHA512:
-  metadata.gz: 48d49e3eaf3840f63fdf72cc26487fbefe607023a749a6a12b2d48d6a3dce2145ca6fcdaf54138b3c924d98ab462c9779810455fd0cb7949476ce4e5bbc16fb7
-  data.tar.gz: 2252875018cea0d8272f4860090cb27175c20ce9986997d3846163db59484bf3024af348a9c7e1a4ac8d6f04c79e1ce3f90e8f254babced1b6aa283c92970972
+  metadata.gz: d6aa7f04ccb27eb52e027c68a72c429cfdf793d9c7dfde195851b868e6a69296e6328000eed13fd12075dd18ef76f164f6d7a8deee69a1dc31869f809c30da79
+  data.tar.gz: 9a4653a2bbd5b67779a5180ea2dc660971e50485ed6224d86f7904079bdc1302bd6c26bb2c8006761c22f43b9e0f5e335c15db9bbfff8ed6098b83f51a5b9fdc

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

@@ -0,0 +1,40 @@
+module Dscf
+  module Marketplace
+    class Unit < ApplicationRecord
+      enum :unit_type, {
+        weight: 0,
+        volume: 1,
+        quantity: 2,
+        dimension: 3,
+        area: 4,
+        other: 5
+      }
+
+      has_many :unit_conversions, class_name: "Dscf::Marketplace::UnitConversion", foreign_key: :from_unit_id
+      has_many :products, class_name: "Dscf::Marketplace::Product"
+      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"
+
+      validates :code, presence: true, uniqueness: true, length: {maximum: 10}
+      validates :name, presence: true, length: {maximum: 50}
+      validates :unit_type, presence: true
+
+      scope :by_type, ->(type) { where(unit_type: unit_types[type]) }
+
+      def display_name
+        "#{name} (#{code})"
+      end
+
+      def convertible_to?(other_unit)
+        return false if other_unit.nil?
+        return true if id == other_unit.id
+
+        unit_conversions.exists?(to_unit: other_unit) ||
+          other_unit.unit_conversions.exists?(to_unit: self)
+      end
+    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/20250827182550_create_dscf_marketplace_units.rb

@@ -0,0 +1,17 @@
+class CreateDscfMarketplaceUnits < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_units do |t|
+      t.string :code, null: false, limit: 10
+      t.string :name, null: false, limit: 50
+      t.integer :unit_type, null: false
+
+      t.timestamps
+    end
+
+    add_index :dscf_marketplace_units, :code,
+              unique: true,
+              name: "code_on_dm_units_indx"
+    add_index :dscf_marketplace_units, :unit_type,
+              name: "unit_type_on_dm_units_indx"
+  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/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.1.1".freeze
+    VERSION = "0.1.3".freeze
   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

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :dscf_marketplace_unit, class: "Dscf::Marketplace::Unit" do
+    sequence(:code) { |n| "unit#{n}" }
+    sequence(:name) { |n| "Unit #{n}" }
+    unit_type { :quantity }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Asrat
@@ -197,20 +197,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: active_storage_validations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: brakeman
   requirement: !ruby/object:Gem::Requirement
@@ -225,20 +211,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.1'
-- !ruby/object:Gem::Dependency
-  name: bullet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: database_cleaner-active_record
   requirement: !ruby/object:Gem::Requirement
@@ -450,14 +422,20 @@ 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/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
 - 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/unit_conversions.rb
+- spec/factories/dscf/marketplace/units.rb
 homepage: https://mksaddis.com/
 licenses:
 - MIT
@@ -471,7 +449,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:
   - - ">="