cats_core 1.4.27 → 1.4.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fddf0547d798ce7e1b0807f6a41c63d7b9d4cd65aa8647fcdfb67ca47326b41
-  data.tar.gz: 1784fbfd4ab5dd5af00f07c07dd2aef0f561d49381ab2bf8dbf4726dc9b3d85d
+  metadata.gz: a4956ad89bea4861d95aaffc40534eab2b319009d2a10f2762e9b1ee6b68b60e
+  data.tar.gz: 6d5aaf08e18bb95e8fd09c0957bbfeb982df76c1061f1b001028f1e91a1ac8ff
 SHA512:
-  metadata.gz: 45e67cd0b18c50abbd5d08698ad47312dfbc8b735327a3645906d16f60db5addb24edef7180a9adb2a1ce9c8ea69858e63dd600c3aaeb1767de3f022c3a2b598
-  data.tar.gz: d46af8e447713c4981e3b5d8796f246fc13c0a294b15239adbbeccede51b76e68f5e7d1d24ab9ecfb0f93f586f8f5d015396a0bc6dc51bca58d06ace5081f1c3
+  metadata.gz: 88a42101e62d3a13b23a905bcc06852115797cd3a0e160ae7204510777cb494b03f108500f7e0c5201439695ac084d737f903c619a4e1fc9d0e926ceec7aa396
+  data.tar.gz: 7de9d35e696f2b2421cefa54da0e706b0826b3c63389eff498d4e0964f354cf61f7ae3eb4baba80f16b214b405615a2adcd3c2c19f1e97649a6fe4313c7b598f

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/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/models/cats/core/dispatch.rb

@@ -80,6 +80,11 @@ module Cats
       end
 
       def stack
+        # check if all receipt transactions have been committed and change status
+        # of dispatch to stacked.
+        statuses = receipt_transactions.map(&:status).uniq
+        return unless statuses.length == 1 && statuses[0] == Transaction::COMMITTED
+
         self.dispatch_status = STACKED
         save!
       end

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

@@ -39,6 +39,7 @@ module Cats
         end
 
         authorization.transactions.each(&:commit)
+
         authorization.dispatch.stack
         authorization
       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

@@ -136,7 +136,8 @@ Cats::Core::Engine.routes.draw do
       get 'lost', controller: :lost_commodities, action: :index
       get 'receipts', controller: :receipts, action: :index
       get 'stacks', controller: :stacks, action: :receipt_stacks
-      post 'confirm', controller: :receipt_authorizations, action: :confirm
+      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.27'.freeze
+    VERSION = '1.4.30'.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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.27
+  version: 1.4.30
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-30 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers