cats_core 1.5.26 → 1.5.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c8be1ba8f56a842d768b82e55d12671dac81db7ca6d7c720bec9fd6743f96fd
-  data.tar.gz: 58d6e641497d4419d813b8bde9937215143038cfb9cf1d4a54cdf53e89f0a438
+  metadata.gz: 2865fcf1ffc5a821dd2011d92cb64aa062ff61441c82c1c510af16035827f082
+  data.tar.gz: 8e5c5bc4826e22b2e7cdf6aa4cd2b29466085e7a4ce296121b074f59a71adc37
 SHA512:
-  metadata.gz: d74325e8d1a2ec67aac8c40098fb71ca67336b4d115847cecabec7d577c1394c75689cadbed0c832697806a011e369d8368aefcf4ec49db39b133823c6503ac7
-  data.tar.gz: e10a0b3750fdba8f67a2404b9d579739f00b198042798610313a5ddd20a27c7743c5d4b3b99826acf988f91c68133603415c40749e7f79eafeae1759cfda56dd
+  metadata.gz: a6c116447db30f695bad8135801888cd90878bc53e84e284bf6f648e4ac56e469ea9f8abaea4c8120ce04220d7e8b83a8cb8fdd529a37b0b3308c70f48ff622f
+  data.tar.gz: 5393dbaab893533aa60034deab2ce0e3827dad922f70f254ebad50c7f411e77dca0bad8e9daf3441b15ed2bf4f0d92c61e79de784eabb94bfd76244b6cfd92f0

data/app/controllers/cats/core/dispatch_plans_controller.rb

@@ -51,7 +51,7 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:reference_no, :dispatchable_id, :dispatchable_type)
+        params.require(:payload).permit(:reference_no, :dispatchable_id, :dispatchable_type, :status)
       end
 
       def bulk_create_params

data/app/controllers/cats/core/dispatches_controller.rb

@@ -91,7 +91,7 @@ module Cats
 
       def model_params
         params.require(:payload).permit(:reference_no, :dispatch_plan_item_id, :transporter_id, :plate_no, :unit_id,
-                                        :driver_name, :driver_phone, :remark)
+                                        :driver_name, :driver_phone, :remark, :dispatch_status)
       end
 
       def start_with_pin_params

data/app/controllers/cats/core/inventory_adjustments_controller.rb

@@ -0,0 +1,24 @@
+module Cats
+  module Core
+    class InventoryAdjustmentsController < ApplicationController
+      include Common
+
+      def filter
+        query = InventoryAdjustment.ransack(params[:q])
+        render json: {success: true, data: serialize(query.result)}
+      end
+
+      def commit
+        adjustment = InventoryAdjustment.find(params[:id])
+        adjustment.commit
+        render json: {success: true, data: serialize(adjustment)}
+      end
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:stack_id, :reference_no, :reason_for_adjustment, :adjustment_date, :quantity, :unit_id)
+      end
+    end
+  end
+end

data/app/controllers/cats/core/stack_transactions_controller.rb

@@ -5,14 +5,13 @@ module Cats
 
       def index
         super do
-          StackTransaction.joins(source: :store)
-                          .includes(:unit)
+          StackTransaction.includes(:unit, :destination, source: :store)
                           .where(cats_core_stacks: {cats_core_stores: {warehouse_id: params[:id]}})
         end
       end
 
       def filter
-        query = StackTransaction.ransack(params[:q])
+        query = StackTransaction.includes(:source, :destination, :unit).ransack(params[:q])
         render json: {success: true, data: serialize(query.result)}
       end
 

data/app/models/cats/core/dispatch_plan_item.rb

@@ -30,6 +30,18 @@ module Cats
       delegate(:abbreviation, to: :unit, prefix: true)
       delegate(:shipping_reference, to: :commodity, prefix: true)
 
+      def woreda
+        destination.location_type == "Fdp" ? destination.parent.name : ""
+      end
+
+      def zone
+        destination.location_type == "Fdp" ? destination.parent.parent.name : ""
+      end
+
+      def region
+        destination.location_type == "Fdp" ? destination.parent.parent.parent.name : ""
+      end
+
       # Authorize a dispatch plan item if it contains authorization entries
       # under it. A dispatch plan item can be authorized by source hub, or
       # source and destination hub. Hence the status can be `SOURCE_AUTHORIZED`,

data/app/models/cats/core/dispatch_transaction.rb

@@ -5,6 +5,7 @@ module Cats
 
       belongs_to :source, class_name: "Cats::Core::Stack"
       belongs_to :dispatch_authorization
+      validates :reference_no, presence: true, uniqueness: true
 
       validates :source_id, uniqueness: {scope: :dispatch_authorization_id}
       validate :validate_dispatch

data/app/models/cats/core/inventory_adjustment.rb

@@ -0,0 +1,30 @@
+module Cats
+  module Core
+    class InventoryAdjustment < ApplicationRecord
+      # adjustment statuses
+      DRAFT = "Draft".freeze
+      COMMITTED = "Committed".freeze
+      STATUSES = [DRAFT, COMMITTED].freeze
+
+      belongs_to :stack
+      belongs_to :unit, class_name: "UnitOfMeasure"
+
+      validates :reference_no, presence: true, uniqueness: true
+      validates :quantity, :reason_for_adjustment, :adjustment_date, presence: true
+      validates :status, inclusion: {in: STATUSES}
+
+      delegate(:abbreviation, to: :unit, prefix: true)
+      delegate(:code, to: :stack, prefix: true)
+
+      def commit
+        adjusted_quantity = UnitConversion.convert(stack.unit, Cats::Core::UnitOfMeasure.find(unit_id), quantity)
+
+        stack.quantity += adjusted_quantity
+        stack.save
+
+        self.status = COMMITTED
+        save
+      end
+    end
+  end
+end

data/app/models/cats/core/receipt.rb

@@ -9,7 +9,7 @@ module Cats
       validates :commodity_status, presence: true, inclusion: {in: Commodity::COMMODITY_STATUSES}
       validates :commodity_grade, inclusion: {in: Commodity::COMMODITY_GRADES}, allow_nil: true
       validates :quantity, presence: true, numericality: {greater_than: 0}
-      # validates :reference_no, presence: true
+      validates :reference_no, presence: true, uniqueness: true
       validate :validate_quantity
 
       delegate(:abbreviation, to: :unit, prefix: true)

data/app/models/cats/core/stack_transaction.rb

@@ -5,18 +5,11 @@ module Cats
       belongs_to :destination, class_name: "Cats::Core::Stack"
       belongs_to :unit, class_name: "Cats::Core::UnitOfMeasure"
 
-      validate :validate_commodity
-
-      def validate_quantity
-        return unless quantity.present? && source.present?
-
-        dispatched = StackTransaction.where(source: source, status: DRAFT).sum(:quantity)
+      delegate(:code, to: :source, prefix: true)
+      delegate(:code, to: :destination, prefix: true)
+      delegate(:abbreviation, to: :unit, prefix: true)
 
-        available = source.quantity - dispatched
-        available += quantity_was if quantity_was
-
-        errors.add(:quantity, "total is higher than source quantity (Max = #{available}).") if quantity > available
-      end
+      validate :validate_commodity
 
       def validate_commodity
         return unless source && destination

data/app/serializers/cats/core/dispatch_plan_item_serializer.rb

@@ -4,7 +4,7 @@ module Cats
       attributes :id, :reference_no, :dispatch_plan_id, :plan_reference_no, :source_id, :source_name, :destination_id,
                  :destination_name, :quantity, :source_location_type, :destination_location_type, :commodity_status,
                  :status, :commodity_id, :commodity_name, :commodity_batch_no, :unit_abbreviation,
-                 :commodity_shipping_reference, :unit_id
+                 :commodity_shipping_reference, :unit_id, :woreda, :zone, :region
     end
   end
 end

data/app/serializers/cats/core/inventory_adjustment_serializer.rb

@@ -0,0 +1,8 @@
+module Cats
+  module Core
+    class InventoryAdjustmentSerializer < ActiveModel::Serializer
+      attributes :id, :unit_id, :unit_abbreviation, :reference_no, :quantity, :reason_for_adjustment,
+                 :adjustment_date, :status, :stack_id, :stack_code
+    end
+  end
+end

data/app/serializers/cats/core/stack_transaction_serializer.rb

@@ -1,7 +1,8 @@
 module Cats
   module Core
     class StackTransactionSerializer < ActiveModel::Serializer
-      attributes :id, :source_id, :destination_id, :quantity, :transaction_date, :status, :unit_id, :unit_abbreviation
+      attributes :id, :source_id, :source_code, :destination_id, :destination_code, :unit_id,
+                 :unit_abbreviation, :transaction_date, :quantity, :status
     end
   end
 end

data/config/routes.rb

@@ -195,7 +195,7 @@ Cats::Core::Engine.routes.draw do
   resources :receipt_transactions, except: %i[index new edit destroy]
   resources :stack_transactions, except: %i[index new edit destroy] do
     member do
-      post "commit"
+      post "commit", controller: :stack_transactions, action: :commit
     end
   end
   resources :lost_commodities, except: %i[index destroy]
@@ -233,4 +233,12 @@ Cats::Core::Engine.routes.draw do
     end
   end
   post "/stores/filter", controller: :stores, action: :filter
+  post 'stack_transactions/filter', controller: :stack_transactions, action: :filter
+  resources :stack_transactions, only: %i[index create update]
+  post 'inventory_adjustments/filter', controller: :inventory_adjustments, action: :filter
+  resources :inventory_adjustments, only: %i[index create update] do
+    member do
+      post "commit", controller: :inventory_adjustments, action: :commit
+    end
+  end
 end

data/db/migrate/20231129071520_create_cats_core_inventory_adjustments.rb

@@ -0,0 +1,21 @@
+class CreateCatsCoreInventoryAdjustments < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_inventory_adjustments do |t|
+      t.string :reference_no
+      t.float :quantity
+      t.string :reason_for_adjustment
+      t.date :adjustment_date, null: false
+      t.string :status, null: false, default: "Draft"
+      t.references :unit,
+                   null: false,
+                   index: {name: "unit_on_inventory_indx"},
+                   foreign_key: {to_table: :cats_core_unit_of_measures}
+      t.references :stack,
+                   null: false,
+                   index: {name: "stack_on_inventory_indx"},
+                   foreign_key: {to_table: :cats_core_stacks}
+
+      t.timestamps
+    end
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = "1.5.26".freeze
+    VERSION = "1.5.27".freeze
   end
 end

data/spec/factories/cats/core/inventory_adjustments.rb

@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :inventory_adjustment, class: "Cats::Core::InventoryAdjustment" do
+    reference_no { FFaker::Name.name }
+    quantity { 1.5 }
+    adjustment_date { Date.today }
+    status { Cats::Core::Transaction::DRAFT }
+    reason_for_adjustment { FFaker::Name.name }
+    unit factory: :unit_of_measure
+    stack
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.5.26
+  version: 1.5.27
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-24 00:00:00.000000000 Z
+date: 2023-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -298,6 +298,7 @@ files:
 - app/controllers/cats/core/dispatch_plans_controller.rb
 - app/controllers/cats/core/dispatch_transactions_controller.rb
 - app/controllers/cats/core/dispatches_controller.rb
+- app/controllers/cats/core/inventory_adjustments_controller.rb
 - app/controllers/cats/core/loans_controller.rb
 - app/controllers/cats/core/locations_controller.rb
 - app/controllers/cats/core/lost_commodities_controller.rb
@@ -347,6 +348,7 @@ files:
 - app/models/cats/core/donor.rb
 - app/models/cats/core/gift_certificate.rb
 - app/models/cats/core/hub_authorization.rb
+- app/models/cats/core/inventory_adjustment.rb
 - app/models/cats/core/loan.rb
 - app/models/cats/core/location.rb
 - app/models/cats/core/lost_commodity.rb
@@ -415,6 +417,7 @@ files:
 - app/serializers/cats/core/dispatch_plan_serializer.rb
 - app/serializers/cats/core/dispatch_serializer.rb
 - app/serializers/cats/core/dispatch_transaction_serializer.rb
+- app/serializers/cats/core/inventory_adjustment_serializer.rb
 - app/serializers/cats/core/loan_serializer.rb
 - app/serializers/cats/core/location_serializer.rb
 - app/serializers/cats/core/lost_commodity_serializer.rb
@@ -527,6 +530,7 @@ files:
 - db/migrate/20221024081134_add_reference_no_to_cats_core_receipts.rb
 - db/migrate/20221024081141_add_reference_no_to_cats_core_dispatch_transactions.rb
 - db/migrate/20230102064317_add_receipt_number_to_cats_core_receipt_transactions.rb
+- db/migrate/20231129071520_create_cats_core_inventory_adjustments.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -553,6 +557,7 @@ files:
 - spec/factories/cats/core/donors.rb
 - spec/factories/cats/core/gift_certificates.rb
 - spec/factories/cats/core/hub_authorizations.rb
+- spec/factories/cats/core/inventory_adjustments.rb
 - spec/factories/cats/core/loans.rb
 - spec/factories/cats/core/locations.rb
 - spec/factories/cats/core/lost_commodities.rb