comee_core 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79192d2994ff3a9aa6f58ed0369421fdf38d7a089dd28a8d88b05664634ad2df
-  data.tar.gz: 59bc3b2bb2c636132602985e5bc165ee17866809522e3137d5dd8c9433972d80
+  metadata.gz: eee3ab42e5f0909fdd7de5f6d1fc073a4fc79b34a606e3d87e4580b3770ebfb7
+  data.tar.gz: 44bc512432f7732f9b2e447d2a2cf0e2d3b54f73f93d6224622957c6c6b874d2
 SHA512:
-  metadata.gz: 8820af598fd97f4d0755ac480ee05a7c728c954bc316c1e43ddd9db5023233f595836a7181fdf37aed885de0d94869816fc2c0cd7facfd483bddf0b90d4f3ac7
-  data.tar.gz: 6e9b291a3c46742340f05adb192264855291fd3cf39f8ca581d40f1f8e9f66078e485e1e05101a3c5122e551d6cc64e57c83b5f683e5cd83917d059cb2a51382
+  metadata.gz: 8afe5c968f62a1ce3b4831d6f76fec04818b085f28c8ef14853c84dbdee92768e429757362bf246993387aa0dbedbacac2106444e58497fd60b8f99373c1462f
+  data.tar.gz: bd830637c78c8bca22da8bd19baf3e3470c1e7e123fb5f4afb4711a459e0ebd71b28f1e7894af61387a88fe222110efbb127f4c5a822cca8b587c50a443c9a75

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

@@ -8,6 +8,7 @@ module Comee
 
       validates :valid_from, :valid_to, :price, :status, 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: [:client_id, :previous_price_id]}
       validate :validate_price_validity_dates
 

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

@@ -13,7 +13,7 @@ module Comee
       def validate_primary_price
         return unless product && primary
 
-        count = MasterPrice.where(product:, primary: true).count
+        count = MasterPrice.where(product:, primary: true, active: true).count
         errors.add(:base, "There is already a primary supplier for item '#{product.code}'") if count.positive?
       end
 

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

@@ -7,6 +7,18 @@ module Comee
         @finish = finish
       end
 
+      def ==(other)
+        self.class == other.class && @start == other.start && @finish == other.finish
+      end
+
+      def <(other)
+        instance_of?(other.class) && @start < other.start && @finish < other.finish
+      end
+
+      def >(other)
+        instance_of?(other.class) && @start > other.start && @finish > other.finish
+      end
+
       def valid?
         finish > start
       end
@@ -23,13 +35,25 @@ module Comee
         false
       end
 
+      def disjoint?(period)
+        @finish < period.start || period.finish < @start
+      end
+
       def overlaps?(period)
-        return true if period.start <= start && start <= period.finish
+        return true if period.start <= @start && @start <= period.finish
 
-        return true if start <= period.start && period.start <= finish
+        return true if @start <= period.start && period.start <= @finish
 
         false
       end
+
+      def self.compute_next_valid_period(period1, period2)
+        return period2 if period1.disjoint?(period2) && period1 < period2
+
+        return nil if period1 > period2 || period1.contains?(period2)
+
+        Period.new(period1.finish.advance(days: 1), period2.finish)
+      end
     end
   end
 end

data/db/migrate/20230814151601_create_comee_core_client_prices.rb

@@ -5,6 +5,7 @@ class CreateComeeCoreClientPrices < ActiveRecord::Migration[7.0]
       t.date :valid_to, null: false
       t.float :price, null: false
       t.float :status, null: false, default: 0
+      t.integer :discount, null: false
       t.references :product,
         null: false,
         index: {name: "product_on_cccp_indx"},

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.16"
+    VERSION = "0.1.18"
   end
 end

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

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :back_order, class: "Comee::Core::BackOrder" do
     order_number { Faker::Alphanumeric.alpha(number: 10) }
     order_date { Date.current }
-    delivery_date { Date.current.advance(month: 1) }
+    delivery_date { Date.current.advance(months: 1) }
     supplier
     terms { {payment_terms: "NET 30 days", currency: "Euro", freight_terms: "FOB"} }
     delivery_address { Faker::Address.full_address }

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

@@ -6,5 +6,6 @@ FactoryBot.define do
     price { 100 }
     product
     client
+    discount { 0 }
   end
 end

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

@@ -5,5 +5,6 @@ FactoryBot.define do
     name { Faker::Name.name }
     address { Faker::Address.full_address }
     locale { "en" }
+    discount { 0 }
   end
 end

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

@@ -4,6 +4,6 @@ FactoryBot.define do
     product
     quantity { 100 }
     price { 50 }
-    delivery_date { Date.current.advance(month: 1) }
+    delivery_date { Date.current.advance(months: 1) }
   end
 end

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

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :sales_order, class: "Comee::Core::SalesOrder" do
     order_number { Faker::Alphanumeric.alpha(number: 10) }
     order_date { Date.current }
-    expected_delivery_date { Date.current.advance(month: 1) }
+    expected_delivery_date { Date.current.advance(months: 1) }
     client
     client_terms { Faker::Lorem.sentence }
     payment_no_of_days { 7 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.18
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-05 00:00:00.000000000 Z
+date: 2023-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers