cats_core 1.4.33 → 1.4.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e34b55e4d9cc5537027134594fd2f39946cd9b1001ab3a3d20c24109402a7797
-  data.tar.gz: 2437a6f18cab7ce976653738467dd0849182281f2fb1e5b2e832390538adf112
+  metadata.gz: 9b1a42d7b3cdd50ebcdcb1636aadeeeda8ecc3e9103f2ddf073c991f254d6fc5
+  data.tar.gz: 5bbee2e2655b3cb7d8d1f907ff941d4652e4e9058c9b7864dce87f0ad46cfef2
 SHA512:
-  metadata.gz: a574e2522a5d9c2ba8257ee18c5217023c23e7b6f5d69dddd9dc0d81f9169a697afc6fde167f4b41a36fd861f78abc7a3b3ad156859a1e49dc1bf412dab771e4
-  data.tar.gz: f1d30af5df117fb71047df56a7602024df16270e2531c94e65acf1f77e58fe56f3a895e64c14d6629ae88ce0b48f1a4aa3e3095c2bb5872cda31d44ad0c52a16
+  metadata.gz: 7a9b2a00fa941cabd75a6b0dccc6ed2eb0aa8402315759d27a76786a25070193eab2ffc20c43dfe195d5353b914f9cf765578aaed6895257efb2a8360a6c2a7b
+  data.tar.gz: '09237ecb718238ad54943cdd534c99afce076e6afdaedfaf116c87ba68f5b0a81e6a9a6f1086504986c3f89411266ef2d0bb82c353b87ce76c23598eb93039cc'

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

@@ -18,7 +18,7 @@ module Cats
 
       def model_params
         params.require(:payload).permit(:reference_no, :dispatch_plan_id, :source_id, :destination_id, :quantity,
-                                        :commodity_status, :status, :commodity_id)
+                                        :unit_id, :commodity_status, :status, :commodity_id)
       end
     end
   end

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

@@ -19,6 +19,12 @@ module Cats
         render json: { success: true, data: serialize(query.result) }
       end
 
+      def woredas
+        region = Location.find(params[:id])
+        woredas = Location.where(id: region.descendant_ids, location_type: Location::WOREDA)
+        render json: { success: true, data: serialize(woredas) }
+      end
+
       private
 
       def model_params

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

@@ -12,7 +12,8 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:receipt_authorization_id, :commodity_status, :commodity_grade, :quantity, :remark)
+        params.require(:payload).permit(:receipt_authorization_id, :commodity_status, :commodity_grade, :quantity,
+                                        :remark)
       end
     end
   end

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

@@ -11,6 +11,7 @@ module Cats
       belongs_to :destination, class_name: 'Cats::Core::Location'
       belongs_to :dispatch_plan
       belongs_to :commodity
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
 
       has_many :dispatches
       has_many :hub_authorizations
@@ -26,6 +27,8 @@ module Cats
       delegate(:name, to: :destination, prefix: true)
       delegate(:location_type, to: :source, prefix: true)
       delegate(:location_type, to: :destination, prefix: true)
+      delegate(:abbreviation, to: :unit, prefix: true)
+      delegate(:shipping_reference, to: :commodity, prefix: true)
 
       # Authorize a dispatch plan item if it contains authorization entries
       # under it. A dispatch plan item can be authorized by source hub, or

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

@@ -3,7 +3,8 @@ module Cats
     class DispatchPlanItemSerializer < ActiveModel::Serializer
       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
+                 :status, :commodity_id, :commodity_name, :commodity_batch_no, :unit_abbreviation,
+                 :commodity_shipping_reference
     end
   end
 end

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

@@ -7,7 +7,7 @@ module Cats
 
         raise(StandardError, 'Plan has no plan items.') if round_plan.round_plan_items.count.zero?
 
-        round_plan.round_plan_item_details.delete_all if round_plan.round_plan_item_details.count.positive?
+        clear_needs(round_plan.id)
 
         details = []
         rations = round_plan.round_rations
@@ -32,6 +32,13 @@ module Cats
         round_plan
       end
 
+      def clear_needs(plan_id)
+        Cats::Core::RoundPlanItemDetail
+          .joins(beneficiary_round_plan_item: :round_plan_item)
+          .where(cats_core_beneficiary_round_plan_items: { cats_core_round_plan_items: { round_plan_id: plan_id } })
+          .delete_all
+      end
+
       def generate_round_plan(reference_no, rounds, plan_id, region_id)
         round_plan = Cats::Core::RoundPlan.create!(
           plan_id: plan_id,

data/config/routes.rb

@@ -39,6 +39,7 @@ Cats::Core::Engine.routes.draw do
     end
   end
 
+  get '/regions/:id/woredas', controller: :locations, action: :woredas, as: :region_woredas
   post '/locations/filter', controller: :locations, action: :filter
   resources :locations, except: %i[destroy] do
     member do

data/db/migrate/20210718043401_create_cats_core_dispatch_plan_items.rb

@@ -19,6 +19,10 @@ class CreateCatsCoreDispatchPlanItems < ActiveRecord::Migration[6.1]
                   index: { name: 'commodity_on_dpi_indx' },
                   foreign_key: { to_table: :cats_core_commodities }
       t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_dpi_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures } 
       t.string :commodity_status, null: false, default: 'Good'
       t.string :status, null: false, default: 'Unauthorized'
 

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.33'.freeze
+    VERSION = '1.4.36'.freeze
   end
 end

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

@@ -5,6 +5,7 @@ FactoryBot.define do
     destination factory: :location
     dispatch_plan
     quantity { 100 }
+    unit factory: :unit_of_measure
     commodity
     commodity_status { Cats::Core::Commodity::GOOD }
     status { Cats::Core::DispatchPlanItem::UNAUTHORIZED }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.33
+  version: 1.4.36
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-05 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers