cats_core 1.4.35 → 1.4.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 186d5da451b5abf3212599586408ca925e553e855f185b2ac52038a7cfa7b651
-  data.tar.gz: 7fa1c103c95c8f80d98f75be767bf346b4cb5bfab1cf066776e3ae8880a95621
+  metadata.gz: 9b1a42d7b3cdd50ebcdcb1636aadeeeda8ecc3e9103f2ddf073c991f254d6fc5
+  data.tar.gz: 5bbee2e2655b3cb7d8d1f907ff941d4652e4e9058c9b7864dce87f0ad46cfef2
 SHA512:
-  metadata.gz: cd85c7c41b4a8c7ab65f388969b4e9e6e5a6191c1eaf19c01bcf6cdbef36018d76136ab73c1bcf57b4fe47f81e5ab6062df1da4ca98970aaec7ddef593818bd7
-  data.tar.gz: 885be8ea62166c70ae4bf3e4f900ed12a18ddecd0b9ba712643e3fe1e781b4099f7e2b8010ca5fdc14ef57089956fe2c43e2de0f36eabe343d69689b13c4b233
+  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/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/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.35'.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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.35
+  version: 1.4.36
 platform: ruby
 authors:
 - Henock L.