comee_core 0.1.53 → 0.1.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 738e68a65b4d7a96b3f0ea50a6e25da73e42d09f0ef888c49060a45ebc2fb39e
-  data.tar.gz: e42799a2bd3b0cfde406636e972ec258462df1df24dae8f4a051002eecc69294
+  metadata.gz: f1384668dff4008a978c0526a50f3e61c2d7375025fa420577d93bcb87533735
+  data.tar.gz: 4c90e389141355f9c6178d0bb5369360b4a3fce1e61e62d38a58697d89d48712
 SHA512:
-  metadata.gz: e680be5bdcf25fce5cd6fe5ee833c856fcf7eff59600b6cd8741a65d3713d36fd868bb6cac0bc25c2fe420c610ebce61617559b9da112ebdf214c818e5de407a
-  data.tar.gz: 343a4eff4586c0ea69d51960250a73766b710284c0f68724bbcb975f3b060080a288ca04e965dee8d7736d0e802af7fb3196f8f1ff841f494e9d5ec3cbd5fb40
+  metadata.gz: f2dae046eaefed52198da2a2e90f4c4b167459ce7091ba5b28eb884aa74f3b7ebcd400a32b5aa8df469a1450a51233bcde4c3a8c199537618fc03293893bf2ee
+  data.tar.gz: f05e56528126274994fa7bab6517cba5ea6efffeffff022fd02ebc149c49219db97d45b80d501bc56cdf4910c522205947250924b0a5b1f43f8bb897adab7abc

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

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

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

@@ -5,7 +5,12 @@ module Comee
 
       def index
         super do
-          Comee::Core::SalesOrderItem.includes(:customer_order_item).where(sales_order_id: params[:id])
+          Comee::Core::SalesOrderItem.includes(
+            :sales_order,
+            :customer_order_item,
+            :source,
+            :unit
+          ).where(sales_order_id: params[:id])
         end
       end
 
@@ -24,7 +29,8 @@ module Comee
 
       def model_params
         params.require(:payload).permit(:sales_order_id, :customer_order_item_id, :product_id, :unit_id, :quantity, :quantity_delivered,
-                                        :customer_item_no, :price, :delivery_date, :eb_number, :comment, :action_note, :po_reference)
+                                        :customer_item_no, :price, :delivery_date, :eb_number, :lead_time, :comment, :action_note,
+                                        :po_reference, :source_id)
       end
     end
   end

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

@@ -6,7 +6,7 @@ module Comee
 
       def index
         super do
-          Comee::Core::SalesOrder.includes(:sales_order_items).all
+          Comee::Core::SalesOrder.includes(:customer_order, :fulfillment_center, :sales_order_items).all
         end
       end
 
@@ -45,6 +45,7 @@ module Comee
 
       def back_order_params
         params.permit(payload: [:supplier_id, :order_number, :order_date, :delivery_date, :delivery_address, :invoice_address,
+                                :fulfillment_center_id,
                                 back_order_items: %i[product_id requested_quantity requested_price supplier_quantity delivery_date]])
       end
 

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

@@ -0,0 +1,14 @@
+module Comee
+  module Core
+    class FulfillmentCenter < ApplicationRecord
+      WAREHOUSE = "Warehouse".freeze
+      PURCHASE = "Purchase".freeze
+      SERVICES = [WAREHOUSE, PURCHASE].freeze
+
+      validates :code, presence: true, uniqueness: true
+      validates :name, :address, :email, presence: true
+      validates :email, format: URI::MailTo::EMAIL_REGEXP
+      validates :service, presence: true, array: {inclusion: {in: SERVICES}}
+    end
+  end
+end

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

@@ -7,6 +7,8 @@ module Comee
       has_one_attached :thumbnail_image
       has_many_attached :images
 
+      belongs_to :source, class_name: "Comee::Core::FulfillmentCenter", optional: true
+
       validates :code, presence: true, uniqueness: true
       validates :name, presence: true
 

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

@@ -4,6 +4,7 @@ module Comee
       before_save :total_price
 
       belongs_to :customer_order
+      belongs_to :fulfillment_center, optional: true
       has_many :sales_order_items
       has_many_attached :files
 

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

@@ -5,6 +5,7 @@ module Comee
       belongs_to :customer_order_item
       belongs_to :product
       belongs_to :unit
+      belongs_to :source, class_name: "Comee::Core::FulfillmentCenter", optional: true
       has_many :warehouse_shipment_items
       has_many :item_statuses
 

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class MasterPriceSerializer < ActiveModel::Serializer
-      attributes :id, :purchase_price, :selling_price, :valid_from, :valid_to, :primary, :margin
+      attributes :id, :purchase_price, :selling_price, :valid_from, :valid_to, :primary, :margin, :lead_time
       belongs_to :product
       belongs_to :supplier
     end

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

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

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

@@ -1,10 +1,11 @@
 module Comee
   module Core
     class SalesOrderItemSerializer < ActiveModel::Serializer
-      attributes :id, :customer_item_no, :quantity, :quantity_delivered, :price, :delivery_date, :eb_number, :comment,
+      attributes :id, :customer_item_no, :quantity, :quantity_delivered, :price, :delivery_date, :eb_number, :lead_time, :comment,
                  :action_note, :po_reference
       belongs_to :sales_order
       belongs_to :customer_order_item
+      belongs_to :source
       belongs_to :unit
     end
   end

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

@@ -4,6 +4,7 @@ module Comee
       attributes :id, :order_number, :payment_penalty, :status, :total_price,
                  :amount_paid, :pallete_note, :handover_date, :remark, :files_url
       belongs_to :customer_order
+      belongs_to :fulfillment_center
       has_many :sales_order_items
     end
   end

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

@@ -125,18 +125,19 @@ module Comee
             status: SalesOrder.statuses[:draft]
           )
           order_items = order.customer_order_items.includes(:product, :unit)
-          prices = ClientPrice.where(client: order.client, product_id: order_items.map(&:product_id))
+          client_prices = ClientPrice.where(client: order.client, product_id: order_items.map(&:product_id))
+          master_prices = MasterPrice.where(primary: true, status: Price.statuses[:current], product: order_items.map(&:product))
           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 }
+            client_price = client_prices.find { |price| price.product_id == item.product_id }
+            master_price = master_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)
@@ -150,7 +151,8 @@ module Comee
               customer_item_no: item.product.code,
               quantity: quantity,
               price: price,
-              delivery_date: item.delivery_date
+              delivery_date: item.delivery_date,
+              lead_time: master_price&.lead_time
             }
           end
           SalesOrderItem.insert_all!(items)

data/app/validators/array_validator.rb

@@ -0,0 +1,23 @@
+class ArrayValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, values)
+    Array(values).each do |value|
+      options.each do |key, args|
+        validator_options = {attributes: attribute}
+        validator_options.merge!(args) if args.is_a?(Hash)
+        next if value.nil? && validator_options[:allow_nil]
+
+        next if value.blank? && validator_options[:allow_blank]
+
+        validator_class_name = "#{key.to_s.camelize}Validator"
+        validator_class = begin
+          validator_class_name.constantize
+        rescue NameError
+          "ActiveModel::Validations::#{validator_class_name}".constantize
+        end
+
+        validator = validator_class.new(validator_options)
+        validator.validate_each(record, attribute, value)
+      end
+    end
+  end
+end

data/db/migrate/20230727091518_create_comee_core_fulfillment_centers.rb

@@ -0,0 +1,14 @@
+class CreateComeeCoreFulfillmentCenters < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_fulfillment_centers do |t|
+      t.string :code, null: false
+      t.string :name, null: false
+      t.string :address, null: false
+      t.string :email, null: false
+      t.string :service, array: true, null: false
+
+      t.timestamps
+    end
+    add_index :comee_core_fulfillment_centers, :code, unique: true
+  end
+end

data/db/migrate/20230728014322_create_comee_core_products.rb

@@ -7,6 +7,10 @@ class CreateComeeCoreProducts < ActiveRecord::Migration[7.0]
       t.boolean :leaf, null: false, default: true
       t.string :ancestry
       t.jsonb :preferred_units, null: false, default: []
+      t.references :source,
+                   null: true,
+                   index: {name: "source_on_ccp_indx"},
+                   foreign_key: {to_table: :comee_core_fulfillment_centers}
 
       t.timestamps
     end

data/db/migrate/20230812190652_create_comee_core_sales_orders.rb

@@ -6,6 +6,10 @@ class CreateComeeCoreSalesOrders < ActiveRecord::Migration[7.0]
                    null: false,
                    index: {name: "co_on_ccso_indx"},
                    foreign_key: {to_table: :comee_core_customer_orders}
+      t.references :fulfillment_center,
+                   null: true,
+                   index: {name: "fc_on_ccso_indx"},
+                   foreign_key: {to_table: :comee_core_fulfillment_centers}
       t.float :payment_penalty, null: false, default: 0.0
       t.integer :status, null: false, default: 0
       t.float :total_price, null: false, default: 0

data/db/migrate/20230812212844_create_comee_core_sales_order_items.rb

@@ -17,6 +17,10 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
                    null: false,
                    index: {name: "coi_on_ccsoi_indx"},
                    foreign_key: {to_table: :comee_core_customer_order_items}
+      t.references :source,
+                   null: true,
+                   index: {name: "source_on_ccsoi_indx"},
+                   foreign_key: {to_table: :comee_core_fulfillment_centers}
       t.string :customer_item_no, null: false
       t.float :quantity, null: false
       t.float :quantity_delivered, null: false, default: 0
@@ -25,6 +29,7 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
       t.boolean :canceled, default: false
       t.date :handover_date
       t.string :eb_number
+      t.integer :lead_time
       t.string :comment
       t.string :action_note
       t.string :po_reference

data/db/migrate/20230813235946_create_comee_core_master_prices.rb

@@ -8,6 +8,7 @@ class CreateComeeCoreMasterPrices < ActiveRecord::Migration[7.0]
       t.float :status, null: false, default: 0
       t.boolean :primary, null: false, default: false
       t.integer :margin, null: false
+      t.integer :lead_time
       t.references :product,
                    null: false,
                    index: {name: "product_on_ccmp_indx"},

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.53".freeze
+    VERSION = "0.1.54".freeze
   end
 end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :fulfillment_center, class: "Comee::Core::FulfillmentCenter" do
+    code { Faker::Alphanumeric.alpha(number: 10) }
+    name { Faker::Name.name }
+    address { Faker::Address.street_address }
+    email { Faker::Internet.email }
+    service { Comee::Core::FulfillmentCenter::SERVICES }
+  end
+end

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

@@ -6,6 +6,7 @@ FactoryBot.define do
     valid_to { Date.current.advance(months: 1) }
     primary { false }
     margin { 10.0 }
+    lead_time { nil }
     product
     supplier
     unit

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

@@ -9,5 +9,6 @@ FactoryBot.define do
     leaf { true }
     ancestry { root.id.to_s }
     preferred_units { [] }
+    source factory: :fulfillment_center
   end
 end

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

@@ -2,6 +2,7 @@ FactoryBot.define do
   factory :sales_order_item, class: "Comee::Core::SalesOrderItem" do
     sales_order
     association :customer_order_item, :with_inventory
+    source factory: :fulfillment_center
     product
     unit
     customer_item_no { Faker::Alphanumeric.alpha(number: 10) }
@@ -11,6 +12,7 @@ FactoryBot.define do
     delivery_date { Date.current.advance(months: 1) }
     handover_date { Date.current }
     eb_number { Faker::Lorem.word }
+    lead_time { nil }
     comment { Faker::Lorem.sentence }
     action_note { Faker::Lorem.sentence }
     po_reference { Faker::Alphanumeric.alpha(number: 10) }

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

@@ -2,6 +2,7 @@ FactoryBot.define do
   factory :sales_order, class: "Comee::Core::SalesOrder" do
     order_number { Faker::Alphanumeric.alpha(number: 10) }
     customer_order
+    fulfillment_center
     payment_penalty { 0 }
     total_price { 0 }
     amount_paid { 0 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.53
+  version: 0.1.54
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-15 00:00:00.000000000 Z
+date: 2023-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -320,6 +320,7 @@ files:
 - app/models/comee/core/edi_order.rb
 - app/models/comee/core/external_rfq.rb
 - app/models/comee/core/field_mapping.rb
+- app/models/comee/core/fulfillment_center.rb
 - app/models/comee/core/inventory.rb
 - app/models/comee/core/invoice.rb
 - app/models/comee/core/invoice_item.rb
@@ -372,6 +373,7 @@ files:
 - app/services/comee/core/sales_order_service.rb
 - app/services/comee/core/token_service.rb
 - app/utils/comee/core/period.rb
+- app/validators/array_validator.rb
 - app/views/comee/core/supplier_mailer/new_order_notification.html.erb
 - app/views/layouts/comee/core/mailer.html.erb
 - app/views/layouts/comee/core/mailer.text.erb
@@ -379,6 +381,7 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - config/spring.rb
+- db/migrate/20230727091518_create_comee_core_fulfillment_centers.rb
 - db/migrate/20230727153013_create_comee_core_units.rb
 - db/migrate/20230728011037_create_comee_core_currencies.rb
 - db/migrate/20230728014322_create_comee_core_products.rb
@@ -430,6 +433,7 @@ files:
 - spec/factories/comee/core/edi_orders.rb
 - spec/factories/comee/core/external_rfqs.rb
 - spec/factories/comee/core/field_mappings.rb
+- spec/factories/comee/core/fulfillment_centers.rb
 - spec/factories/comee/core/inventories.rb
 - spec/factories/comee/core/invoice_items.rb
 - spec/factories/comee/core/invoices.rb