comee_core 0.1.79 → 0.1.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d71a8200c433afbae99cbd4b1ca79c35eee1213e1192ebe7e0af4094f172bc41
-  data.tar.gz: fa8fd302ec0376de853aa014d980f261c6cbabe517c1f7a5e1723a887271a98e
+  metadata.gz: a4318ef428c28e4dbcf4fe933ec2b485b451988f05b512743d27eee5279cd86f
+  data.tar.gz: d2ac11b22312a1ec6255c96f2bdcffed7339d4e5d53a8b547e5c478de715c509
 SHA512:
-  metadata.gz: 62e97416902c0185884d83f89bd19ea26a0b02e9a7aae46c8e144a57c2adeb9207fe577899490617eb75a2aadbcf868e30ec5443d0e8ffb12c7beef5f81acaee
-  data.tar.gz: 44d4a262ac39c7e97c7096cdc214ed842bf1f764d4b4233038decf27ef38fbcef8aba9d5e60622ba2ce9674ba7fc2775847c5775c615eaf0e7dda4972dc0df6e
+  metadata.gz: c466754e9b38187b8e07699ba940397ca8186350b074abaf193a133da26a53692935cbd8ffff307ba0ef8923f7ffa79cac8508d16662d81b270792269fea2acf
+  data.tar.gz: 0e053593a318be96788240fa1ecbe6116759a3096414bdee15df9795e7e110c74f992b6df4cec3eb0493608b55910111ecdb369e8c7efa9bf18b2c1796e17023

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

@@ -10,57 +10,24 @@ module Comee
         end
       end
 
+      def fetch_for_client
+        client = Comee::Core::Client.find(params[:id])
+        client_id = client.parent_id || client.id
+        prices = Comee::Core::ClientPrice.includes(:client, :product, :unit, :product_lookup)
+                                         .filter(client_id: client_id)
+        total = prices.count
+        prices = prices.then(&paginate)
+
+        render json: {success: true, data: serialize(prices), page: params[:page], total: total}
+      end
+
       def filter
-        @client_prices = Comee::Core::ClientPrice.includes(:client, :product, :unit).ransack(params[:q]).result
-        total = @client_prices.count
-        @client_prices = @client_prices.then(&paginate)
-        queries = @client_prices.map { |cp| {itemable_id: cp.client_id, product_id: cp.product_id, itemable_type: "Comee::Core::Client"} }
+        prices = Comee::Core::ClientPrice.includes(:client, :product, :unit, :product_lookup)
+                                         .ransack(params[:q]).result
+        total = prices.count
+        prices = prices.then(&paginate)
 
-        lookups = queries.inject(Comee::Core::ProductLookup.none) do |conditions, condition|
-          conditions.or(Comee::Core::ProductLookup.where(condition))
-        end
-        result = @client_prices.each_with_object([]) do |obj, res|
-          item = {
-            id: obj.id,
-            valid_from: obj.valid_from,
-            valid_to: obj.valid_to,
-            price: obj.price,
-            status: obj.status,
-            margin: obj.margin,
-            margin_type: obj.margin_type,
-            client_id: obj.client.id,
-            client_code: obj.client.code,
-            client_name: obj.client.name,
-            client_address: obj.client.address,
-            product_id: obj.product.id,
-            product_code: obj.product.code,
-            product_name: obj.product.name,
-            product_description: obj.product.description,
-            product_preferred_units: obj.product.preferred_units,
-            product_weight: obj.product.weight,
-            product_weight_unit: obj.product.weight_unit,
-            product_dimensions: obj.product.dimensions,
-            product_hs_code: obj.product.hs_code,
-            product_hs_description: obj.product.hs_description,
-            product_image: obj.product.thumbnail_image_url,
-            unit_id: obj.unit.id,
-            unit_code: obj.unit.code,
-            unit_name: obj.unit.name
-          }
-          lkp = lookups.select { |lookup| lookup.itemable_id == obj.client_id && lookup.product_id == obj.product_id }
-          if lkp.count.positive?
-            item[:client_product_code] = lkp[0].code
-            item[:client_product_name] = lkp[0].item_description
-          end
-          res << item
-        end
-        result = {success: true, data: result}
-        page = params[:page]
-        if page
-          result[:page] = page
-          result[:total] = total
-        end
-        render json: result
+        render json: {success: true, data: serialize(prices), page: params[:page], total: total}
       end
 
       private

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

@@ -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[
@@ -25,7 +37,7 @@ module Comee
       end
 
       def self.ransackable_associations(_auth_object = nil)
-        %w[product client]
+        %w[product client product_lookup]
       end
     end
   end

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
@@ -45,7 +56,7 @@ module Comee
       end
 
       def self.ransackable_associations(_auth_object = nil)
-        %w[product supplier]
+        %w[product supplier product_lookup]
       end
     end
   end

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

@@ -5,6 +5,7 @@ module Comee
       belongs_to :product
       belongs_to :client
       belongs_to :unit
+      belongs_to :product_lookup
     end
   end
 end

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

@@ -4,6 +4,7 @@ module Comee
       attributes :id, :purchase_price, :selling_price, :valid_from, :valid_to, :primary, :margin, :lead_time, :status
       belongs_to :product
       belongs_to :supplier
+      belongs_to :product_lookup
     end
   end
 end

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.79".freeze
+    VERSION = "0.1.81".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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.79
+  version: 0.1.81
 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