cats_core 1.4.42 → 1.4.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b075feb71a427f4901c4fb32fe34f8b2ad2dfb902a3386b9c92b10fd6e809762
-  data.tar.gz: 283f7c441c7d3920fbe5a7ce4253d41d24fccbaa9432d634f7004abe2cfa531f
+  metadata.gz: 710ffdc5b10d0f97aa5f40aaa8e67a99eaea21120c0b96894d46f86a47b10312
+  data.tar.gz: 3c1b7594b8717c668bb9f38d481afa54057005f524171bd3c088fdf6047344b2
 SHA512:
-  metadata.gz: 8975cb79857ea468f7c13b638ff8668849b3d0021d59df037f1d88ceb508090481fe10da028a5b5a54ee23117c270c1b67e1d8b9149bc9eeec421015ea92eda9
-  data.tar.gz: 54936908e0394ead9f8f8ffd887949f1f6afbd1fcb63d7cdf90b5d9d0f32dcd6a0b5f73009d326c03550b5ce43bce7d8bbf758e8a2a735b23c6b653302b48eba
+  metadata.gz: 4b522fa9d586d12f3255b0a9044caff4c8b694e336e3b284a657bc14d2f10a0e10ad3fce4d082784b65435bd73c396b8a593c6c7630bc90b9ac1388bf6f51915
+  data.tar.gz: 46fbc7ca6360f71e4f6cc992f03a3711b302f2f351c7dca8996999cee8c8eaf196321324bf9ed3f6bf16940c04f5224c72bd5124147663a7b4533aeddd9f27bd

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

@@ -61,7 +61,7 @@ module Cats
           :dispatchable_type,
           items: %i[
             reference_no region zone woreda fdp commodity_category unit_id unit quantity source_id destination_id
-            commodity_id
+            commodity_id commodity_status
           ]
         )
       end

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

@@ -29,6 +29,11 @@ module Cats
         end
       end
 
+      def filter
+        query = DispatchTransaction.ransack(params[:q])
+        render json: { success: true, data: serialize(query.result) }
+      end
+
       private
 
       def model_params

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

@@ -12,8 +12,8 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:reference_no, :lender, :agreement_date, :repayment_date, :quantity, :unit_id,
-                                        :commodity_category_id)
+        params.require(:payload).permit(:reference_no, :description, :lender, :agreement_date, :repayment_date,
+                                        :quantity, :unit_id, :commodity_category_id)
       end
     end
   end

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

@@ -17,7 +17,7 @@ module Cats
       def model_params
         params.require(:payload).permit(:reference_no, :order_date, :requisition_no, :supplier, :cash_donation_id,
                                         :commodity_category_id, :quantity, :purchase_type, :unit_id, :price,
-                                        :currency_id)
+                                        :currency_id, :description)
       end
     end
   end

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

@@ -10,6 +10,11 @@ module Cats
         end
       end
 
+      def filter
+        query = ReceiptTransaction.ransack(params[:q])
+        render json: { success: true, data: serialize(query.result) }
+      end
+
       private
 
       def model_params

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/controllers/cats/core/swaps_controller.rb

@@ -12,9 +12,9 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:reference_no, :swapper, :agreement_date, :issued_commodity_id,
-                                        :issued_quantity, :received_commodity_id, :received_quantity,
-                                        :issued_unit_id, :received_unit_id)
+        params.require(:payload).permit(:reference_no, :swapper, :agreement_date, :issued_commodity_id, :description,
+                                        :issued_quantity, :received_commodity_id, :received_quantity, :issued_unit_id,
+                                        :received_unit_id)
       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/commodity_donation.rb

@@ -10,6 +10,10 @@ module Cats
       delegate(:reference_no, to: :plan, prefix: true, allow_nil: true)
       delegate(:name, to: :commodity_category, prefix: true)
       delegate(:abbreviation, to: :unit, prefix: true)
+
+      def commodity_name
+        commodity_category.name
+      end
     end
   end
 end

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

@@ -10,6 +10,10 @@ module Cats
 
       delegate(:name, to: :commodity_category, prefix: true)
       delegate(:abbreviation, to: :unit, prefix: true)
+
+      def commodity_name
+        commodity_category.name
+      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/purchase_order.rb

@@ -18,6 +18,10 @@ module Cats
       delegate(:name, to: :commodity_category, prefix: true)
       delegate(:name, to: :unit, prefix: true)
       delegate(:code, to: :currency, prefix: true)
+
+      def commodity_name
+        commodity_category.name
+      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/models/cats/core/swap.rb

@@ -14,6 +14,10 @@ module Cats
       delegate(:name, to: :received_commodity, prefix: true)
       delegate(:abbreviation, to: :issued_unit, prefix: true)
       delegate(:abbreviation, to: :received_unit, prefix: true)
+
+      def commodity_name
+        received_commodity.name
+      end
     end
   end
 end

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

@@ -43,6 +43,23 @@ module Cats
         authorization.dispatch.stack
         authorization
       end
+
+      def receipt_authorization(id)
+        item = DispatchPlanItem.find(id).includes(
+          :destination,
+          :unit,
+          commodity: { project: :source }
+        )
+        {
+          date: Date.today,
+          reference_no: item.reference_no,
+          destination: item.destination.name,
+          source: item.commodity.project.source.description,
+          commodity: "#{item.commodity.project.source.commodity_name} (#{item.commodity.batch_no})",
+          unit: item.unit.abbreviation,
+          quantity: item.quantity
+        }
+      end
     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

@@ -167,18 +167,27 @@ Cats::Core::Engine.routes.draw do
     action: :create_allocation,
     as: :allocation_transaction
   )
+  post '/dispatch_transactions/filter', controller: :dispatch_transactions, action: :filter
   resources :dispatch_transactions, except: %i[index new edit destroy]
+  post '/receipt_transactions/filter', controller: :receipt_transactions, action: :filter
   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/20210717032855_create_cats_core_purchase_orders.rb

@@ -2,6 +2,7 @@ class CreateCatsCorePurchaseOrders < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_purchase_orders do |t|
       t.string :reference_no, unique: true
+      t.string :description
       t.date :order_date, null: false
       t.string :requisition_no
       t.string :supplier, null: false

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/20220626063501_create_cats_core_loans.rb

@@ -2,6 +2,7 @@ class CreateCatsCoreLoans < ActiveRecord::Migration[7.0]
   def change
     create_table :cats_core_loans do |t|
       t.string :reference_no, unique: true
+      t.string :description
       t.string :lender, null: false
       t.date :agreement_date, null: false
       t.date :repayment_date

data/db/migrate/20220626063757_create_cats_core_swaps.rb

@@ -2,6 +2,7 @@ class CreateCatsCoreSwaps < ActiveRecord::Migration[7.0]
   def change
     create_table :cats_core_swaps do |t|
       t.string :reference_no, unique: true
+      t.string :description
       t.string :swapper, null: false
       t.date :agreement_date, null: false
       t.float :issued_quantity, null: false

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.45'.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/loans.rb

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :loan, class: 'Cats::Core::Loan' do
     reference_no { FFaker::Name.name }
+    description { FFaker::Name.name }
     lender { FFaker::Name.name }
     agreement_date { Date.today }
     repayment_date { agreement_date.next_month }

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

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :purchase_order, class: 'Cats::Core::PurchaseOrder' do
     reference_no { FFaker::Name.name }
+    description { FFaker::Name.name }
     order_date { Date.today }
     requisition_no { FFaker::Name.name }
     supplier { FFaker::Name.name }

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

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

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :swap, class: 'Cats::Core::Swap' do
     reference_no { FFaker::Name.name }
+    description { FFaker::Name.name }
     swapper { FFaker::Name.name }
     agreement_date { Date.yesterday }
     issued_commodity factory: :commodity_category

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.42
+  version: 1.4.45
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-26 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -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