comee_core 0.1.13 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3e105a8c7e7254936a7db749a048935e743a23d2098650380a34a8bf55bc620
-  data.tar.gz: f38e93115c2d99cb771e261a16b86183b4a06dc497f937b67be1af502f1f9d0d
+  metadata.gz: 043ed1a164fa93440307c74baae5cca804e78ce043d1463eb5680cc76cef451d
+  data.tar.gz: c48d480a64a3eb1585351a98497a6507e456bf00782c60f8dace90a607c83f92
 SHA512:
-  metadata.gz: 136ec7b8f11718c0822ccacb0177c39e602a95e0b182f136a5cead06b11e06ffb8df5924aa2671841eb00f889bbaf794578444b06c92b305b739cca4bc77008e
-  data.tar.gz: 49ddfc65ef76c8c0fef5a0cf51e9d881f0eb621afa04a6f61dea4b89f0d914bde27a6cdc3b1d1d8952885dc30ddffbb9444bd277c76705faef6d7f4484786781
+  metadata.gz: 6e45c3b4df5048fc6e9f0b6d34700cd8bce34223e73f67c4a3ff35506ff371ee44efb355d60330a6d75a57bd614d5e5150f8d992cafdab73c47ee88b3ecf9f43
+  data.tar.gz: 593b15735e3294c82069a5151fcfff0a8c74eef4fd97b35b81dcda5f17dd321c25dc7aec687224b004303be1e292b43b427cf817b237983b6cab2f041dba60a7

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class BackOrder < ApplicationRecord
-      enum :status, {draft: 0, confirmed: 1}
+      enum :status, {draft: 0, submitted: 1, confirmed: 2}
 
       after_create_commit :notify_supplier
 

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

@@ -0,0 +1,10 @@
+module Comee
+  module Core
+    class ClientOrder < ApplicationRecord
+      belongs_to :order_source
+      belongs_to :client
+
+      validates :url, :processed, presence: true
+    end
+  end
+end

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

@@ -1,11 +1,13 @@
 module Comee
   module Core
     class ClientPrice < ApplicationRecord
+      enum :status, {old: 0, current: 1, future: 2}
       belongs_to :product
       belongs_to :client
+      belongs_to :previous_price, class_name: "Comee::Core::ClientPrice", optional: true
 
-      validates :valid_from, :valid_to, :new_price, presence: true
-      validates :old_price, :new_price, numericality: {greater_than: 0, allow_nil: true}
+      validates :valid_from, :valid_to, :price, :status, presence: true
+      validates :price, numericality: {greater_than: 0}
       validates :product_id, uniqueness: {scope: :client_id}
       validate :validate_price_validity_dates
 
@@ -17,7 +19,7 @@ module Comee
       end
 
       def self.ransackable_attributes(auth_object = nil)
-        ["valid_from", "valid_to", "new_price", "old_price", "product_id", "client_id"]
+        ["valid_from", "valid_to", "price", "status", "product_id", "client_id", "previous_price_id"]
       end
 
       def self.ransackable_associations(auth_object = nil)

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

@@ -0,0 +1,9 @@
+module Comee
+  module Core
+    class FieldMapping < ApplicationRecord
+      enum :level, {client_order: 0, client_item: 1}
+      belongs_to :order_source
+      validates :source, :destination, :level, :order_source, presence: true
+    end
+  end
+end

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

@@ -3,10 +3,10 @@ module Comee
     class MasterPrice < ApplicationRecord
       belongs_to :supplier
       belongs_to :product
+      belongs_to :previous_price, class_name: "Comee::Core::MasterPrice", optional: true
 
-      validates :pp_valid_from, :pp_valid_to, :sp_valid_from, :sp_valid_to, :new_pprice, :new_sprice, presence: true
-      validates :old_pprice, :old_sprice, numericality: {greater_than: 0, allow_nil: true}
-      validates :new_pprice, :new_sprice, numericality: {greater_than: 0}
+      validates :purchase_price, :selling_price, :pp_valid_from, :pp_valid_to, :sp_valid_from, :sp_valid_to, presence: true
+      validates :margin, presence: true, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
       validates :product_id, uniqueness: {scope: :supplier_id}
       validate :validate_primary_price, :validate_purchase_price_validity_dates, :validate_selling_price_validity_dates
 

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

@@ -0,0 +1,8 @@
+module Comee
+  module Core
+    class OrderSource < ApplicationRecord
+      has_many :field_mappings
+      validates :base_url, :name, presence: true
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Comee
       belongs_to :client
       has_many :sales_order_items
 
-      enum :status, {draft: 0, confirmed: 1}
+      enum :status, {draft: 0, confirmed: 1, canceled: 2}
 
       validates :order_number, presence: true, uniqueness: true
       validates :order_date, :expected_delivery_date, :delivery_address, :invoice_address, :status, presence: true

data/db/migrate/20230812190652_create_comee_core_sales_orders.rb

@@ -6,7 +6,7 @@ class CreateComeeCoreSalesOrders < ActiveRecord::Migration[7.0]
       t.date :expected_delivery_date, null: false
       t.references :client,
         null: false,
-        index: {name: "client_on_ccco_indx"},
+        index: {name: "client_on_ccso_indx"},
         foreign_key: {to_table: :comee_core_clients}
       t.json :client_terms
       t.integer :payment_no_of_days, null: false, default: 0

data/db/migrate/20230813235946_create_comee_core_master_prices.rb

@@ -1,15 +1,15 @@
 class CreateComeeCoreMasterPrices < ActiveRecord::Migration[7.0]
   def change
     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 :sp_valid_to, null: false
-      t.float :old_pprice, null: true
-      t.float :new_pprice, null: false
-      t.float :old_sprice, null: true
-      t.float :new_sprice, null: false
+      t.boolean :active, null: false
       t.boolean :primary, null: false
+      t.integer :margin, null: false
       t.references :product,
         null: false,
         index: {name: "product_on_ccsp_indx"},
@@ -18,6 +18,10 @@ class CreateComeeCoreMasterPrices < ActiveRecord::Migration[7.0]
         null: false,
         index: {name: "supplier_on_ccsp_indx"},
         foreign_key: {to_table: :comee_core_suppliers}
+      t.references :previous_price,
+        null: true,
+        index: {name: "previous_price_on_ccsp_indx"},
+        foreign_key: {to_table: :comee_core_master_prices}
 
       t.timestamps
     end

data/db/migrate/20230814151601_create_comee_core_client_prices.rb

@@ -3,10 +3,8 @@ class CreateComeeCoreClientPrices < ActiveRecord::Migration[7.0]
     create_table :comee_core_client_prices do |t|
       t.date :valid_from, null: false
       t.date :valid_to, null: false
-      t.float :old_price, null: true
-      t.float :new_price, null: false
-      t.float :future_price, null: true
-      t.date :future_validity, null: true
+      t.float :price, null: false
+      t.float :status, null: false, default: 0
       t.references :product,
         null: false,
         index: {name: "product_on_cccp_indx"},
@@ -15,6 +13,10 @@ class CreateComeeCoreClientPrices < ActiveRecord::Migration[7.0]
         null: false,
         index: {name: "client_on_cccp_indx"},
         foreign_key: {to_table: :comee_core_clients}
+      t.references :previous_price,
+        null: true,
+        index: {name: "previous_price_on_cccp_indx"},
+        foreign_key: {to_table: :comee_core_client_prices}
 
       t.timestamps
     end

data/db/migrate/20230929115336_create_comee_core_order_sources.rb

@@ -0,0 +1,10 @@
+class CreateComeeCoreOrderSources < ActiveRecord::Migration[7.0]
+  def change
+    create_table :comee_core_order_sources do |t|
+      t.string :base_url, null: false
+      t.string :name, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230929120051_create_comee_core_field_mappings.rb

