cats_core 1.4.36 → 1.4.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b1a42d7b3cdd50ebcdcb1636aadeeeda8ecc3e9103f2ddf073c991f254d6fc5
-  data.tar.gz: 5bbee2e2655b3cb7d8d1f907ff941d4652e4e9058c9b7864dce87f0ad46cfef2
+  metadata.gz: f2ea0d3a39edea3ab29b38b312d3d2e31e16ba07d54c0f985f5ceb248869fef4
+  data.tar.gz: 02e0ba07bbc6bf360a637a215faa26de072c2fe3d955547b9ba68193eca1220e
 SHA512:
-  metadata.gz: 7a9b2a00fa941cabd75a6b0dccc6ed2eb0aa8402315759d27a76786a25070193eab2ffc20c43dfe195d5353b914f9cf765578aaed6895257efb2a8360a6c2a7b
-  data.tar.gz: '09237ecb718238ad54943cdd534c99afce076e6afdaedfaf116c87ba68f5b0a81e6a9a6f1086504986c3f89411266ef2d0bb82c353b87ce76c23598eb93039cc'
+  metadata.gz: 9c2f4ba51cc505f5320d2dee177e5cfa1e42d72bc8bd0b69b3128141b568354220a3e4b9d681d9412aa740b2ceda1bdc1a118a774f6ff34b1e8656eaff9e08b8
+  data.tar.gz: c976d634759281fb71a769495282b74459ed8167eb8c61be21f8566213e7394ee6fd873ba0cc2e3905eb473a56fc8cbdbe427913d40b3e784ca33a9bbcb9296c

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/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

@@ -115,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
 
@@ -146,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/lib/cats/core/version.rb

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

metadata

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