comee_core 0.1.98 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b02327a6f7076613d6072fc19df00c3c19b8256dfba0e90d254d4c63f21cd87
-  data.tar.gz: eab3d691391e6aa77b95074449704f65f2b7320f3a920b00ef645b651351bec4
+  metadata.gz: 57905a1877a1cfdd9fea4c9e066e0f9ee22917dac5b52da002c2c6870f8599da
+  data.tar.gz: fd73641d6b2535751080b5d582b96e4f8506b192f990b664644afaef4a187b7b
 SHA512:
-  metadata.gz: bb5963d8249beac05dc28de793a53c970168f0da7f20f289e0bbb2c81562b633e85be1eb77befe79f268535b3b23174fda847b15e940e21575f1fd0502de977a
-  data.tar.gz: c5ceac445d220ed100a80ce759f62ac5537bb862e357dfb855552b49aa5b94880163baaae8f371a16f96db07d30491d92fa04043420c9f4084154e5f34003904
+  metadata.gz: 74ed17525f0cad01052f2b1b3f4dbe72dc6c155422e738ca441686402b3fa19ab1c6c616021c211e918b39d05d00cef643b0cbf7e634250bc1a72d4c8a838fed
+  data.tar.gz: 78ddd02578f0e92d16d75e04399d08d081fd9d00e989c4ea76c6c7ec29b86686010a91032a2e3de26369e817a997b7b1c7e554c0a1301e9ccc6d50a095fba79c

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

@@ -9,6 +9,52 @@ module Comee
         end
       end
 
+      def create
+        super do
+          price = ClientPrice.new(model_params)
+          master_price = MasterPrice.find_by(product_id: price.product_id, primary: true)
+          price.price = master_price&.selling_price
+          if price.price
+            price.price = price.margin_increase? ? price.price * (1 + price.margin / 100) : price.price * (1 - price.margin / 100)
+          end
+          price
+        end
+      end
+
+      def update
+        if @obj.draft?
+          product_id = model_params[:product_id] || @obj.product_id
+          master_price = MasterPrice.find_by(product_id: product_id, primary: true)
+          @obj.price = master_price&.selling_price
+          if @obj.price
+            @obj.price = @obj.margin_increase? ? @obj.price * (1 + @obj.margin / 100) : @obj.price * (1 - @obj.margin / 100)
+          end
+          if @obj.update(model_params)
+            render_content(@obj)
+          else
+            render json: {success: false, error: @obj.errors.full_messages[0]}, status: :unprocessable_entity
+          end
+        else
+          error = "Client price should be in draft state to edit."
+          render json: {success: false, error: error}, status: :unprocessable_entity
+        end
+      rescue StandardError => e
+        render json: {success: false, error: e.message}
+      end
+
+      def extend_validity
+        price = ClientPrice.find(params[:id])
+        if price.draft?
+          render json: {success: false, error: "Price must be an approved price for validity extension."}
+        else
+          price.valid_to = extend_params[:valid_to]
+          price.save!
+          render_content(price)
+        end
+      rescue StandardError => e
+        render json: {success: false, error: e.message}
+      end
+
       def fetch_for_client
         client = Client.find(params[:id])
         client_id = client.parent_id || client.id
@@ -17,6 +63,14 @@ module Comee
         render_content(prices)
       end
 
+      def approve
+        price = ClientPrice.find(params[:id])
+        price = price.approve
+        render_content(price)
+      rescue StandardError => e
+        render json: {success: false, error: e.message}, status: :unprocessable_entity
+      end
+
       def filter
         prices = ClientPrice.includes(:client, :product, :unit, :product_lookup)
                             .ransack(params[:q]).result
@@ -26,9 +80,13 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:valid_from, :valid_to, :price, :product_id, :margin, :margin_type, :client_id, :previous_price,
+        params.require(:payload).permit(:valid_from, :valid_to, :product_id, :margin, :margin_type, :client_id, :previous_price,
                                         :unit_id)
       end
+
+      def extend_params
+        params.require(:payload).permit(:valid_to)
+      end
     end
   end
 end

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

@@ -5,6 +5,10 @@ module Comee
       belongs_to :client
 
       validates :url, :processed, presence: true
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[client_id id order_source_id processed]
+      end
     end
   end
 end

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

@@ -23,6 +23,14 @@ module Comee
         end
       end
 
+      def margin_increase?
+        ClientPrice.margin_types[margin_type] == ClientPrice.margin_types[:increase]
+      end
+
+      def margin_discount?
+        ClientPrice.margin_types[margin_type] == ClientPrice.margin_types[:discount]
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id

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

@@ -23,6 +23,14 @@ module Comee
         errors.add(:base, "Price validity date range is not correct.") unless period.valid?
       end
 
+      def draft?
+        Price.price_statuses[price_status] == Price.price_statuses[:draft]
+      end
+
+      def approved?
+        Price.price_statuses[price_status] == Price.price_statuses[:approved]
+      end
+
       def compute_status
         period = Period.new(valid_from, valid_to)
         if period.past?
@@ -34,6 +42,16 @@ module Comee
         end
       end
 
+      def approve
+        if Price.price_statuses[price_status] == Price.price_statuses[:approved]
+          raise(StandardError, "Price status is already in approved state.")
+        end
+
+        self.price_status = Price.price_statuses[:approved]
+        save!
+        self
+      end
+
       def past?
         Price.statuses[status] == Price.statuses[:past]
       end

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

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

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

@@ -1,7 +1,8 @@
 module Comee
   module Core
     class MasterPriceSerializer < ActiveModel::Serializer
-      attributes :id, :purchase_price, :selling_price, :valid_from, :valid_to, :primary, :margin, :lead_time, :status
+      attributes :id, :purchase_price, :selling_price, :valid_from, :valid_to, :primary, :margin, :lead_time, :status,
+                 :price_status
       belongs_to :product
       belongs_to :supplier
       belongs_to :product_lookup

data/config/routes.rb

@@ -93,8 +93,15 @@ Comee::Core::Engine.routes.draw do
     end
   end
   resources :agents
-  post "/client_prices/filter", controller: :client_prices, action: :filter
-  resources :client_prices
+  resources :client_prices do
+    member do
+      post "extend_validity"
+      post "approve"
+    end
+    collection do
+      post "filter"
+    end
+  end
   post "/back_orders/filter", controller: :back_orders, action: :filter
   resources :back_orders do
     member do

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.98".freeze
+    VERSION = "0.2.0".freeze
   end
 end

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

@@ -22,5 +22,9 @@ FactoryBot.define do
       valid_from { Date.current.advance(months: 1) }
       valid_to { Date.current.advance(months: 2) }
     end
+
+    trait :approved do
+      price_status { Comee::Core::Price.price_statuses[:approved] }
+    end
   end
 end

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

@@ -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.98
+  version: 0.2.0
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-20 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers