cats_core 1.4.31 → 1.4.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee7760669a69dc6d1df8d3fe4cd79365ac759ab1ac8197e8d4e5020be437df17
-  data.tar.gz: 780bfaad187ab3c971cc1d073ff50e46702b2eaa46889fe3b2ea372f489751e4
+  metadata.gz: 44499bfd42e79fe95a119690cd54c9adbe2e43a3307f80ae97c5f18f33676818
+  data.tar.gz: 8ff508a01a4da75b991c0f1e4da6f4b3cfe15760a62fee0bcaeee4ea37f31e8b
 SHA512:
-  metadata.gz: e02a405acb7159588c446fdfc5cfd396d539167fef0a7d41df8f2b8ced64894eb2a02f43e1d2e23fd7d84432c50b0d5cda0ab69c8cd051fe784ee8215ddd8364
-  data.tar.gz: ad68bf4257f469b9c4d5b5a2713d9dc13b908b02d0cfe7430e651332acea306868802250514679879ea432beb84f95c4148fb06b56c69d3ed0db954a42a2e0d2
+  metadata.gz: 226ca5049ebb2542a12558e405548a8e72dcdd141085fc1627f08c7e531c13322d5ec4d652ee3df1081d82ff4a8f5cdb7ba01b18286e922189bf10aca675351c
+  data.tar.gz: 1558e359924f5260e962096083c98343d590beab1747d6b07ee0fdde47a0b14eb39e86b6a114569371694757fda494c63018f16c3d3f9c5fe12e523aa5462557

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

@@ -20,6 +20,8 @@ module Cats
       has_many :beneficiary_plan_items, through: :plan_items
       has_many :plan_item_details, through: :beneficiary_plan_items
 
+      delegate(:code, to: :program, prefix: true)
+
       validates :reference_no, :year, :status, presence: true
       validates :total_days, :rounds, presence: true, numericality: { greater_than: 0 }
       validates :season, presence: true, inclusion: { in: SEASONS }

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

@@ -26,6 +26,7 @@ module Cats
 
       delegate(:reference_no, to: :plan, prefix: true)
       delegate(:name, to: :region, prefix: true)
+      delegate(:program_code, to: :plan)
 
       def request_reference
         reference_no

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

@@ -2,7 +2,8 @@ module Cats
   module Core
     class ReceiptAuthorizationSerializer < ActiveModel::Serializer
       attributes :id, :dispatch_id, :dispatch_reference_no, :store_id, :store_name, :quantity, :received_quantity,
-                 :remark, :status, :authorized_by_id, :authorizer_full_name, :auth_details
+                 :remark, :status, :authorized_by_id, :authorizer_full_name, :auth_details, :plate_no, :driver_name,
+                 :dispatch_status
     end
   end
 end

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

@@ -1,7 +1,8 @@
 module Cats
   module Core
     class RoundPlanSerializer < ActiveModel::Serializer
-      attributes :id, :reference_no, :status, :plan_id, :plan_reference_no, :region_id, :region_name, :rounds
+      attributes :id, :reference_no, :status, :plan_id, :plan_reference_no, :region_id, :region_name, :rounds,
+                 :program_code
     end
   end
 end

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

@@ -87,8 +87,18 @@ module Cats
         round_plan
       end
 
+      # This method deletes beneficiary round plan items based on the selection of the
+      # user in a given round.
+      #
+      # Params:
+      #   plan_id => The id of the round plan.
+      #   ids => A list of beneficiary round plan item ids to delete.
+      #
+      # When deleting the selected beneficiary round plan items, if the corresponding
+      # round plan item becomes empty, then it too should be deleted.
+      #
       def remove_items(plan_id, ids)
-        raise(StandardError, 'No plan items specified.') if ids.count.zero?
+        raise(StandardError, 'No beneficiary plan items specified.') if ids.count.zero?
 
         begin
           plan = Cats::Core::RoundPlan.find(plan_id)
@@ -96,12 +106,33 @@ module Cats
           raise(StandardError, 'Round plan not found.') unless plan
         end
 
-        plans = Cats::Core::RoundPlan.includes(:round_plan_items).where(round_plan_items: { id: ids })
-        raise(StandardError, 'Plan items should be from the same plan.') if plans.count > 1
+        plans = Cats::Core::RoundPlan.includes(:beneficiary_round_plan_items)
+                                     .where(beneficiary_round_plan_items: { id: ids })
+        raise(StandardError, 'Round plan items should be from the same plan.') if plans.count > 1
 
-        raise(StandardError, 'Items are not from the given round plan.') unless 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
+
+        to_delete = Cats::Core::BeneficiaryRoundPlanItem.where(id: ids)
+        keys = to_delete.map(&:round_plan_item_id).uniq
+
+        item_counts = Cats::Core::BeneficiaryRoundPlanItem.where(round_plan_item_id: keys)
+                                                          .group(:round_plan_item_id).count
+
+        delete_hash = {}
+        keys.each { |k| delete_hash[k] = [] }
+        to_delete.each { |td| delete_hash[td.round_plan_item_id] << td.id }
+
+        parent_ids = []
+        child_ids = []
+        delete_hash.each_key do |key|
+          child_ids += delete_hash[key]
+          parent_ids << key if delete_hash[key].count == item_counts[key]
+        end
 
-        Cats::Core::RoundPlanItem.delete_by(id: ids)
+        Cats::Core::BeneficiaryRoundPlanItem.delete_by(id: child_ids) if child_ids.count.positive?
+        Cats::Core::RoundPlanItem.delete_by(id: parent_ids) if parent_ids.count.positive?
         plan
       end
 

data/db/migrate/20220107125025_create_cats_core_round_plan_items.rb

@@ -4,7 +4,7 @@ class CreateCatsCoreRoundPlanItems < ActiveRecord::Migration[6.1]
       t.references :round_plan,
                    null: false,
                    index: { name: 'mp_on_mpi_indx' },
-                   foreign_key: { to_table: :cats_core_round_plans }
+                   foreign_key: { to_table: :cats_core_round_plans, on_delete: :cascade }
       t.references :region,
                    null: false,
                    index: { name: 'region_on_round_plan_items_indx' },

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.31'.freeze
+    VERSION = '1.4.32'.freeze
   end
 end

metadata

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