cats_core 1.3.39 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16a8d6fe8ce3bada8611add7e2b8669608072f40609445223966652619c16844
-  data.tar.gz: 291b4d451c1027375e203245717680ae5419306ef01707c40abdb66d3ec880c0
+  metadata.gz: affaa1b4a210fc6234d49f105efd3a0e197b8d9e6c2ad7e00ae2dbefd23cfe31
+  data.tar.gz: 608f4585d6c34f68a62a7bcfc187d495ac21a0fa528f905bcda7044801ab4c1f
 SHA512:
-  metadata.gz: eab2450cce0646b1914dc800938af63f96eea3439c8377a35c2eaef56574d970dcaded1c250b9bf1d59be929b7a428fce9a790f3956adeab6461f0ec94074ffd
-  data.tar.gz: 663adc2701e5fc8a374eb037b66fba8116049f2c49b5d7a7d09640de12b90d55150387db85113f5a6a047792f24a098a83918ab48a0898e32f6a782cb314e1ba
+  metadata.gz: 68b8a081e2ee0e3ad7edb1876b76a1cb2d2c0b8836de2af209acb01de699d004c0fd2f74c0357a27857fd287f249f3338950debe88c15ee2b742cfe72f4d62cd
+  data.tar.gz: 4b5c89c2de473ec47255835b1862ddaa42f44b4a99d5410bd4c63515b73bef77d1ef92328a75358a00dd29992afa2bcf2c582cbde84a5d63de2833d10944aada

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

@@ -16,7 +16,8 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:dispatch_plan_id, :source_id, :destination_id, :quantity, :commodity_status)
+        params.require(:payload).permit(:dispatch_plan_id, :source_id, :destination_id, :quantity, :commodity_status,
+                                        :status)
       end
     end
   end

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

@@ -22,8 +22,9 @@ module Cats
       end
 
       def approve
+        service = DispatchPlanService.new
         plan = Cats::Core::DispatchPlan.find(params[:id])
-        plan.approve
+        plan = service.approve(plan)
         render json: { success: true, data: serialize(plan) }
       rescue StandardError => e
         render json: { success: false, error: e.message }

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

@@ -19,6 +19,13 @@ module Cats
         render json: { success: true, data: serialize(commodities) }
       end
 
+      def dispatch_stacks
+        service = StackService.new
+        dispatch = Dispatch.find(params[:id])
+        stacks = service.dispatch_stacks(dispatch)
+        render json: { success: true, data: serialize(stacks) }
+      end
+
       def receipt_stacks
         service = StackService.new
         receipt = Receipt.find(params[:id])

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

@@ -14,6 +14,7 @@ module Cats
 
       validates :reference_no, presence: true, uniqueness: true
       validates :status, inclusion: { in: STATUSES }
+      validate :validate_dispatchable, on: :create
 
       delegate(:batch_no, :name, :quantity, to: :commodity, prefix: true)
       delegate(:request_reference, to: :dispatchable, allow_nil: true)
@@ -23,14 +24,40 @@ module Cats
         plan.upstream = !plan.dispatchable.nil? && plan.dispatchable_type == RhnRequest.name
       end
 
+      after_save do |plan|
+        plan.dispatchable&.reserve if status == DRAFT
+      end
+
+      def validate_dispatchable
+        # Check if dispatchable is already reserved and raise error if so.
+        return unless dispatchable
+
+        return if dispatchable.status == RhnRequest::APPROVED
+
+        errors.add(:dispatchable, 'is already reserved.') if id.nil?
+      end
+
       def approve
         raise(StandardError, 'Dispatch plan already approved.') if status == APPROVED
 
         raise(StandardError, 'Dispatch plan is empty.') if dispatch_plan_items.count.zero?
 
+        # Raise error if the total dispatch plan quantity is not equal to the
+        # dispatchable quantity
+        if dispatchable && dispatchable.quantity != quantity
+          raise(StandardError, 'Requested quantity and plan quantity do not match.')
+        end
+
         self.status = APPROVED
+        dispatchable&.allocate
         save!
       end
+
+      # A method which returns the total quantity in the dispatch plan
+      # based on dispatch plan item quantities.
+      def quantity
+        dispatch_plan_items.sum(:quantity)
+      end
     end
   end
 end

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

@@ -18,6 +18,7 @@ module Cats
       has_many :plan_item_details, through: :plan_items
 
       validates :reference_no, :year, :status, presence: true
+      validates :total_days, :rounds, presence: true, numericality: { greater_than: 0 }
       validates :season, presence: true, inclusion: { in: SEASONS }
       validates :reference_no, uniqueness: true
       validates :status, inclusion: { in: STATUSES }

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

@@ -5,8 +5,9 @@ module Cats
 
       DRAFT = 'Draft'.freeze
       APPROVED = 'Approved'.freeze
+      RESERVED = 'Reserved'.freeze
       ALLOCATED = 'Allocated'.freeze
-      STATUSES = [DRAFT, APPROVED, ALLOCATED].freeze
+      STATUSES = [DRAFT, APPROVED, RESERVED, ALLOCATED].freeze
 
       belongs_to :commodity
 
@@ -43,11 +44,22 @@ module Cats
       end
 
       def approve
+        raise(StandardError, 'Request is not in draft state.') unless status == DRAFT
+
         self.status = APPROVED
         save!
       end
 
+      def reserve
+        raise(StandardError, 'Request is not approved.') unless status == APPROVED
+
+        self.status = RESERVED
+        save!
+      end
+
       def allocate
+        raise(StandardError, 'Request is not reserved.') unless status == RESERVED
+
         self.status = ALLOCATED
         save!
       end

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

@@ -12,15 +12,17 @@ module Cats
 
       def message
         allocation_item = params[:allocation_item]
-        commodity = allocation_item.allocation.commodity.name
+        commodity = allocation_item.dispatch_plan.commodity.name
+        source = allocation_item.source.name
+        destination = allocation_item.destination.name
         title = "Allocation Notification - #{commodity}"
         date = Date.today
         body = <<~BODY
           Commodity with the following specification has been allocated to you:
-              Batch No. = #{allocation_item.allocation.commodity.batch_no}
+              Batch No. = #{allocation_item.dispatch_plan.commodity.batch_no}
               Commodity = #{commodity}
               Quantity = #{allocation_item.quantity}
-          The commodity is expected to be delivered from #{allocation_item.from} to #{allocation_item.to}
+          The commodity is expected to be delivered from #{source} to #{destination}
         BODY
         { title: title, date: date, body: body }
       end

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

@@ -23,9 +23,8 @@ module Cats
           end
           HubAuthorization.insert_all(authorizations)
           plan.dispatch_plan_items.update_all(status: DispatchPlanItem::SOURCE_AUTHORIZED)
-          plan.dispatchable.allocate
         end
-        # send_notification(plan)
+        send_notification(plan)
         plan
       end
 
@@ -33,10 +32,33 @@ module Cats
         plan = Cats::Core::DispatchPlan.new(params)
         plan.prepared_by = user
         plan.save!
+
         plan
       rescue ActiveRecord::RecordInvalid
         raise(StandardError, plan.errors.full_messages[0])
       end
+
+      def send_notification(allocation)
+        notification_rule = Cats::Core::NotificationRule.find_by(code: 'allocation')
+        raise(StandardError, 'Notification rule not found for allocation notification.') unless notification_rule
+
+        users = Cats::Core::User.joins(:roles).where(cats_core_roles: { name: notification_rule.roles })
+        allocation.dispatch_plan_items.each do |item|
+          location_id = item.destination_id
+
+          recipients = users.map do |user|
+            details = user.details
+            if (details.key?('warehouse') && details['warehouse'] == location_id) ||
+               (details.key?('hub') && details['hub'] == location_id)
+              user
+            end
+          end.compact
+          unless recipients.empty?
+            notification = Cats::Core::AllocationNotification.with(allocation_item: item)
+            notification.deliver(recipients)
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class DispatchService
-      def search(user, status)
+      def search(user, status, authorized: false)
         details = user.details
 
         unless details['stores'] || details['warehouse'] || details['hub']
@@ -10,18 +10,25 @@ module Cats
 
         # Get user's hub
         hub = if details['stores']
-                Cats::Core::Store.find(details['stores'][0]).warehouse.parent
+                Store.find(details['stores'][0]).warehouse.parent
               elsif details['warehouse']
-                Cats::Core::Location.find(details['warehouse']).parent
+                Location.find(details['warehouse']).parent
               else
-                Cats::Core::Location.find(details['hub'])
+                Location.find(details['hub'])
               end
 
-        Cats::Core::Dispatch.joins(:dispatch_plan_item)
-                            .where(
-                              dispatch_plan_item: { destination: hub },
-                              dispatch_status: status
-                            )
+        if authorized
+          return Dispatch.joins(:dispatch_plan_item)
+                         .where(
+                           dispatch_plan_item: { destination: hub, status: DispatchPlanItem::AUTHORIZED },
+                           dispatch_status: status
+                         )
+        end
+        Dispatch.joins(:dispatch_plan_item)
+                .where(
+                  dispatch_plan_item: { destination: hub },
+                  dispatch_status: status
+                )
       end
 
       def start(dispatch)

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

@@ -49,10 +49,19 @@ module Cats
       def receipt_stacks(receipt)
         location = receipt.dispatch.dispatch_plan_item.destination
         warehouses = location.children
-        stores = Cats::Core::Store.where(warehouse: warehouses)
+        stores = Store.where(warehouse: warehouses)
 
         commodity = receipt.dispatch.dispatch_plan_item.dispatch_plan.commodity
-        Cats::Core::Stack.where(commodity: commodity, store: stores)
+        Stack.where(commodity: commodity, store: stores)
+      end
+
+      def dispatch_stacks(dispatch)
+        location = dispatch.dispatch_plan_item.source
+        warehouses = location.children
+        stores = Store.where(warehouse: warehouses)
+
+        commodity = dispatch.dispatch_plan_item.dispatch_plan.commodity
+        Stack.where(commodity: commodity, store: stores)
       end
     end
   end

data/config/routes.rb

@@ -137,5 +137,6 @@ Cats::Core::Engine.routes.draw do
   post '/stores/:id/stacks', controller: :stacks, action: :filter
   get '/stacks/commodity_for_location', controller: :stacks, action: :commodity_for_location, as: :commodity_for_location
   get '/receipts/:id/stacks', controller: :stacks, action: :receipt_stacks, as: :receipt_stacks
+  get '/dispatches/:id/stacks', controller: :stacks, action: :dispatch_stacks, as: :dispatch_stacks
   resources :stacks, only: %i[show index create update]
 end

data/db/migrate/20210717031810_create_cats_core_plans.rb

@@ -5,6 +5,9 @@ class CreateCatsCorePlans < ActiveRecord::Migration[6.1]
       t.integer :year, null: false
       t.string :season, null: false
       t.string :status, null: false, default: 'Draft'
+      t.date :start_date
+      t.integer :total_days, null: false, default: 180
+      t.integer :rounds, null: false
 
       t.references :program,
                    null: false,

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.3.39'.freeze
+    VERSION = '1.4.1'.freeze
   end
 end

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

@@ -3,6 +3,8 @@ FactoryBot.define do
     reference_no { FFaker::Name.name }
     year { 1 }
     season { Cats::Core::Plan::BELG }
+    total_days { 180 }
+    rounds { 6 }
     status { Cats::Core::Plan::DRAFT }
     program
     ration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.39
+  version: 1.4.1
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-12 00:00:00.000000000 Z
+date: 2022-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers