cats_core 1.4.26 → 1.4.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67116f414334d42cf370f7a2ec48cf137bd1ac0c8d1345e0ce5c99f8fc87c57c
-  data.tar.gz: 0fc96065462743887b84a6bc750f97d52bd1f047a32c71fa1b70bb3eda9148cb
+  metadata.gz: cf68527d50707b488472a3aaa759722ce59d59ed171f75cb018a3bfe19421179
+  data.tar.gz: 2183b2b605d8b73ee8c29c4a8cf6ca6438a72ad2569342fb8da615da9ebd05e7
 SHA512:
-  metadata.gz: 148225081058c17d1435f7888da4076ecfacb458a37154e64fd5eabe1fb3470cc3ff4fcafa696db893eb3d3a70ad90920cb25b408723fd4140b3a6e1f70d02ea
-  data.tar.gz: a7ee6bc61afe79bfbb22d65a02852ea00a0872971c023fd0783f30de6f33b59eb47a4807887b239aa8e54996eca58924fdae8321c73c1af2db078e193f39067d
+  metadata.gz: b15751ad2c5557da8aaed254e538ccf0d7bab769b3af085ce3a46c5e0bdbc975c09e8217f1694275976207d5b99d3455d8587bb419a49b85d7153d8718e4924b
+  data.tar.gz: c4b5d706eb93c2c12e3d5517daec41360c4557e47edc1c6d25cac94bc090dbdba8e24082d5806db026c17f0e41da2f44696be45d61c21049bbf37762875e35af

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

@@ -3,6 +3,8 @@ module Cats
     class ReceiptAuthorizationsController < ApplicationController
       include Common
 
+      skip_before_action :authenticate, only: %i[driver_confirm]
+
       def index
         super do
           ReceiptAuthorization.where(dispatch_id: params[:id])
@@ -17,6 +19,14 @@ module Cats
         render json: { success: false, error: e.message }
       end
 
+      def driver_confirm
+        service = AuthorizationService.new
+        authorization = service.driver_confirm(params[:id], driver_confirm_params[:pin])
+        render json: { success: true, data: serialize(authorization) }
+      rescue StandardError => e
+        render json: { success: false, error: e.message }
+      end
+
       def stack
         service = AuthorizationService.new
         authorization = ReceiptAuthorization.find(params[:id])
@@ -39,6 +49,10 @@ module Cats
       def model_params
         params.require(:payload).permit(:dispatch_id, :store_id, :quantity, :remark, :status, :authorized_by_id)
       end
+
+      def driver_confirm_params
+        params.require(:payload).permit(:pin)
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Cats
     class RoundPlansController < ApplicationController
       include Common
 
-      before_action :set_service, only: %i[generate remove_items generate_round_needs]
+      before_action :set_service, only: %i[approve generate remove_items generate_round_needs]
 
       def index
         super do
@@ -17,8 +17,7 @@ module Cats
       end
 
       def approve
-        plan = RoundPlan.find(params[:id])
-        plan.approve
+        plan = @service.approve(params[:id])
         render json: { success: true, data: serialize(plan) }
       rescue StandardError => e
         render json: { success: false, error: e.message }, status: :unprocessable_entity

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

@@ -29,8 +29,8 @@ module Cats
 
       def receipt_stacks
         service = StackService.new
-        receipt = Receipt.find(params[:id])
-        stacks = service.receipt_stacks(receipt)
+        authorization = ReceiptAuthorization.find(params[:id])
+        stacks = service.receipt_stacks(authorization.id)
         render json: { success: true, data: serialize(stacks) }
       end
 

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

@@ -8,7 +8,29 @@ module Cats
       validates :beneficiaries, presence: true, numericality: { greater_than: 0 }
       validates :plan_item_id, uniqueness: { scope: :beneficiary_category_id }
 
+      validates :rounds, presence: true, numericality: { greater_than: 0 }, if: :psnp?
+      validates :rounds_served, presence: true, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true,
+                                if: :psnp?
+      validates :rounds, :rounds_served, absence: true, unless: :psnp?
+      validate :validate_rounds
+
       delegate(:name, to: :beneficiary_category, prefix: true)
+
+      def psnp?
+        return false unless plan_item
+
+        plan_item.plan.program.code == 'PSNP'
+      end
+
+      def validate_rounds
+        return unless rounds && rounds_served
+
+        errors.add(:rounds, 'should not be set for non PSNP plans.') unless psnp?
+
+        errors.add(:rounds_served, 'should not be set for non PSNP plans.') unless psnp?
+
+        errors.add(:rounds, 'cannot be lower than rounds served.') if rounds < rounds_served
+      end
     end
   end
 end

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

@@ -7,6 +7,7 @@ module Cats
 
       validates :beneficiaries, presence: true, numericality: { greater_than_or_equal_to: 0 }
       validates :round_plan_item_id, uniqueness: { scope: :beneficiary_category_id }
+      validates :beneficiary_plan_item_id, presence: true
 
       delegate(:name, to: :beneficiary_category, prefix: true)
     end

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

@@ -79,7 +79,8 @@ module Cats
             round_plan_item_id: item[0],
             beneficiary_category_id: ben_plan_item.beneficiary_category_id,
             planned_beneficiaries: ben_plan_item.beneficiaries,
-            beneficiaries: ben_plan_item.beneficiaries
+            beneficiaries: ben_plan_item.beneficiaries,
+            beneficiary_plan_item_id: ben_plan_item.id
           }
         end
         Cats::Core::BeneficiaryRoundPlanItem.insert_all!(ben_round_plan_items, record_timestamps: true)
@@ -103,6 +104,41 @@ module Cats
         Cats::Core::RoundPlanItem.delete_by(id: ids)
         plan
       end
+
+      def approve(plan_id)
+        plan = RoundPlan.find(plan_id)
+        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?
+
+          items = plan_items.each_with_object([]) do |plan_item, res|
+            rounds_served = plan_item.rounds_served || 0
+            res << "(#{plan_item.id}, #{rounds + rounds_served})"
+          end
+          values = items.join(',')
+          sql = <<-SQL
+            UPDATE cats_core_beneficiary_plan_items AS bpi
+            SET
+              rounds_served = l.rounds_served
+            FROM (
+              VALUES
+              #{values}
+            ) AS l(id, rounds_served)
+            WHERE l.id = bpi.id
+          SQL
+          ActiveRecord::Base.transaction do
+            ActiveRecord::Base.connection.execute(sql)
+            plan.approve
+          end
+        else
+          plan.approve
+        end
+        plan
+      end
     end
   end
 end

data/config/routes.rb

@@ -135,7 +135,9 @@ Cats::Core::Engine.routes.draw do
       get 'transactions', controller: :receipt_transactions, action: :index
       get 'lost', controller: :lost_commodities, action: :index
       get 'receipts', controller: :receipts, action: :index
-      post 'confirm', controller: :receipt_authorizations, action: :confirm
+      get 'stacks', controller: :stacks, action: :receipt_stacks
+      post 'confirm'
+      post 'driver_confirm'
       post 'stack'
     end
   end

data/db/migrate/20210717032290_create_cats_core_beneficiary_plan_items.rb

@@ -11,6 +11,9 @@ class CreateCatsCoreBeneficiaryPlanItems < ActiveRecord::Migration[7.0]
                    foreign_key: { to_table: :cats_core_beneficiary_categories }
       t.integer :beneficiaries, null: false
 
+      t.integer :rounds
+      t.integer :rounds_served
+
       t.timestamps
     end
     add_index(

data/db/migrate/20220107126025_create_cats_core_beneficiary_round_plan_items.rb

@@ -11,6 +11,7 @@ class CreateCatsCoreBeneficiaryRoundPlanItems < ActiveRecord::Migration[7.0]
                    foreign_key: { to_table: :cats_core_beneficiary_categories }
       t.integer :planned_beneficiaries, null: false
       t.integer :beneficiaries, null: false
+      t.integer :beneficiary_plan_item_id, null: false
 
       t.timestamps
     end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.26'.freeze
+    VERSION = '1.4.29'.freeze
   end
 end

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

@@ -3,5 +3,7 @@ FactoryBot.define do
     plan_item
     beneficiary_category
     beneficiaries { 100 }
+    rounds { nil }
+    rounds_served { nil }
   end
 end

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

@@ -4,5 +4,6 @@ FactoryBot.define do
     beneficiary_category
     planned_beneficiaries { 100 }
     beneficiaries { 50 }
+    beneficiary_plan_item_id { 1 }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.26
+  version: 1.4.29
 platform: ruby
 authors:
 - Henock L.