cats_core 1.5.27 → 1.5.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2865fcf1ffc5a821dd2011d92cb64aa062ff61441c82c1c510af16035827f082
-  data.tar.gz: 8e5c5bc4826e22b2e7cdf6aa4cd2b29466085e7a4ce296121b074f59a71adc37
+  metadata.gz: 3871baf3450e7366757ebaa26bbf157b8bed3d9445f8cedd32a384be3c085a75
+  data.tar.gz: bade4250d1176e8ebc8bc99136dafcbab78761b8d2d8dab93d004f3eabbc49d4
 SHA512:
-  metadata.gz: a6c116447db30f695bad8135801888cd90878bc53e84e284bf6f648e4ac56e469ea9f8abaea4c8120ce04220d7e8b83a8cb8fdd529a37b0b3308c70f48ff622f
-  data.tar.gz: 5393dbaab893533aa60034deab2ce0e3827dad922f70f254ebad50c7f411e77dca0bad8e9daf3441b15ed2bf4f0d92c61e79de784eabb94bfd76244b6cfd92f0
+  metadata.gz: 87458b788af5a370a0fdc04ef9214ae4b2abefdb5c4a94e472bbccc71281c9d464a00fa5f6046a722946aaf9a30cbacbe5fe370ac3a236e88ae6705fe7a3fc89
+  data.tar.gz: 3e618ea3300eb3b742668ccd3e694672545d9bef499a4bd46b4221505cc6fb396c0bee19dda5d0f65788fc50e70803cb167337f828013e55331b946fcea6b185

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

@@ -14,6 +14,21 @@ module Cats
         render json: {success: true, data: serialize(plans)}
       end
 
+      def plans_for_location
+        if params[:location_type] == "source"
+          plans = DispatchPlan.includes([:dispatchable]).joins(:dispatch_plan_items)
+                              .where(status: Cats::Core::DispatchPlan::APPROVED,
+                                     upstream: false,
+                                     dispatch_plan_items: {source_id: params[:location_id]}).uniq
+        elsif params[:location_type] == "destination"
+          plans = DispatchPlan.includes([:dispatchable]).joins(:dispatch_plan_items)
+                              .where(status: Cats::Core::DispatchPlan::APPROVED,
+                                     upstream: false,
+                                     dispatch_plan_items: {destination_id: params[:location_id]}).uniq
+        end
+        render json: {success: true, data: serialize(plans)}
+      end
+
       def filter
         query = DispatchPlan.ransack(params[:q])
         render json: {success: true, data: serialize(query.result)}
@@ -61,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/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/config/routes.rb

@@ -100,6 +100,8 @@ Cats::Core::Engine.routes.draw do
   resources :loans, except: %i[destory]
 
   post "/dispatch_plans/filter", controller: :dispatch_plans, action: :filter
+  post "/dispatch_plans/filter_by_location", controller: :dispatch_plans,
+       action: :plans_for_location, as: :filter_plan_by_location
   post "/dispatch_plans/bulk_create"
   resources :dispatch_plans do
     member do

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/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = "1.5.27".freeze
+    VERSION = "1.5.29".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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.5.27
+  version: 1.5.29
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -531,6 +531,7 @@ 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
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb