cats_core 1.4.42 → 1.4.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b075feb71a427f4901c4fb32fe34f8b2ad2dfb902a3386b9c92b10fd6e809762
-  data.tar.gz: 283f7c441c7d3920fbe5a7ce4253d41d24fccbaa9432d634f7004abe2cfa531f
+  metadata.gz: c6e5cfab401c5346af868d378d9a068b2cef5a154e803d5fd940f2d9bebdd8ff
+  data.tar.gz: de1ea59da4f3e9a283685e84813e2285202d707d9d5bac98d26abc4d87820ac5
 SHA512:
-  metadata.gz: 8975cb79857ea468f7c13b638ff8668849b3d0021d59df037f1d88ceb508090481fe10da028a5b5a54ee23117c270c1b67e1d8b9149bc9eeec421015ea92eda9
-  data.tar.gz: 54936908e0394ead9f8f8ffd887949f1f6afbd1fcb63d7cdf90b5d9d0f32dcd6a0b5f73009d326c03550b5ce43bce7d8bbf758e8a2a735b23c6b653302b48eba
+  metadata.gz: 1d1ad46c73a7f35f1916fd9328dbef03cfeb3b6736566eac0c44ef2372bcea6dc6b804e313396c8ed7abe05a17ff2ae2f865a6b091337cbbab0e53f075938ac1
+  data.tar.gz: f9f9633161e3578d49ea763e6254cd18706ce7fb0abaf3673d8321e21399a16f4cc3aac607106117901eee84a15fd44e95ed8faffa56454786d51575d926f5c3

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

@@ -0,0 +1,49 @@
+module Cats
+  module Core
+    class RoundBeneficiariesController < ApplicationController
+      include Common
+
+      def index
+        beneficiaries = RoundBeneficiary.joins(:round_plan_item)
+                                        .where(round_plan_item: { round_plan_id: params[:id] })
+                                        .includes(:beneficiary, :commodity_category, :unit)
+        render json: { success: true, data: serialize(beneficiaries) }
+      end
+
+      def generate
+        service = BeneficiaryService.new
+        result = service.generate_distribution_list(params[:id])
+        render json: { success: result }
+      rescue StandardError => e
+        render json: { success: false, error: e.message }
+      end
+
+      def filter
+        query = RoundBeneficiary.includes(:beneficiary, :commodity_category, :unit).ransack(params[:q])
+        render json: { success: true, data: serialize(query.result) }
+      end
+
+      def remove_beneficiaries
+        service = BeneficiaryService.new
+        result = service.remove_items(params[:id], common_params[:ids])
+        render json: { success: result }
+      rescue StandardError => e
+        render json: { success: false, error: e.message }
+      end
+
+      def confirm_receipt
+        service = BeneficiaryService.new
+        result = service.confirm_receipt(params[:id], common_params[:ids])
+        render json: { success: result }
+      rescue StandardError => e
+        render json: { success: false, error: e.message }
+      end
+
+      private
+
+      def common_params
+        params.permit(ids: [])
+      end
+    end
+  end
+end

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

@@ -6,12 +6,21 @@ module Cats
       GENDERS = [MALE, FEMALE].freeze
 
       belongs_to :beneficiary_category
+      belongs_to :fdp, class_name: 'Location'
 
       validates :full_name, :age, :gender, presence: true
       validates :gender, inclusion: { in: GENDERS }
       validates :age, numericality: { greater_than: 0, less_than: 100 }
+      validate :validate_fdp
 
       delegate(:name, to: :beneficiary_category, prefix: true)
+      delegate(:name, to: :fdp, prefix: true)
+
+      def validate_fdp
+        return unless fdp
+
+        errors.add(:fdp, 'should be a valid distribution point.') unless fdp.location_type == Location::FDP
+      end
     end
   end
 end

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

@@ -27,6 +27,10 @@ module Cats
       validates :season, presence: true, inclusion: { in: SEASONS }
       validates :reference_no, uniqueness: true
       validates :status, inclusion: { in: STATUSES }
+
+      def no_of_round_days
+        total_days / rounds
+      end
     end
   end
 end

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

@@ -0,0 +1,16 @@
+module Cats
+  module Core
+    class RoundBeneficiary < ApplicationRecord
+      belongs_to :beneficiary
+      belongs_to :round_plan_item
+      belongs_to :commodity_category
+      belongs_to :unit, class_name: 'UnitOfMeasure'
+
+      validates :quantity, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:full_name, to: :beneficiary, prefix: true)
+      delegate(:name, to: :commodity_category, prefix: true)
+      delegate(:abbreviation, to: :unit, prefix: true)
+    end
+  end
+end

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

@@ -14,6 +14,7 @@ module Cats
       has_many :round_rations
       has_many :beneficiary_round_plan_items, through: :round_plan_items
       has_many :round_plan_item_details, through: :beneficiary_round_plan_items
+      has_many :round_beneficiaries, through: :round_plan_items
 
       validates :rounds, presence: true
       validates :reference_no, presence: true, uniqueness: true

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

@@ -10,6 +10,7 @@ module Cats
 
       has_many :beneficiary_round_plan_items
       has_many :round_plan_item_details, through: :beneficiary_round_plan_items
+      has_many :round_beneficiaries
 
       validates :plan_item_id, presence: true
       validates :round_plan_id, uniqueness: { scope: :fdp_id }

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

@@ -0,0 +1,8 @@
+module Cats
+  module Core
+    class RoundBeneficiarySerializer < ActiveModel::Serializer
+      attributes :id, :beneficiary_id, :beneficiary_full_name, :round_plan_item_id, :commodity_category_id,
+                 :commodity_category_name, :quantity, :unit_id, :unit_abbreviation, :received
+    end
+  end
+end

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

@@ -0,0 +1,87 @@
+module Cats
+  module Core
+    class BeneficiaryService
+      def clear_distribution_list(id)
+        round_plan = RoundPlan.find(id)
+        raise(StandardError, 'Round plan is not in draft state.') unless round_plan.status == RoundPlan::DRAFT
+
+        RoundBeneficiary.joins(:round_plan_item).where(round_plan_item: { round_plan_id: id }).delete_all
+      end
+
+      def generate_distribution_list(id)
+        clear_distribution_list(id)
+        round_plan = RoundPlan.find(id)
+        plan_days = round_plan.plan.no_of_round_days
+        rounds = round_plan.rounds.count
+        beneficiaries = Beneficiary.joins(:beneficiary_category).where(
+          beneficiary_category: { plan_id: round_plan.plan_id }
+        ).group_by(&:fdp_id)
+        beneficiaries.each_key do |key|
+          beneficiaries[key] = beneficiaries[key].group_by(&:beneficiary_category_id)
+        end
+        rations = round_plan.round_rations
+
+        round_beneficiaries = []
+        round_plan.round_plan_items.each do |rpi|
+          fdp_beneficiaries = beneficiaries[rpi.fdp_id]
+          fdp_beneficiaries.each_key do |key|
+            category_rations = rations.select { |r| r.beneficiary_category_id == key }
+            category_rations.each do |ration|
+              fdp_beneficiaries[key].each do |beneficiary|
+                round_beneficiaries << {
+                  beneficiary_id: beneficiary.id,
+                  round_plan_item_id: rpi.id,
+                  commodity_category_id: ration.commodity_category_id,
+                  quantity: plan_days / ration.no_of_days * ration.quantity * rounds,
+                  unit_id: ration.unit_of_measure_id,
+                  received: false
+                }
+              end
+            end
+          end
+        end
+
+        RoundBeneficiary.insert_all!(round_beneficiaries, record_timestamps: true)
+        true
+      end
+
+      def remove_items(plan_id, ids)
+        raise(StandardError, 'No beneficiaries specified.') if ids.count.zero?
+
+        begin
+          plan = RoundPlan.find(plan_id)
+        rescue ActiveRecord::RecordNotFound
+          raise(StandardError, 'Round plan not found.') unless plan
+        end
+
+        beneficiaries = RoundBeneficiary.joins(:round_plan_item)
+                                        .where(round_plan_item: { round_plan_id: plan_id })
+        to_delete = RoundBeneficiary.where(id: ids)
+        diff = to_delete - beneficiaries
+        raise(StandardError, 'Round plan beneficiaries should be from the same plan.') if diff.count.positive?
+
+        to_delete.delete_all
+        true
+      end
+
+      def confirm_receipt(plan_id, ids)
+        raise(StandardError, 'No beneficiaries specified.') if ids.count.zero?
+
+        begin
+          plan = RoundPlan.find(plan_id)
+        rescue ActiveRecord::RecordNotFound
+          raise(StandardError, 'Round plan not found.') unless plan
+        end
+
+        beneficiaries = RoundBeneficiary.joins(:round_plan_item)
+                                        .where(round_plan_item: { round_plan_id: plan_id })
+        to_confirm = RoundBeneficiary.where(id: ids)
+        diff = to_confirm - beneficiaries
+        raise(StandardError, 'Round plan beneficiaries should be from the same plan.') if diff.count.positive?
+
+        to_confirm.update_all(received: true)
+        true
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -171,14 +171,21 @@ Cats::Core::Engine.routes.draw do
   resources :receipt_transactions, except: %i[index new edit destroy]
   resources :lost_commodities, except: %i[index destroy]
   get '/plans/:id/round_plans', controller: :round_plans, action: :index, as: :round_plans_plan
+  
+  post '/round_beneficiaries/filter'
+  resources :round_beneficiaries, only: %i[show]
   post '/round_plans/generate'
   post '/round_plans/filter'
   resources :round_plans, except: %i[index destroy] do
     member do
       post 'generate_dispatch_plan', controller: :dispatch_plans, action: :generate
       post 'remove_items'
+      post 'remove_beneficiaries', controller: :round_beneficiaries, action: :remove_beneficiaries
+      post 'confirm_receipt', controller: :round_beneficiaries, action: :confirm_receipt
       post 'generate_round_needs'
       post 'approve'
+      post 'generate_distribution_list', controller: :round_beneficiaries, action: :generate
+      get 'beneficiaries', controller: :round_beneficiaries, action: :index
     end
   end
 

data/db/migrate/20220511082354_create_cats_core_beneficiaries.rb

@@ -9,6 +9,10 @@ class CreateCatsCoreBeneficiaries < ActiveRecord::Migration[7.0]
                    null: false,
                    index: { name: 'bc_on_beneficiaries_indx' },
                    foreign_key: { to_table: :cats_core_beneficiary_categories }
+      t.references :fdp,
+                   null: false,
+                   index: { name: 'fdp_on_beneficiaries_indx' },
+                   foreign_key: { to_table: :cats_core_locations }
 
       t.timestamps
     end

data/db/migrate/20220626132050_create_cats_core_round_beneficiaries.rb

@@ -0,0 +1,26 @@
+class CreateCatsCoreRoundBeneficiaries < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_round_beneficiaries do |t|
+      t.references :beneficiary, 
+                   null: false,
+                   index: { name: 'beneficiary_on_rb_indx' },
+                   foreign_key: { to_table: :cats_core_beneficiaries }
+      t.references :round_plan_item,
+                   null: false,
+                   index: { name: 'rpi_on_rb_indx' },
+                   foreign_key: { to_table: :cats_core_round_plan_items }
+      t.references :commodity_category,
+                   null: false,
+                   index: { name: 'cc_on_rb_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_rb_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.boolean :received, null: false, default: false
+
+      t.timestamps
+    end
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.42'.freeze
+    VERSION = '1.4.43'.freeze
   end
 end

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

@@ -5,5 +5,6 @@ FactoryBot.define do
     gender { 'M' }
     phone { '0911121212' }
     beneficiary_category
+    fdp factory: :fdp
   end
 end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :round_beneficiary, class: 'Cats::Core::RoundBeneficiary' do
+    beneficiary
+    round_plan_item
+    commodity_category
+    quantity { 150 }
+    unit factory: :unit_of_measure
+    received { false }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.42
+  version: 1.4.43
 platform: ruby
 authors:
 - Henock L.
@@ -252,6 +252,7 @@ files:
 - app/controllers/cats/core/receipt_transactions_controller.rb
 - app/controllers/cats/core/receipts_controller.rb
 - app/controllers/cats/core/roles_controller.rb
+- app/controllers/cats/core/round_beneficiaries_controller.rb
 - app/controllers/cats/core/round_plans_controller.rb
 - app/controllers/cats/core/routes_controller.rb
 - app/controllers/cats/core/spaces_controller.rb
@@ -310,6 +311,7 @@ files:
 - app/models/cats/core/rhn_request.rb
 - app/models/cats/core/role.rb
 - app/models/cats/core/role_menu.rb
+- app/models/cats/core/round_beneficiary.rb
 - app/models/cats/core/round_plan.rb
 - app/models/cats/core/round_plan_item.rb
 - app/models/cats/core/round_plan_item_detail.rb
@@ -361,6 +363,7 @@ files:
 - app/serializers/cats/core/receipt_transaction_serializer.rb
 - app/serializers/cats/core/role_menu_serializer.rb
 - app/serializers/cats/core/role_serializer.rb
+- app/serializers/cats/core/round_beneficiary_serializer.rb
 - app/serializers/cats/core/round_plan_serializer.rb
 - app/serializers/cats/core/route_serializer.rb
 - app/serializers/cats/core/stack_serializer.rb
@@ -371,6 +374,7 @@ files:
 - app/serializers/cats/core/unit_of_measure_serializer.rb
 - app/serializers/cats/core/user_serializer.rb
 - app/services/cats/core/authorization_service.rb
+- app/services/cats/core/beneficiary_service.rb
 - app/services/cats/core/dispatch_plan_service.rb
 - app/services/cats/core/dispatch_service.rb
 - app/services/cats/core/menu_service.rb
@@ -451,6 +455,7 @@ files:
 - db/migrate/20220511082354_create_cats_core_beneficiaries.rb
 - db/migrate/20220626063501_create_cats_core_loans.rb
 - db/migrate/20220626063757_create_cats_core_swaps.rb
+- db/migrate/20220626132050_create_cats_core_round_beneficiaries.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -498,6 +503,7 @@ files:
 - spec/factories/cats/core/rhn_requests.rb
 - spec/factories/cats/core/role_menus.rb
 - spec/factories/cats/core/roles.rb
+- spec/factories/cats/core/round_beneficiaries.rb
 - spec/factories/cats/core/round_plan_item_details.rb
 - spec/factories/cats/core/round_plan_items.rb
 - spec/factories/cats/core/round_plans.rb