cats_core 1.4.34 → 1.4.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 451e4ed5c952d795035700cc1ac97bed84f711c284e15d510214df6a012df397
-  data.tar.gz: 7725d50aaa4dadfdb5aacf79e6bb733e156dbf78968ea61a4652481a1850fc5f
+  metadata.gz: f2ea0d3a39edea3ab29b38b312d3d2e31e16ba07d54c0f985f5ceb248869fef4
+  data.tar.gz: 02e0ba07bbc6bf360a637a215faa26de072c2fe3d955547b9ba68193eca1220e
 SHA512:
-  metadata.gz: 5d87b3ce53a8e899335e469edd698311bf9324c5ac5fda72b681d236a512882a16800b5092108627fc3ceb8ea9933b06f1b0ba2da8346fbf07dc29da8f5ea9a5
-  data.tar.gz: cec2931e3d2edb587e58b263bec7ba52f2ce31756f50cb0fe13d0c54be242024452c67d9c5a39185faa923df5db8fab0a6b9e13b7e6e4fd65cc186679e1be8d9
+  metadata.gz: 9c2f4ba51cc505f5320d2dee177e5cfa1e42d72bc8bd0b69b3128141b568354220a3e4b9d681d9412aa740b2ceda1bdc1a118a774f6ff34b1e8656eaff9e08b8
+  data.tar.gz: c976d634759281fb71a769495282b74459ed8167eb8c61be21f8566213e7394ee6fd873ba0cc2e3905eb473a56fc8cbdbe427913d40b3e784ca33a9bbcb9296c

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/round_plans_controller.rb

@@ -37,7 +37,7 @@ module Cats
       end
 
       def remove_items
-        plan = @service.remove_items(params[:id], remove_params)
+        plan = @service.remove_items(params[:id], remove_params[:ids])
         render json: { success: true, data: serialize(plan) }
       rescue StandardError => e
         render json: { success: false, error: e.message }

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

@@ -16,7 +16,15 @@ module Cats
       # Commodity statuses
       GOOD = 'Good'.freeze
       DAMAGED = 'Damaged'.freeze
-      COMMODITY_STATUSES = [GOOD, DAMAGED].freeze
+      LEAKAGE = 'Leakage'.freeze
+      WET = 'Wet'.freeze
+      MOLDY = 'Moldy'.freeze
+      INFESTED = 'Infested'.freeze
+      INSECT_INFECTED = 'Insect Infected'.freeze
+      FAECES_FROM_RODENTS = 'Faeces From Rodents'.freeze
+      UNDERWEIGHT_PACKAGE = 'Underweight Package'.freeze
+      COMMODITY_STATUSES = [GOOD, DAMAGED, LEAKAGE, WET, MOLDY, INFESTED, INSECT_INFECTED, FAECES_FROM_RODENTS,
+                            UNDERWEIGHT_PACKAGE].freeze
 
       # Arrival Statuses
       AT_SOURCE = 'At Source'.freeze

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/serializers/cats/core/dispatch_serializer.rb

@@ -3,7 +3,7 @@ module Cats
     class DispatchSerializer < ActiveModel::Serializer
       attributes :id, :reference_no, :dispatch_plan_item_id, :transporter_id, :transporter_name, :plate_no,
                  :driver_name, :driver_phone, :quantity, :remark, :prepared_by_id, :prepared_by_email,
-                 :dispatch_status, :destination, :auth_details
+                 :dispatch_status, :destination, :auth_details, :unit_id, :commodity_status
 
       def destination
         object.dispatch_plan_item.destination.name

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,
@@ -108,7 +115,7 @@ module Cats
                                      .where(beneficiary_round_plan_items: { id: ids })
         raise(StandardError, 'Round plan items should be from the same plan.') if plans.count > 1
 
-        unless plans.count.positive? && plan_id == plans[0].id
+        unless plans.count.positive? && plan.id == plans[0].id
           raise(StandardError, 'Round plan items are not from the given round plan.')
         end
 
@@ -139,10 +146,16 @@ module Cats
         if plan.plan.program.code == 'PSNP'
           rounds = plan.rounds.count
           item_ids = plan.beneficiary_round_plan_items.pluck('beneficiary_plan_item_id').flatten
-          plan_items = BeneficiaryPlanItem.where(id: item_ids)
-          invalid = plan_items.select { |pi| pi.rounds - (pi.rounds_served || 0) < rounds }
-          error = 'There are plan items whose served rounds may exceed the allowed number of rounds.'
-          raise(StandardError, error) if invalid.count.positive?
+          plan_items = BeneficiaryPlanItem.includes(plan_item: :fdp).where(id: item_ids)
+          invalid = plan_items.select { |pi| pi.rounds - (pi.rounds_served || 0) < rounds }.map do |pi|
+            pi.plan_item.fdp.name
+          end
+
+          if invalid.count.positive?
+            msg = invalid.join(', ')
+            error = "The FDPs [#{msg}] exceeded their allowed number of rounds."
+            raise(StandardError, error)
+          end
 
           items = plan_items.each_with_object([]) do |plan_item, res|
             rounds_served = plan_item.rounds_served || 0

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.34'.freeze
+    VERSION = '1.4.37'.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.34
+  version: 1.4.37
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-05 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers