cats_core 1.5.28 → 1.5.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f4c5959fbfc273f8809d25ec667efe26c657ecaf5ffee395db78d7a5082344d
-  data.tar.gz: f9e7f7f16def88dbd3f228dece31bdfce72b1d546899a93671a345994aaf23b2
+  metadata.gz: 03b358ca3dc8a8908dc00309ca843ab82e9703f9224c5d726cf1762034bf76ed
+  data.tar.gz: 3e0da8d5c95a1bd32c90f76d78bd17bd3b70e2c5466916945b96d6292c3ae3f7
 SHA512:
-  metadata.gz: a965719b330ddaca566572abe5c8a5aec87214f53cfd465c2199477a7e9d5d1b7d43cd07748e2ad0f27a0a6eebc9642d864fccd5fa91dfeb2571137494fe0749
-  data.tar.gz: 0c2d16529bdee5a560c756e3feeb0b37924bfe531e17771b721ee242024938ed0ca0d52f28bf09899c45a198b5c16ad058e1bd17eaec6747367246f6aaaf63db
+  metadata.gz: fb22c2473633590d0c8f760b2a8dd178d19646e6ff9193b79f7536c0bbe9e3f2c16e3a860b9de66938d13279a1bcd0a3855b9593ff48ac5662ce10c9bc071c6c
+  data.tar.gz: 73fe0f22b150696c145d28eb4343145f033643ec7259f6865f6b725e2c052880e1905c28b78ea860858da58bb5d0753b96a16fa358e9a7cd2319b3376de27f4f

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

@@ -76,7 +76,7 @@ module Cats
           :dispatchable_type,
           items: %i[
             reference_no region zone woreda fdp commodity_category unit_id unit quantity source_id destination_id
-            commodity_id commodity_status
+            commodity_id commodity_status beneficiaries
           ]
         )
       end

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

@@ -104,6 +104,7 @@ module Cats
         %w[
           commodity_id
           commodity_status
+          reference_no
           destination_id
           dispatch_plan_id
           quantity

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

@@ -7,6 +7,7 @@ module Cats
       belongs_to :destination, class_name: "Cats::Core::Stack"
 
       validates :transaction_date, presence: true
+      validates :receipt_number, uniqueness: true
       validates :quantity, presence: true, numericality: {greater_than: 0}
       validates :receipt_number, presence: true
       validate :validate_receipt, :validate_quantity

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

@@ -9,7 +9,7 @@ module Cats
       delegate(:code, to: :destination, prefix: true)
       delegate(:abbreviation, to: :unit, prefix: true)
 
-      validate :validate_commodity
+      validate :validate_commodity, :validate_quantity
 
       def validate_commodity
         return unless source && destination
@@ -19,14 +19,30 @@ module Cats
         errors.add(:commodity, "batch number should be the same.")
       end
 
+      def validate_quantity
+        return unless quantity.present? && source.present?
+
+        dispatched = StackTransaction.where(source: source, status: DRAFT)
+        total_dispatched = dispatched.reduce(0) do |_sum, rec|
+          UnitConversion.convert(source.unit, Cats::Core::UnitOfMeasure.find(rec.unit_id), rec.quantity)
+        end
+        available = source.quantity - total_dispatched
+        available += UnitConversion.convert(source.unit, unit, quantity_was) if quantity_was
+
+        converted_quantity = UnitConversion.convert(source.unit, Cats::Core::UnitOfMeasure.find(unit_id), quantity)
+
+        errors.add(:quantity, "total is higher than source quantity (Max = #{available}).") if converted_quantity > available
+      end
+
       def commit
         StackTransaction.transaction do
+          self.status = COMMITTED
+          save!
           source.quantity -= UnitConversion.convert(unit, source.unit, quantity)
           source.save!
           destination.quantity += UnitConversion.convert(unit, destination.unit, quantity)
+          destination.stack_status = Stack::ALLOCATED if destination.stack_status == Stack::RESERVED
           destination.save!
-          self.status = COMMITTED
-          save!
         end
       end
     end

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

@@ -1,12 +1,17 @@
 module Cats
   module Core
     class TransportContract < ApplicationRecord
+      ACTIVE = "Active".freeze
+      CANCELLED = "Cancelled".freeze
+      CONTRACT_STATUSES = [ACTIVE, CANCELLED].freeze
+
       belongs_to :transporter
       belongs_to :transport_bid
       has_many :contract_items
 
       validates :contract_no, presence: true, uniqueness: true
       validates :contract_date, :expires_on, presence: true
+      validates :status, presence: true, inclusion: {in: CONTRACT_STATUSES}
 
       delegate(:name, to: :transporter, prefix: true)
       delegate(:reference_no, to: :transport_bid, prefix: :bid)

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

@@ -5,6 +5,10 @@ module Cats
       APPROVED = "Approved".freeze
       STATUSES = [DRAFT, APPROVED].freeze
 
+      ACTIVE = "Active".freeze
+      CANCELLED = "Cancelled".freeze
+      ORDER_STATUSES = [ACTIVE, CANCELLED].freeze
+
       belongs_to :transport_requisition
       belongs_to :prepared_by, class_name: "Cats::Core::User"
       belongs_to :approved_by, class_name: "Cats::Core::User", optional: true
@@ -12,7 +16,8 @@ module Cats
       has_many :transport_order_items
 
       validates :status, presence: true, inclusion: {in: STATUSES}
-      validates :order_date, presence: true
+      validates :order_status, presence: true, inclusion: {in: ORDER_STATUSES}
+      validates :order_date, :order_no, presence: true
       validate :validate_against_requisition, :validate_status
 
       delegate(:full_name, to: :prepared_by, prefix: true)

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

@@ -1,18 +1,27 @@
 module Cats
   module Core
     class TransportOrderItem < ApplicationRecord
+      ACTIVE = "Active".freeze
+      CANCELLED = "Cancelled".freeze
+
+      ORDER_ITEM_STATUSES = [ACTIVE, CANCELLED].freeze
       belongs_to :transport_order
       belongs_to :transporter
       belongs_to :transport_requisition_item
       belongs_to :transport_contract, optional: true
+      belongs_to :unit, class_name: "Cats::Core::UnitOfMeasure"
+      belongs_to :route
 
-      validates :valid_for, presence: true
+      validates :valid_for, :quantity, presence: true
       validates :valid_for, numericality: {greater_than: 0}
+      validates :status, presence: true, inclusion: {in: ORDER_ITEM_STATUSES}
       validates :transport_requisition_item_id, uniqueness: true
       validate :validate_requisition
 
       delegate(:name, to: :transporter, prefix: true)
-      delegate(:contract_no, to: :transport_contract, prefix: false)
+      delegate(:name, to: :route, prefix: true)
+      delegate(:abbreviation, to: :unit, prefix: true)
+      delegate(:contract_no, to: :transport_contract, prefix: false, allow_nil: true)
 
       def validate_requisition
         return unless transport_requisition_item

data/app/notifications/cats/core/receipt_authorization_notification.rb

@@ -8,6 +8,7 @@ module Cats
       def message
         authorization = params[:receipt_authorization]
         dispatch = authorization.dispatch
+        ref_no = dispatch.dispatch_plan_item.dispatch_plan.upstream ? dispatch.dispatch_transactions[0].reference_no : dispatch.reference_no
         commodity = dispatch.dispatch_plan_item.commodity
         title = "Receipt Authorization Notification - #{commodity.name}"
         date = Date.today
@@ -15,7 +16,7 @@ module Cats
         body = <<~BODY
           Commodity with the following details has been dispatched to you:
               Authorization no. = #{dispatch.dispatch_plan_item.reference_no}
-              Dispatch Ref. = #{dispatch.reference_no}
+              Dispatch Ref. = #{ref_no}
               Batch No. = #{commodity.batch_no}
               Commodity = #{commodity.name}
               Quantity = #{authorization.quantity}

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, :woreda, :zone, :region
+                 :commodity_shipping_reference, :unit_id, :woreda, :zone, :region, :beneficiaries
     end
   end
 end

data/app/services/cats/core/dispatch_plan_service.rb

@@ -87,6 +87,7 @@ module Cats
             woreda: detail.beneficiary_round_plan_item.round_plan_item.woreda.name,
             fdp: detail.beneficiary_round_plan_item.round_plan_item.fdp.name,
             commodity_category: detail.round_ration.commodity_category.name,
+            beneficiaries: detail.beneficiary_round_plan_item.beneficiaries,
             unit_id: detail.unit_id,
             unit: detail.unit.abbreviation,
             quantity: detail.quantity,
@@ -132,6 +133,7 @@ module Cats
               unit_id: item[:unit_id],
               commodity_id: item[:commodity_id],
               commodity_status: item[:commodity_status],
+              beneficiaries: item[:beneficiaries],
               status: Cats::Core::DispatchPlanItem::UNAUTHORIZED
             }
           end

data/db/migrate/20231227114358_add_beneficiaries_to_cats_core_dispatch_plan_items.rb

@@ -0,0 +1,5 @@
+class AddBeneficiariesToCatsCoreDispatchPlanItems < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cats_core_dispatch_plan_items, :beneficiaries, :integer
+  end
+end

data/db/migrate/20240125051557_add_status_unit_and_quantity_to_transport_order_item.rb

@@ -0,0 +1,18 @@
+class AddStatusUnitAndQuantityToTransportOrderItem < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cats_core_transport_order_items, :unit_id, :integer
+    add_foreign_key :cats_core_transport_order_items,
+                    :cats_core_unit_of_measures,
+                    column: :unit_id, null: false,
+                    index: {name: "unit_on_toi_indx"}
+    add_column :cats_core_transport_order_items, :route_id, :integer
+    add_foreign_key :cats_core_transport_order_items,
+                    :cats_core_routes,
+                    column: :route_id, null: false,
+                    index: {name: "route_on_toi_indx"}
+    add_column :cats_core_transport_order_items, :quantity, :float, null: false
+    add_column :cats_core_transport_order_items, :status, :string, null: false
+    remove_index :cats_core_transport_order_items, :transport_requisition_item_id,
+                 name: "tri_on_toi_uniq_indx"
+  end
+end

data/db/migrate/20240125051632_add_status_to_transport_order.rb

@@ -0,0 +1,6 @@
+class AddStatusToTransportOrder < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cats_core_transport_orders, :order_status, :string, null: false, default: "Active"
+    add_column :cats_core_transport_orders, :order_no, :string, null: false
+  end
+end

data/db/migrate/20240125051644_add_status_to_contract.rb

@@ -0,0 +1,5 @@
+class AddStatusToContract < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cats_core_transport_contracts, :status, :string, null: false, default: "Active"
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = "1.5.28".freeze
+    VERSION = "1.5.30".freeze
   end
 end

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

@@ -1,14 +1,17 @@
 FactoryBot.define do
   factory :stack_transaction, class: "Cats::Core::StackTransaction" do
     transient do
-      unit_of_measure { create(:unit_of_measure) }
-      commodity { create(:commodity, unit: unit_of_measure) }
+      unit_of_measure_1 { create(:unit_of_measure) }
+      unit_of_measure_2 { create(:unit_of_measure) }
+      commodity { create(:commodity, unit: unit_of_measure_1) }
+      unit_conversion_1 { create(:unit_conversion, from: unit_of_measure_1, to: unit_of_measure_2) }
+      unit_conversion_2 { create(:unit_conversion, from: unit_of_measure_2, to: unit_of_measure_1) }
     end
-    source { association :stack, commodity: commodity }
-    destination { association :stack, commodity: commodity }
+    source { association :stack, commodity: commodity, unit: unit_of_measure_1 }
+    destination { association :stack, commodity: commodity, unit: unit_of_measure_2 }
     transaction_date { Date.today }
     quantity { 25 }
-    unit { unit_of_measure }
+    unit { unit_of_measure_1 }
     status { Cats::Core::Transaction::DRAFT }
   end
 end

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

@@ -6,5 +6,6 @@ FactoryBot.define do
     contract_date { Date.today }
     expires_on { Date.today + 6.month }
     payment_term { FFaker::Name.name }
+    status { Cats::Core::TransportContract::ACTIVE }
   end
 end

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

@@ -5,5 +5,9 @@ FactoryBot.define do
     transport_contract
     transport_requisition_item { transport_order.transport_requisition.transport_requisition_items.first }
     valid_for { 10 }
+    quantity { 12 }
+    status { Cats::Core::TransportOrderItem::ACTIVE }
+    unit factory: :unit_of_measure
+    route
   end
 end

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

@@ -5,5 +5,7 @@ FactoryBot.define do
     approved_by factory: :user
     order_date { Date.today }
     status { Cats::Core::TransportOrder::DRAFT }
+    order_status { Cats::Core::TransportOrder::ACTIVE }
+    order_no { "2/2024/TNA/REQ-001" }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.5.28
+  version: 1.5.30
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-06 00:00:00.000000000 Z
+date: 2024-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -531,6 +531,10 @@ files:
 - 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
+- db/migrate/20231227114358_add_beneficiaries_to_cats_core_dispatch_plan_items.rb
+- db/migrate/20240125051557_add_status_unit_and_quantity_to_transport_order_item.rb
+- db/migrate/20240125051632_add_status_to_transport_order.rb
+- db/migrate/20240125051644_add_status_to_contract.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb