comee_core 0.1.97 → 0.1.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cb92df3470f8c017719aaedbe6c51315760869a45a018f2c551a8d069d0f815
-  data.tar.gz: d981a86bc337820f64b63b8f4e5d95d44482f772ff8f222b276f5f4b56ff6190
+  metadata.gz: f3b5b69ffae3e2702ed23106fbc360890ec375ae49c97a136b98baad2fec89d8
+  data.tar.gz: 5fc14c0bac612232d3d32bf4c2f1f0e98e75773adb2aa343d1b73387f8b92bac
 SHA512:
-  metadata.gz: bb572acac1f0630247da9380f43d22edc32c289e3cdf998b91517f37eec10a9cd01edbf122e9183e0c5d8b61a2a04630d2a6fac679fad53e6ae9212541f2a590
-  data.tar.gz: 76d0cf07ad78fccd24d09a9eb8db389e3a8c10801e0cd2898fe958918a99f0861e557d7185703b79bfbd3b18adaf858511fa3973b70991617dee3e481794cb2b
+  metadata.gz: 986aff6f5d73b35a540a16fbbdafc62a2c03911a6cd06430de431fa30f547994ec3038d90d38e37a8504f36547cb3f519f9804cc8828a54942b08b49752d2884
+  data.tar.gz: c4add758cc2d3c861a10b0c584f96abac453928bacd0ad5375150bc56233323d4c95a0aa5f617cfe036884efad323b900c39dc6579ae4baaa6fa7d4c0c3fd3a4

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

@@ -7,7 +7,7 @@ module Comee
       belongs_to :next_price, class_name: "Comee::Core::MasterPrice", optional: true
       belongs_to :product_lookup, optional: true
 
-      validates :price_status, :purchase_price, :selling_price, presence: 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_product_lookup

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

@@ -5,6 +5,7 @@ module Comee
       before_save :compute_status
 
       enum :status, {past: 0, current: 1, future: 2}
+      enum :price_status, {draft: 0, approved: 1}
 
       scope :current, -> { where(status: Price.statuses[:current]) }
       scope :future, -> { where(status: Price.statuses[:future]) }
@@ -12,7 +13,7 @@ module Comee
       belongs_to :product
       belongs_to :unit
 
-      validates :valid_from, :valid_to, presence: true
+      validates :price_status, :valid_from, :valid_to, presence: true
       validate :validate_price_validity_dates
 
       def validate_price_validity_dates

data/db/migrate/20230813235946_create_comee_core_master_prices.rb

@@ -5,11 +5,11 @@ class CreateComeeCoreMasterPrices < ActiveRecord::Migration[7.0]
       t.float :selling_price, null: false
       t.date :valid_from, null: false
       t.date :valid_to, null: false
-      t.float :status, null: false, default: 0
+      t.integer :status, null: false, default: 0
+      t.integer :price_status, null: false, default: 0
       t.boolean :primary, null: false, default: false
       t.float :margin, null: false, default: 0
       t.integer :lead_time
-      t.integer :price_status, null: false, default: 0
       t.references :product,
                    null: false,
                    index: {name: "product_on_ccmp_indx"},

data/db/migrate/20230814151601_create_comee_core_client_prices.rb

@@ -4,7 +4,8 @@ class CreateComeeCoreClientPrices < ActiveRecord::Migration[7.0]
       t.date :valid_from, null: false
       t.date :valid_to, null: false
       t.float :price, null: false
-      t.float :status, null: false, default: 0
+      t.integer :status, null: false, default: 0
+      t.integer :price_status, null: false, default: 0
       t.float :margin, null: false, default: 0
       t.integer :margin_type, null: false, default: 0
       t.references :product,

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.97".freeze
+    VERSION = "0.1.99".freeze
   end
 end

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

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :client_price, class: "Comee::Core::ClientPrice" do
     valid_from { Date.current.advance(months: -1) }
     valid_to { Date.current.advance(months: 1) }
-    status { 0 }
+    price_status { Comee::Core::Price.price_statuses[:draft] }
     price { 100 }
     product
     client

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

@@ -7,7 +7,7 @@ FactoryBot.define do
     primary { false }
     margin { 10.0 }
     lead_time { nil }
-    status { Comee::Core::MasterPrice.statuses[:draft] }
+    price_status { Comee::Core::Price.price_statuses[:draft] }
     product
     supplier
     unit
@@ -16,6 +16,10 @@ FactoryBot.define do
     product_lookup { nil }
     propagated_to_client { false }
 
+    trait :approved do
+      price_status { Comee::Core::Price.price_statuses[:approved] }
+    end
+
     trait :past do
       valid_from { Date.current.advance(months: -2) }
       valid_to { Date.current.advance(months: -1) }
@@ -60,6 +64,7 @@ FactoryBot.define do
           previous_price: price
         )
         price.next_price = next_price
+        price.price_status = Comee::Core::Price.price_statuses[:approved]
         price.save!
         price
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.97
+  version: 0.1.99
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-20 00:00:00.000000000 Z
+date: 2024-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers