comee_core 0.1.78 → 0.1.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06c1577eb9677bc332a321a3bea0537a253b4891856aa7c49441a03df5be3510
-  data.tar.gz: ad936214c5840d39c0099841b95f05628571cb5a1cf674f1f679193c5a3caf29
+  metadata.gz: 8e66de25a6395ee13f7dd5bdf45a79d8fdda48df5037197f499c5000b2cd965e
+  data.tar.gz: f19d317e6465ebadc10aa01674f7e39651e9fa11a8875c62adadd418a8cad0f8
 SHA512:
-  metadata.gz: 5f8d8ffaee5ab3d44e724500e7b17e65a6976685188c2b6c4d2f7125b5c10994b8e83b7ec3735ae9324ff838b329d665f40358625a4a4d9367950e5c9dd3964f
-  data.tar.gz: b0701d9dcc27073443ea023bc9672907e8b1f60b1f1d8cfda316f3d498069e4731a3daa46dfd447ed77002a2b31b3f610a61fa668dd3724a316e280b3fbd9fe5
+  metadata.gz: f0c3b34e1015e9bd2b71d28d575514de6c346d5dc00e073160f28a6cfa15a78172b9b7215154c3f435d395ceeeb1e9062a2ba90a455073f5b752a62b037652b4
+  data.tar.gz: c57d6182fe854968524ef8184c5f92163e0c15e8c7fcf2f81fe46ef2e1b1de1d71587a9edfa609bbfe22ac56b1201a22cf162137829a24b3e462a679c3cf330b

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

@@ -8,7 +8,7 @@ module Comee
       validates :code, :name, :address, :locale, presence: true
       validates :code, uniqueness: true
 
-      delegate(:name, to: :user, prefix: true)
+      delegate(:name, to: :user, prefix: true, allow_nil: true)
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[
@@ -17,8 +17,13 @@ module Comee
           code
           name
           locale
+          parent_id
         ]
       end
+
+      def self.ransackable_associations(_auth_object = nil)
+        ["parent"]
+      end
     end
   end
 end

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

@@ -5,11 +5,23 @@ module Comee
       belongs_to :client
       belongs_to :previous_price, class_name: "Comee::Core::ClientPrice", optional: true
       belongs_to :next_price, class_name: "Comee::Core::ClientPrice", optional: true
+      belongs_to :product_lookup, optional: true
 
       validates :price, :margin_type, presence: true
       validates :price, numericality: {greater_than: 0}
       validates :margin, presence: true, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
       validates :product_id, uniqueness: {scope: %i[client_id previous_price_id next_price_id status]}
+      validate :validate_product_lookup
+
+      def validate_product_lookup
+        return unless product_lookup && product && client
+
+        if product_lookup.itemable_id != client_id ||
+           product_lookup.itemable_type != "Comee::Core::Client" ||
+           product_lookup.product_id != product_id
+          errors.add(:product_lookup, "contains wrong client or product.")
+        end
+      end
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[

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

@@ -4,11 +4,12 @@ module Comee
       belongs_to :supplier
       belongs_to :previous_price, class_name: "Comee::Core::MasterPrice", optional: true
       belongs_to :next_price, class_name: "Comee::Core::MasterPrice", optional: true
+      belongs_to :product_lookup, optional: true
 
       validates :purchase_price, :selling_price, presence: true
       validates :margin, presence: true, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
       validates :product_id, uniqueness: {scope: %i[supplier_id previous_price_id next_price_id status]}
-      validate :validate_primary_price
+      validate :validate_primary_price, :validate_product_lookup
 
       scope :current_primary, -> { where(primary: true).current }
       scope :unapplied, -> { where(propagated_to_client: false).current_primary }
@@ -30,6 +31,16 @@ module Comee
         errors.add(:base, "There is already a primary price entry for item '#{product.code}'")
       end
 
+      def validate_product_lookup
+        return unless product_lookup && product && supplier
+
+        if product_lookup.itemable_id != supplier_id ||
+           product_lookup.itemable_type != "Comee::Core::Supplier" ||
+           product_lookup.product_id != product_id
+          errors.add(:product_lookup, "contains wrong supplier or product.")
+        end
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           valid_from

data/db/migrate/20230813235946_create_comee_core_master_prices.rb

@@ -29,6 +29,10 @@ class CreateComeeCoreMasterPrices < ActiveRecord::Migration[7.0]
                    null: true,
                    index: {name: "next_price_on_ccsp_indx"},
                    foreign_key: {to_table: :comee_core_master_prices}
+      t.references :product_lookup,
+                   null: true,
+                   index: {name: "pl_on_ccmp_indx"},
+                   foreign_key: {to_table: :comee_core_product_lookups}
       t.boolean :propagated_to_client, null: false, default: false
 
       t.timestamps

data/db/migrate/20230814151601_create_comee_core_client_prices.rb

@@ -27,6 +27,10 @@ class CreateComeeCoreClientPrices < ActiveRecord::Migration[7.0]
                    null: true,
                    index: {name: "next_price_on_cccp_indx"},
                    foreign_key: {to_table: :comee_core_client_prices}
+      t.references :product_lookup,
+                   null: true,
+                   index: {name: "pl_on_cccp_indx"},
+                   foreign_key: {to_table: :comee_core_product_lookups}
 
       t.timestamps
     end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.78".freeze
+    VERSION = "0.1.80".freeze
   end
 end

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

@@ -11,6 +11,7 @@ FactoryBot.define do
     margin_type { Comee::Core::ClientPrice.margin_types[:increase] }
     previous_price { nil }
     next_price { nil }
+    product_lookup { nil }
 
     trait :past do
       valid_from { Date.current.advance(months: -2) }

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

@@ -12,6 +12,7 @@ FactoryBot.define do
     unit
     previous_price { nil }
     next_price { nil }
+    product_lookup { nil }
     propagated_to_client { false }
 
     trait :past do

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

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :shipment_item, class: "Comee::Core::ShipmentItem" do
     sales_order_item
     quantity { 50 }
-    shipment_status { Faker::Lorem.word }
+    shipment_status { Comee::Core::ItemStatus::INITIALIZED }
     status { Comee::Core::ShipmentItem.statuses[:active] }
     handover_date { Date.current.advance(days: 3) }
     delivery_date { Date.current.advance(days: 6) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.78
+  version: 0.1.80
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-05 00:00:00.000000000 Z
+date: 2024-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -401,9 +401,9 @@ files:
 - db/migrate/20230811102708_create_comee_core_customer_order_items.rb
 - db/migrate/20230812190652_create_comee_core_sales_orders.rb
 - db/migrate/20230812212844_create_comee_core_sales_order_items.rb
+- db/migrate/20230813041307_create_comee_core_product_lookups.rb
 - db/migrate/20230813235946_create_comee_core_master_prices.rb
 - db/migrate/20230814151601_create_comee_core_client_prices.rb
-- db/migrate/20230914041307_create_comee_core_product_lookups.rb
 - db/migrate/20230915205522_create_comee_core_invoices.rb
 - db/migrate/20230915205648_create_comee_core_invoice_items.rb
 - db/migrate/20230929115336_create_comee_core_order_sources.rb