@@ -0,0 +1,15 @@
+class CreateComeeCoreFieldMappings < ActiveRecord::Migration[7.0]
+  def change
+    create_table :comee_core_field_mappings do |t|
+      t.string :source, null: false
+      t.string :destination, null: false
+      t.integer :level, null: false, default: 0
+      t.references :order_source,
+        null: false,
+        index: {name: "order_source_on_cfm_indx"},
+        foreign_key: {to_table: :comee_core_order_sources}
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230929130910_create_comee_core_client_orders.rb

@@ -0,0 +1,18 @@
+class CreateComeeCoreClientOrders < ActiveRecord::Migration[7.0]
+  def change
+    create_table :comee_core_client_orders do |t|
+      t.references :order_source,
+        null: false,
+        index: {name: "order_source_on_ccco_indx"},
+        foreign_key: {to_table: :comee_core_order_sources}
+      t.string :url, null: false
+      t.boolean :processed, null: false, default: true
+      t.references :client,
+        null: false,
+        index: {name: "client_on_ccco_indx"},
+        foreign_key: {to_table: :comee_core_clients}
+
+      t.timestamps
+    end
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.13"
+    VERSION = "0.1.15"
   end
 end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :client_order, class: "Comee::Core::ClientOrder" do
+    order_source
+    url { Faker::Internet.url }
+    processed { true }
+    client
+  end
+end

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

@@ -2,10 +2,8 @@ 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) }
-    old_price { 100 }
-    new_price { 110 }
-    future_price { nil }
-    future_validity { nil }
+    status { 0 }
+    price { 100 }
     product
     client
   end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :field_mapping, class: "Comee::Core::FieldMapping" do
+    source { Faker::Lorem.word }
+    destination { Faker::Lorem.word }
+    level { Comee::Core::FieldMapping.levels[:client_item] }
+    order_source
+  end
+end

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

@@ -1,14 +1,14 @@
 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) }
-    old_pprice { nil }
-    new_pprice { 100 }
-    old_sprice { nil }
-    new_sprice { 120 }
+    active { true }
     primary { false }
+    margin { 10.0 }
     product
     supplier
   end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :order_source, class: "Comee::Core::OrderSource" do
+    base_url { Faker::Internet.url }
+    name { Faker::Name.name }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.15
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-30 00:00:00.000000000 Z
+date: 2023-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -248,12 +248,15 @@ files:
 - app/models/comee/core/back_order.rb
 - app/models/comee/core/back_order_item.rb
 - app/models/comee/core/client.rb
+- app/models/comee/core/client_order.rb
 - app/models/comee/core/client_price.rb
 - app/models/comee/core/currency.rb
+- app/models/comee/core/field_mapping.rb
 - app/models/comee/core/invoice.rb
 - app/models/comee/core/invoice_item.rb
 - app/models/comee/core/master_price.rb
 - app/models/comee/core/notification.rb
+- app/models/comee/core/order_source.rb
 - app/models/comee/core/product.rb
 - app/models/comee/core/product_lookup.rb
 - app/models/comee/core/product_type.rb
@@ -297,6 +300,9 @@ files:
 - db/migrate/20230914041307_create_comee_core_external_products.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
+- db/migrate/20230929120051_create_comee_core_field_mappings.rb
+- db/migrate/20230929130910_create_comee_core_client_orders.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb
@@ -304,13 +310,16 @@ files:
 - lib/tasks/comee_core_tasks.rake
 - spec/factories/comee/core/back_order_items.rb
 - spec/factories/comee/core/back_orders.rb
+- spec/factories/comee/core/client_orders.rb
 - spec/factories/comee/core/client_prices.rb
 - spec/factories/comee/core/clients.rb
 - spec/factories/comee/core/currencies.rb
+- spec/factories/comee/core/field_mappings.rb
 - spec/factories/comee/core/invoice_items.rb
 - spec/factories/comee/core/invoices.rb
 - spec/factories/comee/core/master_prices.rb
 - spec/factories/comee/core/notifications.rb
+- spec/factories/comee/core/order_sources.rb
 - spec/factories/comee/core/product_lookups.rb
 - spec/factories/comee/core/product_types.rb
 - spec/factories/comee/core/products.rb