comee_core 0.1.31 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cd7848381270134d19787687f958edee66f77eaaeb6a04d72d422f0fcdf1ea9
-  data.tar.gz: 32408a7fb537503ec05947ed99b4547bbb2494af12884a1e11c031e6c577d0a2
+  metadata.gz: 89be0ab79ac6789639448aaafa19ca5845e08e132d0d99c34eef619b97ece546
+  data.tar.gz: f62cdbb0af85b33c2322d17d9289cdd12c2021cd28b1fa06332cc63c39847a01
 SHA512:
-  metadata.gz: fd8973d61ccb97551156b1d51707a07355ba32c8f6bd236052aac2e256af26c1477746f4bd95e71f291d4481d2f205e7de449af90afddc1dd81be336296215f1
-  data.tar.gz: 21f6968a9c21f32473eb09de2c468684c4557ea82510fe36ebe07aa6fcfe5261b93476bd5ddb2c50d9b2553c79b21cd505d03fe03a6f51d26f09227f0dd296ef
+  metadata.gz: 5fca168ac18ac7ceef8614bdb8792f4395e21107cb62adfc9b9ac1d7b4301f8b418e3bdb5968f9b8fd4c4ebcebaf3517cb13fcda854ef1c36bb059943ac42b59
+  data.tar.gz: 6369177eb65524a12f58c1f2469b9fc3114a587edc0bdc7b6b64dc98e1655433910325fa4d3864fce8f861dbb866694f3079171e91f18d9a5d48c9d1c01a9e16

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

@@ -18,7 +18,8 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:valid_from, :valid_to, :price, :status, :product_id, :discount, :client_id, :previous_price)
+        params.require(:payload).permit(:valid_from, :valid_to, :price, :status, :product_id, :discount, :client_id, :previous_price,
+                                        :unit_id)
       end
     end
   end

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

@@ -3,6 +3,13 @@ module Comee
     class ProductsController < ApplicationController
       include Common
 
+      def index
+        super do
+          products = Comee::Core::Product.all
+          products.then(&paginate)
+        end
+      end
+
       private
 
       def model_params

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

@@ -1,30 +1,28 @@
 module Comee
   module Core
-    class ClientPrice < ApplicationRecord
-      enum :status, {old: 0, current: 1, future: 2}
-      belongs_to :product
+    class ClientPrice < Price
       belongs_to :client
       belongs_to :previous_price, class_name: "Comee::Core::ClientPrice", optional: true
 
-      validates :valid_from, :valid_to, :price, :status, presence: true
+      validates :price, presence: true
       validates :price, numericality: {greater_than: 0}
       validates :discount, 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]}
-      validate :validate_price_validity_dates
-
-      def validate_price_validity_dates
-        return unless valid_from && valid_to
-
-        period = Period.new(valid_from, valid_to)
-        errors.add(:base, "Price validity date range is not correct.") unless period.valid?
-      end
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[valid_from valid_to price status product_id client_id previous_price_id]
+        %w[
+          valid_from
+          valid_to
+          price
+          status
+          product_id
+          client_id
+          previous_price_id
+        ]
       end
 
       def self.ransackable_associations(_auth_object = nil)
-        []
+        %w[product client]
       end
     end
   end

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

@@ -1,38 +1,41 @@
 module Comee
   module Core
-    class MasterPrice < ApplicationRecord
-      enum :status, {old: 0, current: 1, future: 2}
+    class MasterPrice < Price
       belongs_to :supplier
-      belongs_to :product
       belongs_to :previous_price, class_name: "Comee::Core::MasterPrice", optional: true
 
-      validates :purchase_price, :status, :selling_price, :pp_valid_from, :pp_valid_to, :sp_valid_from, :sp_valid_to, 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]}
-      validate :validate_primary_price, :validate_purchase_price_validity_dates, :validate_selling_price_validity_dates
+      validate :validate_primary_price
+
+      scope :current_primary, -> { where(primary: true).current }
+      scope :unapplied, -> { where(propagated_to_client: false).current_primary }
 
       def validate_primary_price
         return unless product && primary
 
-        count = MasterPrice.where(product: product, primary: true, status: MasterPrice.statuses[:current]).count
+        count = MasterPrice.where(product: product, primary: true, status: Price.statuses[:current]).count
         return unless count.positive? && primary && MasterPrice.statuses[status] == MasterPrice.statuses[:current]
 
-        errors.add(:base,
-                   "There is already a primary supplier for item '#{product.code}'")
+        errors.add(:base, "There is already a primary price entry for item '#{product.code}'")
       end
 
-      def validate_purchase_price_validity_dates
-        return unless pp_valid_from && pp_valid_to
-
-        period = Period.new(pp_valid_from, pp_valid_to)
-        errors.add(:base, "Purchase price validity date range is not correct.") unless period.valid?
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[
+          valid_from
+          valid_to
+          purchase_price
+          selling_price
+          status
+          product_id
+          supplier_id
+          previous_price_id
+        ]
       end
 
-      def validate_selling_price_validity_dates
-        return unless sp_valid_from && sp_valid_to
-
-        period = Period.new(sp_valid_from, sp_valid_to)
-        errors.add(:base, "Selling price validity date range is not correct.") unless period.valid?
+      def self.ransackable_associations(_auth_object = nil)
+        %w[product supplier]
       end
     end
   end

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

@@ -0,0 +1,37 @@
+module Comee
+  module Core
+    class Price < ApplicationRecord
+      self.abstract_class = true
+      before_save :compute_status
+
+      enum :status, {past: 0, current: 1, future: 2}
+
+      scope :current, -> { where(status: Price.statuses[:current]) }
+      scope :future, -> { where(status: Price.statuses[:future]) }
+
+      belongs_to :product
+      belongs_to :unit
+
+      validates :valid_from, :valid_to, presence: true
+      validate :validate_price_validity_dates
+
+      def validate_price_validity_dates
+        return unless valid_from && valid_to
+
+        period = Period.new(valid_from, valid_to)
+        errors.add(:base, "Price validity date range is not correct.") unless period.valid?
+      end
+
+      def compute_status
+        period = Period.new(valid_from, valid_to)
+        if period.past?
+          self.status = Price.statuses[:past]
+        elsif period.current?
+          self.status = Price.statuses[:current]
+        elsif period.future?
+          self.status = Price.statuses[:future]
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class User < ApplicationRecord
-      enum :user_type, {supplier: 0, admin: 1}
+      enum :user_type, {supplier: 0, admin: 1, client: 2, worker: 3}
 
       has_secure_password
       has_many :notifications, as: :recipient, dependent: :destroy

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

@@ -1,7 +1,10 @@
 module Comee
   module Core
     class ClientPriceSerializer < ActiveModel::Serializer
-      attributes :id, :valid_from, :valid_to, :price, :status, :product, :client, :previous_price
+      attributes :id, :valid_from, :valid_to, :price, :status, :previous_price
+      belongs_to :product
+      belongs_to :client
+      belongs_to :unit
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class SupplierSerializer < ActiveModel::Serializer
-      attributes :id, :code, :name, :address, :locale
+      attributes :id, :code, :name, :address, :locale, :user_id
     end
   end
 end

data/app/utils/comee/core/period.rb

@@ -24,6 +24,24 @@ module Comee
         finish > start
       end
 
+      def past?
+        raise(StandardError, "Period must be valid.") unless valid?
+
+        finish < Date.current
+      end
+
+      def current?
+        raise(StandardError, "Period must be valid.") unless valid?
+
+        start <= Date.current && finish > Date.current
+      end
+
+      def future?
+        raise(StandardError, "Period must be valid.") unless valid?
+
+        start > Date.current
+      end
+
       def contains?(period)
         return true if start <= period.start && finish >= period.finish
 

data/db/migrate/20230813235946_create_comee_core_master_prices.rb

@@ -3,29 +3,32 @@ class CreateComeeCoreMasterPrices < ActiveRecord::Migration[7.0]
     create_table :comee_core_master_prices do |t|
       t.float :purchase_price, null: false
       t.float :selling_price, null: false
-      t.date :pp_valid_from, null: false
-      t.date :pp_valid_to, null: false
-      t.date :sp_valid_from, null: false
+      t.date :valid_from, null: false
+      t.date :valid_to, null: false
       t.float :status, null: false, default: 0
-      t.date :sp_valid_to, null: false
-      t.boolean :active, null: false
-      t.boolean :primary, null: false
+      t.boolean :primary, null: false, default: false
       t.integer :margin, null: false
       t.references :product,
                    null: false,
-                   index: {name: "product_on_ccsp_indx"},
+                   index: {name: "product_on_ccmp_indx"},
                    foreign_key: {to_table: :comee_core_products}
       t.references :supplier,
                    null: false,
-                   index: {name: "supplier_on_ccsp_indx"},
+                   index: {name: "supplier_on_ccmp_indx"},
                    foreign_key: {to_table: :comee_core_suppliers}
+      t.references :unit,
+                   null: false,
+                   index: {name: "unit_on_ccmp_indx"},
+                   foreign_key: {to_table: :comee_core_units}
       t.references :previous_price,
                    null: true,
                    index: {name: "previous_price_on_ccsp_indx"},
                    foreign_key: {to_table: :comee_core_master_prices}
+      t.boolean :propagated_to_client, null: false, default: false
 
       t.timestamps
     end
+
     add_index :comee_core_master_prices,
               %i[product_id supplier_id previous_price_id],
               unique: true,

data/db/migrate/20230814151601_create_comee_core_client_prices.rb

@@ -14,6 +14,10 @@ class CreateComeeCoreClientPrices < ActiveRecord::Migration[7.0]
                    null: false,
                    index: {name: "client_on_cccp_indx"},
                    foreign_key: {to_table: :comee_core_clients}
+      t.references :unit,
+                   null: false,
+                   index: {name: "unit_on_cccp_indx"},
+                   foreign_key: {to_table: :comee_core_units}
       t.references :previous_price,
                    null: true,
                    index: {name: "previous_price_on_cccp_indx"},

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.31".freeze
+    VERSION = "0.1.33".freeze
   end
 end

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

@@ -6,7 +6,18 @@ FactoryBot.define do
     price { 100 }
     product
     client
+    unit
     discount { 0 }
     previous_price { nil }
+
+    trait :past do
+      valid_from { Date.current.advance(months: -2) }
+      valid_to { Date.current.advance(months: -1) }
+    end
+
+    trait :future do
+      valid_from { Date.current.advance(months: 1) }
+      valid_to { Date.current.advance(months: 2) }
+    end
   end
 end

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

@@ -2,16 +2,24 @@ FactoryBot.define do
   factory :master_price, class: "Comee::Core::MasterPrice" do
     purchase_price { 100.0 }
     selling_price { 90.0 }
-    pp_valid_from { Date.current.advance(months: -1) }
-    pp_valid_to { Date.current.advance(months: 1) }
-    sp_valid_from { Date.current.advance(months: -1) }
-    sp_valid_to { Date.current.advance(months: 1) }
-    active { true }
+    valid_from { Date.current.advance(months: -1) }
+    valid_to { Date.current.advance(months: 1) }
     primary { false }
     margin { 10.0 }
     product
     supplier
+    unit
     previous_price { nil }
-    status { 0 }
+    propagated_to_client { false }
+
+    trait :past do
+      valid_from { Date.current.advance(months: -2) }
+      valid_to { Date.current.advance(months: -1) }
+    end
+
+    trait :future do
+      valid_from { Date.current.advance(months: 1) }
+      valid_to { Date.current.advance(months: 2) }
+    end
   end
 end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :product, class: "Comee::Core::Product" do
-    code { Faker::Alphanumeric.alpha(number: 6) }
+    sequence(:code) { |n| "#{Faker::Alphanumeric.unique.alpha(number: 6)}-#{n}" }
     name { Faker::Name.name }
     description { Faker::Lorem.sentence }
     metadata { {} }

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :supplier, class: "Comee::Core::Supplier" do
-    code { Faker::Alphanumeric.alpha(number: 8) }
+    sequence(:code) { |n| "#{Faker::Alphanumeric.alpha(number: 8)}-#{n}" }
     name { Faker::Name.name }
     address { Faker::Address.full_address }
     locale { "en" }

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :unit, class: "Comee::Core::Unit" do
-    code { Faker::Alphanumeric.alpha(number: 2) }
+    sequence(:code) { |n| "#{Faker::Alphanumeric.alpha(number: 2)}-#{n}" }
     name { Faker::Name.name }
     unit_type { Comee::Core::Unit.unit_types[:weight] }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.33
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -276,6 +276,7 @@ files:
 - app/models/comee/core/master_price.rb
 - app/models/comee/core/notification.rb
 - app/models/comee/core/order_source.rb
+- app/models/comee/core/price.rb
 - app/models/comee/core/product.rb
 - app/models/comee/core/product_lookup.rb
 - app/models/comee/core/product_type.rb