comee_core 0.1.45.pre3 → 0.1.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdf4d95f06116fc407191db6b1571999c236053b5c9805315cf4858b55c26452
-  data.tar.gz: 6629ed11e8508b32d5b04b5c441caee0437b8ba590307d940442bb92e3dfd599
+  metadata.gz: b627b9c57084edd4b480f661502a765f0988cfca86b25c42691b19d650d5dc5b
+  data.tar.gz: 9f3f4164affa01dc56b3d2f13b8ec9ac2efca5e0a99d58d935bc33360baacfa5
 SHA512:
-  metadata.gz: d7640b1d8e0fb87d7fe92759527ac31e6d9beb8116a49102d3949f8d55820b89d103f8075b46da1d923a2f1f635524d1c0147187a6c48aecdfba3a05079e8044
-  data.tar.gz: 55e1a668a581b7db5c644029626fc67976f341e07054251adb0fe89a952653c04e9af86c0ae938af23fdd454388595566f8b95bde01032948f6149f93a8bc115
+  metadata.gz: 43c210add4f2c3d2f87535b251ba52e22d0b477439dde17116b95e2c5f12133e800c09cd628967497b5d42a20970ffc753ebb0826ff6361838d15406df601e82
+  data.tar.gz: d1a70bed42a7c03cf4473cda58ad8776566c696713ded246742e044ce8b2aeb27f76b37d7a23e509628bcb9b4d0e522bcc5828d18ad4ad1e22c32148fe40af13

data/app/controllers/comee/core/products_controller.rb

@@ -20,7 +20,7 @@ module Comee
       private
 
       def model_params
-        params.required(:payload).permit(:code, :name, :description, :parent_id, :thumbnail_image, images: [])
+        params.required(:payload).permit(:code, :name, :description, :parent_id, :thumbnail_image, :preferred_units, images: [])
       end
     end
   end

data/app/controllers/comee/core/sales_order_items_controller.rb

@@ -9,6 +9,12 @@ module Comee
         end
       end
 
+      def suggest_values
+        service = CustomerOrderService.new
+        result = service.suggest_values(params[:id], params[:unit_id])
+        render json: {success: true, data: result}
+      end
+
       def destroy
         Comee::Core::SalesOrderItem.destroy(params[:id])
         render json: {success: true}

data/app/controllers/comee/core/unit_conversions_controller.rb

@@ -0,0 +1,19 @@
+module Comee
+  module Core
+    class UnitConversionsController < ApplicationController
+      include Common
+
+      def index
+        super do
+          Comee::Core::UnitConversion.includes(:from, :to).all
+        end
+      end
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:from_id, :to_id, :factor)
+      end
+    end
+  end
+end

data/app/models/comee/core/master_price.rb

@@ -25,13 +25,8 @@ module Comee
         return unless product && primary
 
         price = MasterPrice.find_by(product: product, primary: true, status: Price.statuses[:current])
-        Rails.logger.info("Existing price: ")
-        Rails.logger.info(price)
-        Rails.logger.info("Current price:")
-        Rails.logger.info(self)
         return unless price && price.id != id && status == price.status
 
-        Rails.logger.info("RAISING ERROR ...")
         errors.add(:base, "There is already a primary price entry for item '#{product.code}'")
       end
 

data/app/models/comee/core/product.rb

@@ -25,6 +25,10 @@ module Comee
       def images_url
         images.attached? ? images.map { |image| Rails.application.routes.url_helpers.rails_blob_url(image, only_path: false) } : []
       end
+
+      def default_unit
+        preferred_units.find { |unit| unit["default"] }
+      end
     end
   end
 end

data/app/models/comee/core/unit_conversion.rb

@@ -0,0 +1,10 @@
+module Comee
+  module Core
+    class UnitConversion < ApplicationRecord
+      belongs_to :from, class_name: "Comee::Core::Unit"
+      belongs_to :to, class_name: "Comee::Core::Unit"
+
+      validates :factor, presence: true, numericality: {greater_than: 0}
+    end
+  end
+end

data/app/serializers/comee/core/product_serializer.rb

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class ProductSerializer < ActiveModel::Serializer
-      attributes :id, :code, :name, :description, :thumbnail_image_url, :images_url
+      attributes :id, :code, :name, :description, :thumbnail_image_url, :images_url, :preferred_units
     end
   end
 end

data/app/serializers/comee/core/unit_conversion_serializer.rb

@@ -0,0 +1,9 @@
+module Comee
+  module Core
+    class UnitConversionSerializer < ActiveModel::Serializer
+      attributes :id, :factor
+      belongs_to :from
+      belongs_to :to
+    end
+  end
+end

data/app/services/comee/core/customer_order_service.rb

@@ -1,6 +1,76 @@
 module Comee
   module Core
     class CustomerOrderService
+      ##
+      # This method converts a price value per a unit of measure to a price value per another
+      # unit of measure.
+      #
+      # @param price [Numeric] the price value
+      # @param unit [Numeric] the unit id of measure for the price
+      # @param new_unit [Numeric] the new unit id of measure
+      #
+      # @return [Numeric] the converted price for the new unit
+      #
+      def convert_price(price, unit_id, new_unit_id)
+        return price if unit_id == new_unit_id
+
+        conversions = UnitConversion.where("from_id = ? AND to_id = ?", unit_id, new_unit_id)
+                                    .or(UnitConversion.where("from_id = ? AND to_id = ?", new_unit_id, unit_id))
+        unless conversions.count.positive?
+          units = Unit.where(id: [unit_id, new_unit_id]).select(:code)
+          raise(StandardError, "There is no conversion factor between #{units[0].code} and #{units[1].code}.")
+        end
+
+        conversion = conversions.first
+        return (price / conversion.factor).round(2) if unit_id == conversion.from_id && new_unit_id == conversion.to_id
+
+        (price * conversion.factor).round(2)
+      end
+
+      ##
+      # This method converts a price value per a unit of measure to a price value per another
+      # unit of measure.
+      #
+      # @param quantity [Numeric] the price value
+      # @param unit_id [Numeric] the unit id of measure for the price
+      # @param new_unit_id [Numeric] the new unit id of measure
+      #
+      # @return [Numeric] the converted price for the new unit
+      #
+      def convert_quantity(quantity, unit_id, new_unit_id)
+        return quantity if unit_id == new_unit_id
+
+        conversions = UnitConversion.where("from_id = ? AND to_id = ?", unit_id, new_unit_id)
+                                    .or(UnitConversion.where("from_id = ? AND to_id = ?", new_unit_id, unit_id))
+
+        unless conversions.count.positive?
+          units = Unit.where(id: [unit_id, new_unit_id]).select(:code)
+          raise(StandardError, "There is no conversion factor between #{units[0].code} and #{units[1].code}.")
+        end
+
+        conversion = conversions.first
+        return (quantity * conversion.factor).round if unit_id == conversion.from_id && new_unit_id == conversion.to_id
+
+        (quantity / conversion.factor).round
+      end
+
+      def suggest_values(item_id, new_unit_id)
+        item = CustomerOrderItem.includes(:customer_order).find_by(id: item_id)
+        raise(StandardError, "Order item with id `#{item_id}` not found.") unless item
+
+        quantity = convert_quantity(item.quantity, item.unit_id, new_unit_id)
+        client_price = ClientPrice.find_by(product_id: item.product_id, client_id: item.customer_order.client_id)
+        if client_price
+          price = convert_price(client_price.price, client_price.unit_id, new_unit_id)
+        else
+          master_price = MasterPrice.find_by(product_id: item.product_id, primary: true)
+          raise(StandardError, "No price entry could be found for product `#{item.product.code}`.") unless master_price
+
+          price = convert_price(master_price.selling_price, master_price.unit_id, new_unit_id)
+        end
+        {quantity: quantity, price: price}
+      end
+
       def submit(id)
         order = CustomerOrder.find_by(id: id)
         raise(StandardError, "Customer order with id `#{id}` not found.") unless order
@@ -51,16 +121,31 @@ module Comee
             customer_order: order,
             status: SalesOrder.statuses[:draft]
           )
-          items = order.customer_order_items.each_with_object([]) do |item, res|
+          order_items = order.customer_order_items.includes(:product, :unit)
+          prices = ClientPrice.where(client: order.client, product_id: order_items.map(&:product_id))
+          items = order_items.each_with_object([]) do |item, res|
             next if item.canceled?
 
+            default_unit = item.product.default_unit
+            unit_id = default_unit ? default_unit["id"] : item.unit_id
+            quantity = convert_quantity(item.quantity, item.unit_id, unit_id)
+            client_price = prices.find { |price| price.product_id == item.product_id }
+            if client_price
+              price = convert_price(client_price.price, client_price.unit_id, unit_id)
+            else
+              master_price = MasterPrice.find_by(product: item.product, primary: true)
+              raise(StandardError, "No price entry could be found for product `#{item.product.code}`.") unless master_price
+
+              price = convert_price(master_price.selling_price, master_price.unit_id, unit_id)
+            end
+
             res << {
               sales_order_id: sales_order.id,
               customer_order_item_id: item.id,
               product_id: item.product_id,
-              unit_id: item.unit_id,
-              quantity: item.quantity,
-              price: item.price,
+              unit_id: unit_id,
+              quantity: quantity,
+              price: price,
               delivery_date: item.delivery_date
             }
           end

data/config/routes.rb

@@ -45,6 +45,7 @@ Comee::Core::Engine.routes.draw do
   end
   resources :currencies
   resources :units
+  resources :unit_conversions
   resources :users
   post "/purchase_orders/filter", controller: :purchase_orders, action: :filter
   resources :purchase_orders
@@ -66,7 +67,11 @@ Comee::Core::Engine.routes.draw do
       post "submit"
     end
   end
-  resources :sales_order_items, except: [:index]
+  resources :sales_order_items, except: [:index] do
+    member do
+      get "suggest", controller: :sales_order_items, action: :suggest_values
+    end
+  end
   post "/sales_orders/filter", controller: :sales_orders, action: :filter
   resources :sales_orders do
     collection do

data/db/migrate/20230728014322_create_comee_core_products.rb

@@ -6,6 +6,7 @@ class CreateComeeCoreProducts < ActiveRecord::Migration[7.0]
       t.string :description
       t.boolean :leaf, null: false, default: true
       t.string :ancestry
+      t.jsonb :preferred_units, null: false, default: []
 
       t.timestamps
     end

data/db/migrate/20231206082503_create_comee_core_unit_conversions.rb

@@ -0,0 +1,19 @@
+class CreateComeeCoreUnitConversions < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_unit_conversions do |t|
+      t.references :from,
+                   null: false,
+                   index: {name: "from_on_uc_indx"},
+                   foreign_key: {to_table: :comee_core_units}
+      t.references :to,
+                   null: false,
+                   index: {name: "to_on_uc_indx"},
+                   foreign_key: {to_table: :comee_core_units}
+      t.float :factor, null: false
+
+      t.timestamps
+    end
+
+    add_index(:comee_core_unit_conversions, %i[from_id to_id], unique: true)
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.45.pre3".freeze
+    VERSION = "0.1.46".freeze
   end
 end

data/spec/factories/comee/core/products.rb

@@ -8,5 +8,6 @@ FactoryBot.define do
     description { Faker::Lorem.sentence }
     leaf { true }
     ancestry { root.id.to_s }
+    preferred_units { [] }
   end
 end

data/spec/factories/comee/core/unit_conversions.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :unit_conversion, class: "Comee::Core::UnitConversion" do
+    from factory: :unit
+    to factory: :unit
+    factor { 1 }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.45.pre3
+  version: 0.1.46
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-05 00:00:00.000000000 Z
+date: 2023-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -298,6 +298,7 @@ files:
 - app/controllers/comee/core/sales_order_items_controller.rb
 - app/controllers/comee/core/sales_orders_controller.rb
 - app/controllers/comee/core/suppliers_controller.rb
+- app/controllers/comee/core/unit_conversions_controller.rb
 - app/controllers/comee/core/units_controller.rb
 - app/controllers/comee/core/users_controller.rb
 - app/controllers/concerns/comee/core/common.rb
@@ -336,6 +337,7 @@ files:
 - app/models/comee/core/sales_order_item.rb
 - app/models/comee/core/supplier.rb
 - app/models/comee/core/unit.rb
+- app/models/comee/core/unit_conversion.rb
 - app/models/comee/core/user.rb
 - app/models/comee/core/warehouse_shipment.rb
 - app/models/comee/core/warehouse_shipment_item.rb
@@ -357,6 +359,7 @@ files:
 - app/serializers/comee/core/sales_order_item_serializer.rb
 - app/serializers/comee/core/sales_order_serializer.rb
 - app/serializers/comee/core/supplier_serializer.rb
+- app/serializers/comee/core/unit_conversion_serializer.rb
 - app/serializers/comee/core/unit_serializer.rb
 - app/serializers/comee/core/user_serializer.rb
 - app/services/comee/core/customer_order_service.rb
@@ -404,6 +407,7 @@ files:
 - db/migrate/20231125115522_create_comee_core_customs_details.rb
 - db/migrate/20231125122723_create_comee_core_purchase_orders.rb
 - db/migrate/20231126082907_create_comee_core_purchase_order_items.rb
+- db/migrate/20231206082503_create_comee_core_unit_conversions.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb
@@ -437,6 +441,7 @@ files:
 - spec/factories/comee/core/sales_order_items.rb
 - spec/factories/comee/core/sales_orders.rb
 - spec/factories/comee/core/suppliers.rb
+- spec/factories/comee/core/unit_conversions.rb
 - spec/factories/comee/core/units.rb
 - spec/factories/comee/core/users.rb
 - spec/factories/comee/core/warehouse_shipment_items.rb
@@ -459,9 +464,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.10
 signing_key: