cats_core 1.5.14 → 1.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e2ffcd4caf018a81ee3d83fabd7b7e20ddf97c9f6309a66a005805c78c41bc4
-  data.tar.gz: 4d139393006f70306d84cbef40f273e1e578cf855783f63dc1ee37ff2d2e979f
+  metadata.gz: 279f9103030fd0c0a858e6d2d5c2f71b69644f17b3654b7e8cd6226deeefabb3
+  data.tar.gz: 58431c85a8824cd879b58f550fa28969b1f45bd9ba04cb16ab69553a6e01c3d3
 SHA512:
-  metadata.gz: '0309049d3508085b5cacfb155388fab2de02480a91b7869b9b2f1f5e8a51e6f574a70955e04aaa8b9524fd3f374410a27c864217d524557015eaf08b293ff57c'
-  data.tar.gz: 3667ef926f2952820d2b6c73c20fe3515ccdd411f7e8b91605e90f7e3bcaba7507611f74f76a2f389e4236eb96ca63ab4e6ef10da74c146b97b753dc5dec595f
+  metadata.gz: e3f8d565b6b939cadff349df0add73ba2e50ae4eef45629d412748754e307aaf7952b69bf3138232c549c560766f23e8dcfbceb5b14ae3f7b3ddccb9c428ab92
+  data.tar.gz: e3d1c7576b48388d6f8144401218b47fd2d40b0320f1ffbe6f9ef674e70d2ab295aed46fb2ac6d9571ca0c99d611f529dc047d3e073bde557d9e02a9c726fb77

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

@@ -11,6 +11,16 @@ module Cats
         end
       end
 
+      def create
+        authorization = ReceiptAuthorization.new(model_params)
+        if authorization.save
+          AuthorizationService.new.send_notification(authorization)
+          render json: { success: true, data: serialize(authorization) }, status: :created
+        else
+          render json: { success: false, error: authorization.errors.full_messages[0] }, status: :unprocessable_entity
+        end
+      end
+
       def confirm
         authorization = ReceiptAuthorization.find(params[:id])
         authorization.confirm

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

@@ -18,8 +18,8 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:receipt_authorization_id, :destination_id, :transaction_date, :quantity,
-                                        :unit_id)
+        params.require(:payload).permit(:receipt_authorization_id, :receipt_number, :destination_id,
+                                        :transaction_date, :quantity, :unit_id)
       end
     end
   end

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

@@ -0,0 +1,25 @@
+module Cats
+  module Core
+    class StackTransactionsController < ApplicationController
+      include Common
+
+      def index
+        super do
+          StackTransaction.joins({ source: :store }, :unit)
+                          .where(cats_core_stacks: { cats_core_stores: { warehouse_id: params[:id] } })
+        end
+      end
+
+      def filter
+        query = StackTransaction.ransack(params[:q])
+        render json: { success: true, data: serialize(query.result) }
+      end
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:source_id, :destination_id, :transaction_date, :quantity, :unit_id)
+      end
+    end
+  end
+end

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

@@ -25,6 +25,7 @@ module Cats
         store_keeper.details['stores'] ||= []
         store_keeper.details['stores'] += store_params[:store_ids]
         store_keeper.save!
+
         render json: { success: true, data: serialize(store_keeper) }
       end
 

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

@@ -23,16 +23,17 @@ module Cats
       end
 
       after_save do |plan|
-        plan.dispatchable&.reserve if status == DRAFT
+        plan.dispatchable&.complete if status == DRAFT && dispatchable.instance_of?(RhnRequest)
+        plan.dispatchable&.in_progress if status == DRAFT && dispatchable.instance_of?(RoundPlan)
       end
 
       def validate_dispatchable
-        # Check if dispatchable is already reserved and raise error if so.
+        # Check if dispatchable is already completed and raise error if so.
         return unless dispatchable
 
         return if dispatchable.status == RhnRequest::APPROVED
 
-        errors.add(:dispatchable, 'is already reserved.') if id.nil? && dispatchable.status == Dispatchable::RESERVED
+        errors.add(:dispatchable, 'is already completed.') if id.nil? && dispatchable.status == Dispatchable::COMPLETED
       end
 
       def approve

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

@@ -7,7 +7,7 @@ module Cats
       belongs_to :dispatch_authorization
 
       validates :source_id, uniqueness: { scope: :dispatch_authorization_id }
-      validates :reference_no, presence: true
+      # validates :reference_no, presence: true
       validate :validate_dispatch
       validate :validate_source_quantity, :validate_authorized_quantity, unless: :skip_quantity_validation
 

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

@@ -9,7 +9,7 @@ module Cats
       validates :commodity_status, presence: true, inclusion: { in: Commodity::COMMODITY_STATUSES }
       validates :commodity_grade, inclusion: { in: Commodity::COMMODITY_GRADES }, allow_nil: true
       validates :quantity, presence: true, numericality: { greater_than: 0 }
-      validates :reference_no, presence: true
+      # validates :reference_no, presence: true
       validate :validate_quantity
 
       delegate(:abbreviation, to: :unit, prefix: true)

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

@@ -8,6 +8,7 @@ module Cats
 
       validates :transaction_date, presence: true
       validates :quantity, presence: true, numericality: { greater_than: 0 }
+      validates :receipt_number, presence: true
       validate :validate_receipt, :validate_quantity
 
       delegate(:code, to: :destination, prefix: true)

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

@@ -67,15 +67,15 @@ module Cats
         save!
       end
 
-      def reserve
+      def complete
         raise(StandardError, 'Request is not approved.') unless status == APPROVED
 
-        self.status = RESERVED
+        self.status = COMPLETED
         save!
       end
 
       def allocate
-        raise(StandardError, 'Request is not reserved.') unless status == RESERVED
+        raise(StandardError, 'Request is not completed.') unless status == COMPLETED
 
         self.status = ALLOCATED
         save!

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

@@ -4,8 +4,10 @@ module Cats
       include Dispatchable
 
       NEEDS_APPROVED = 'Needs Approved'.freeze
+      IN_PROGRESS = 'In Progress'.freeze
 
       STATUSES << NEEDS_APPROVED
+      STATUSES << IN_PROGRESS
 
       belongs_to :plan
       belongs_to :region, class_name: 'Cats::Core::Location'
@@ -42,17 +44,17 @@ module Cats
         update!(status: APPROVED)
       end
 
-      def reserve
+      def in_progress
         raise(StandardError, 'Plan is not approved.') unless status == APPROVED
 
-        self.status = RESERVED
+        self.status = IN_PROGRESS
         save!
       end
 
       def validate_rounds
         return unless rounds && plan
 
-        errors.add(:rounds, 'cannot be an empty list') if rounds.length.zero?
+        errors.add(:rounds, 'cannot be an empty list') if rounds.empty?
 
         existing_rounds = plan.round_plans.where(region: region).map(&:rounds).sum([])
         rounds.each do |round|

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

@@ -6,7 +6,8 @@ module Cats
       belongs_to :unit_of_measure
       belongs_to :round_plan
 
-      validates :quantity, :no_of_days, presence: true, numericality: { greater_than: 0 }
+      validates :quantity, presence: true, numericality: { greater_than_or_equal_to: 0 }
+      validates :no_of_days, presence: true, numericality: { greater_than: 0 }
 
       delegate(:name, to: :commodity_category, prefix: true)
       delegate(:name, to: :beneficiary_category, prefix: true)

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

@@ -29,7 +29,7 @@ module Cats
       delegate :batch_no, to: :commodity, prefix: true
       delegate :abbreviation, to: :unit, prefix: true
 
-      after_save :update_store_space
+      after_save :update_store_space, :destroy_stack
 
       def validate_coordinates
         return unless store.present? && length.present? && width.present? && start_x.present? && start_y.present?
@@ -169,6 +169,13 @@ module Cats
           }
         end
       end
+
+      def destroy_stack
+        return unless stack_status == Cats::Core::Stack::ALLOCATED && quantity.zero?
+
+        self.stack_status = Cats::Core::Stack::DESTROYED
+        save!
+      end
     end
   end
 end

data/app/models/concerns/cats/core/dispatchable.rb

@@ -1,6 +1,6 @@
 # A concern to represent entities that lead to dispatch plan.
 # All classes including this concern must implement `request_reference()`,
-# `reserve()`, and `request_quantity()` methods, which will be used to generate
+# `complete()`, and `request_quantity()` methods, which will be used to generate
 # reference information in dispatch plan serializer.
 module Cats
   module Core
@@ -9,10 +9,10 @@ module Cats
 
       DRAFT = 'Draft'.freeze
       APPROVED = 'Approved'.freeze
-      RESERVED = 'Reserved'.freeze
+      COMPLETED = 'Completed'.freeze
 
       # rubocop:disable Style/MutableConstant
-      STATUSES = [DRAFT, APPROVED, RESERVED]
+      STATUSES = [DRAFT, APPROVED, COMPLETED]
       # rubocop:enable Style/MutableConstant
 
       included do

data/app/notifications/cats/core/receipt_authorization_notification.rb

@@ -0,0 +1,31 @@
+module Cats
+  module Core
+    class ReceiptAuthorizationNotification < Noticed::Base
+      deliver_by :database
+
+      param :receipt_authorization
+
+      def message
+        authorization = params[:receipt_authorization]
+        dispatch = authorization.dispatch
+        commodity = dispatch.dispatch_plan_item.commodity
+        title = "Receipt Authorization Notification - #{commodity.name}"
+        date = Date.today
+
+        body = <<~BODY
+          Commodity with the following details has been dispatched to you:
+              Authorization no. = #{dispatch.dispatch_plan_item.reference_no}
+              Dispatch Ref. = #{dispatch.reference_no}
+              Batch No. = #{commodity.batch_no}
+              Commodity = #{commodity.name}
+              Quantity = #{authorization.quantity}
+              Unit = #{authorization.unit.abbreviation}
+              Truck Plate No. = #{dispatch.plate_no}
+              Driver Name = #{dispatch.driver_name}
+              Driver Phone = #{dispatch.driver_phone}
+        BODY
+        { title: title, date: date, body: body }
+      end
+    end
+  end
+end

data/app/notifications/cats/core/round_plan_notification.rb

@@ -0,0 +1,27 @@
+module Cats
+  module Core
+    class RoundPlanNotification < Noticed::Base
+      deliver_by :database
+
+      param :round_plan
+
+      def message
+        round_plan = params[:round_plan]
+        plan = round_plan.plan
+        title = "Round Plan - #{round_plan.reference_no}"
+        date = Date.today
+        body = <<~BODY
+          A round plan with the following specifications needs your approval:
+            Reference No. = #{round_plan.reference_no}
+            Status = #{round_plan.status}
+            Region = #{round_plan.region.name}
+            Rounds = #{round_plan.rounds}
+            Program = #{plan.program.name}
+            Year = #{plan.year}
+            Season = #{plan.season}
+        BODY
+        { title: title, date: date, body: body }
+      end
+    end
+  end
+end

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

@@ -1,7 +1,8 @@
 module Cats
   module Core
     class ReceiptTransactionSerializer < ActiveModel::Serializer
-      attributes :id, :receipt_authorization_id, :dispatch_reference_no, :destination_id, :destination_code, :quantity,
+      attributes :id, :receipt_authorization_id, :receipt_number,
+                 :dispatch_reference_no, :destination_id, :destination_code, :quantity,
                  :transaction_date, :status, :unit_id, :unit_abbreviation
     end
   end

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

@@ -95,6 +95,23 @@ module Cats
           quantity: item.quantity
         }
       end
+
+      def send_notification(authorization)
+        notification_rule = NotificationRule.find_by(code: 'receipt_authorization')
+        error = 'Notification rule not found for receipt authorization notification.'
+        raise(StandardError, error) unless notification_rule
+
+        users = User.joins(:roles).where(cats_core_roles: { name: notification_rule.roles })
+        recipients = users.map do |user|
+          details = user.details
+
+          user if details.key?('stores') && details['stores'].include?(authorization.store_id)
+        end.compact
+        return if recipients.empty?
+
+        notification = ReceiptAuthorizationNotification.with(receipt_authorization: authorization)
+        notification.deliver(recipients)
+      end
     end
   end
 end

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

@@ -96,6 +96,7 @@ module Cats
           }
         end
         Cats::Core::BeneficiaryRoundPlanItem.insert_all!(ben_round_plan_items, record_timestamps: true)
+        send_approval_notification(round_plan)
         round_plan
       end
 
@@ -186,8 +187,38 @@ module Cats
         else
           plan.approve
         end
+        send_approved_notification(plan)
         plan
       end
+
+      def send_approval_notification(round_plan)
+        notification_rule = NotificationRule.find_by(code: 'round_plan_approval')
+        error = 'Notification rule not found for round plan approval notification.'
+        raise(StandardError, error) unless notification_rule
+
+        users = User.joins(:roles).where(cats_core_roles: { name: notification_rule.roles })
+        return if users.empty?
+
+        notification = RoundPlanNotification.with(round_plan: round_plan)
+        notification.deliver(users)
+      end
+
+      def send_approved_notification(round_plan)
+        notification_rule = NotificationRule.find_by(code: 'round_plan_approved')
+        error = 'Notification rule not found for round plan approved notification.'
+        raise(StandardError, error) unless notification_rule
+
+        users = User.joins(roles: :application_module).where(
+          cats_core_roles: {
+            name: notification_rule.roles,
+            cats_core_application_modules: { prefix: 'CATS-TMS' }
+          }
+        )
+        return if users.empty?
+
+        notification = RoundPlanNotification.with(round_plan: round_plan)
+        notification.deliver(users)
+      end
     end
   end
 end

data/config/routes.rb

@@ -56,6 +56,9 @@ Cats::Core::Engine.routes.draw do
       to: 'spaces#available_space',
       as: :warehouse_space,
       defaults: { level: Cats::Core::SpaceService::WAREHOUSE }
+  get '/warehouses/:id/stack_transactions',
+      to: 'stack_transactions#index',
+      as: :warehouse_stack_transactions
   get '/stores/:id/space',
       to: 'spaces#available_space',
       as: :store_space,
@@ -184,6 +187,7 @@ Cats::Core::Engine.routes.draw do
   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 :stack_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
   

data/db/migrate/20221024081134_add_reference_no_to_cats_core_receipts.rb

@@ -1,5 +1,5 @@
 class AddReferenceNoToCatsCoreReceipts < ActiveRecord::Migration[7.0]
   def change
-    add_column :cats_core_receipts, :reference_no, :string, null: false
+    add_column :cats_core_receipts, :reference_no, :string, null: true
   end
 end

data/db/migrate/20221024081141_add_reference_no_to_cats_core_dispatch_transactions.rb

@@ -1,5 +1,5 @@
 class AddReferenceNoToCatsCoreDispatchTransactions < ActiveRecord::Migration[7.0]
   def change
-    add_column :cats_core_dispatch_transactions, :reference_no, :string, null: false
+    add_column :cats_core_dispatch_transactions, :reference_no, :string, null: true
   end
 end

data/db/migrate/20230102064317_add_receipt_number_to_cats_core_receipt_transactions.rb

@@ -0,0 +1,5 @@
+class AddReceiptNumberToCatsCoreReceiptTransactions < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cats_core_receipt_transactions, :receipt_number, :string
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.5.14'.freeze
+    VERSION = '1.5.16'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.5.14
+  version: 1.5.16
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-29 00:00:00.000000000 Z
+date: 2023-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -270,6 +270,7 @@ files:
 - app/controllers/cats/core/round_plans_controller.rb
 - app/controllers/cats/core/routes_controller.rb
 - app/controllers/cats/core/spaces_controller.rb
+- app/controllers/cats/core/stack_transactions_controller.rb
 - app/controllers/cats/core/stacks_controller.rb
 - app/controllers/cats/core/stores_controller.rb
 - app/controllers/cats/core/swaps_controller.rb
@@ -358,6 +359,8 @@ files:
 - app/models/concerns/cats/core/dispatchable.rb
 - app/notifications/cats/core/allocation_notification.rb
 - app/notifications/cats/core/dispatch_notification.rb
+- app/notifications/cats/core/receipt_authorization_notification.rb
+- app/notifications/cats/core/round_plan_notification.rb
 - app/notifications/cats/core/simple_notification.rb
 - app/serializers/cats/core/cash_donation_serializer.rb
 - app/serializers/cats/core/commodity_category_serializer.rb
@@ -477,6 +480,7 @@ files:
 - db/migrate/20220923190857_create_cats_core_application_settings.rb
 - db/migrate/20221024081134_add_reference_no_to_cats_core_receipts.rb
 - db/migrate/20221024081141_add_reference_no_to_cats_core_dispatch_transactions.rb
+- db/migrate/20230102064317_add_receipt_number_to_cats_core_receipt_transactions.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb