cats_core 1.4.25 → 1.4.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad828e18f9f084f3c2e0343af564a1f1cc4832e935c9eec068503f4293442b87
-  data.tar.gz: 8e0520ff2a6df1e2b4dd3f726a60aef02ef45915158c72c73ccbc74a9ae2786d
+  metadata.gz: f2cbd9de4f75e95103bf09a853e5d0098e925f6d63c058567657dca04c8e915e
+  data.tar.gz: 39dc39668040493ad924ae291ea3f13b34b3644f113558274bbe8f15564d9f1b
 SHA512:
-  metadata.gz: cc1d8fc0861a5f8c46734cbbf029608625e8734d31361cf924834769166cc6d429f247b169b299616a5bedcf9dffd0cdc2ad4960e4caa502757a1a98cfd55865
-  data.tar.gz: '0850a3f89b88aea548765a78f46a8d4cac259642dc3f8c15837ab54c1d5c7911b311b8b55719972fe19312cf614d07042652376556a134ea2e20c8b1f7227fc1'
+  metadata.gz: dca66c438930ac24dc216e3ef8f162bae9d0ef54442efaeb2139953379366e9fd93a3fd13ed08cc396f19b6383007f0cee5433ef69cdc863e39a96da92969f8c
+  data.tar.gz: 22e99525720f4e34f0bae5fec105ebfaa80f28c73ce0b60c7323536e167bf54ef735969cafcd602124cfa148983207c9364707f62a4d74835d0fad597f85c793

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,11 +19,40 @@ 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])
+        authorization = service.stack(authorization.id)
+        render json: { success: true, data: serialize(authorization) }
+      rescue StandardError => e
+        render json: { success: false, error: e.message }
+      end
+
+      def storekeeper_authorizations
+        storekeeper = User.find(params[:id])
+        status = params[:status]
+        stores = storekeeper.stores
+        authorizations = ReceiptAuthorization.where(store: stores, status: status)
+        render json: { success: true, data: serialize(authorizations) }
+      end
+
       private
 
       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,28 @@ 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

@@ -5,11 +5,10 @@ module Cats
       APPROVED = 'Approved'.freeze
       READY_TO_START = 'Ready to Start'.freeze
       STARTED = 'Started'.freeze
-      ARRIVED = 'Arrived'.freeze
-      UNLOADED = 'Unloaded'.freeze
       RECEIVED = 'Received'.freeze
+      STACKED = 'Stacked'.freeze
 
-      DISPATCH_STATUSES = [DRAFT, APPROVED, READY_TO_START, STARTED, ARRIVED, UNLOADED, RECEIVED].freeze
+      DISPATCH_STATUSES = [DRAFT, APPROVED, READY_TO_START, STARTED, RECEIVED, STACKED].freeze
 
       belongs_to :prepared_by, class_name: 'Cats::Core::User'
       belongs_to :transporter
@@ -73,12 +72,24 @@ module Cats
         save!
       end
 
+      def receive
+        raise(StandardError, 'Dispatch is not started.') unless dispatch_status == Dispatch::STARTED
+
+        self.dispatch_status = RECEIVED
+        save!
+      end
+
+      def stack
+        self.dispatch_status = STACKED
+        save!
+      end
+
       def self.search_commodity(batch_no)
         commodity = Commodity.find_by(batch_no: batch_no)
         dispatches = Dispatch.includes(:dispatch_transactions)
                              .joins(:transporter)
                              .where(
-                               dispatch_status: [APPROVED, STARTED, ARRIVED, UNLOADED]
+                               dispatch_status: [APPROVED, STARTED]
                              )
         dispatches.map do |dispatch|
           {

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

@@ -18,8 +18,28 @@ module Cats
           authorization.save!
           raise(StandardError, 'Pin has expired.')
         end
+
         authorization.driver_confirmed = true
         authorization.save!
+        statuses = authorization.dispatch.receipt_authorizations.map(&:driver_confirmed).uniq
+        authorization.dispatch.receive if statuses.length == 1 && statuses[0]
+
+        authorization
+      end
+
+      def stack(authorization_id)
+        authorization = ReceiptAuthorization.find(authorization_id)
+        unless authorization.dispatch.dispatch_status == Dispatch::RECEIVED
+          raise(StandardError, 'Dispatch is not received.')
+        end
+
+        total = authorization.transactions.sum(:quantity)
+        if total != authorization.received_quantity
+          raise(StandardError, 'Received quantity is not the same as quantity to be stacked.')
+        end
+
+        authorization.transactions.each(&:commit)
+        authorization.dispatch.stack
         authorization
       end
     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/app/services/cats/core/stack_service.rb

@@ -34,13 +34,10 @@ module Cats
         end
       end
 
-      def receipt_stacks(receipt)
-        location = receipt.dispatch.dispatch_plan_item.destination
-        warehouses = location.children
-        stores = Store.where(warehouse: warehouses)
-
-        commodity = receipt.dispatch.dispatch_plan_item.commodity
-        Stack.where(commodity: commodity, store: stores)
+      def receipt_stacks(authorization_id)
+        authorization = ReceiptAuthorization.find(authorization_id)
+        commodity = authorization.dispatch.dispatch_plan_item.commodity
+        Stack.where(commodity: commodity, store_id: authorization.store_id)
       end
 
       def dispatch_stacks(dispatch)

data/config/routes.rb

@@ -119,17 +119,26 @@ Cats::Core::Engine.routes.draw do
   end
 
   get(
-    '/storekeeper/:id/authorizations',
+    '/storekeeper/:id/dispatch_authorizations',
     controller: :dispatch_authorizations,
     action: :storekeeper_authorizations,
-    as: :storekeeper_authorizations
+    as: :storekeeper_dispatch_authorizations
+  )
+  get(
+    '/storekeeper/:id/receipt_authorizations',
+    controller: :receipt_authorizations,
+    action: :storekeeper_authorizations,
+    as: :storekeeper_receipt_authorizations
   )
   resources :receipt_authorizations, except: %i[index destroy] do
     member 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.25'.freeze
+    VERSION = '1.4.28'.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.25
+  version: 1.4.28
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-29 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers