cats_core 1.1.31 → 1.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b571da2ebc4626e336d086166396fcd2c653d68f579344ca3676b51af2039ea9
-  data.tar.gz: ac911493b34fd36b4fa10c880712450606e6f53c4cefc2e11490914f87b029c5
+  metadata.gz: 03dde5a3e8c977259c5f5c64e2c72feb8212babba6ed10e7d02ea85db7e5eac2
+  data.tar.gz: 970ad6b55fbe1ff4d4c2cc6cecc48585f6d51b5773ba876cce143ad241827f6a
 SHA512:
-  metadata.gz: cc57fb3aaad06227d4a802a70810ff56a1b0552d3b63014026942c79a0fd3c4cc1b0c954fb4629ff52d8e0b516fbad4c4c63b065b5df5ca8d4a9752bf80e20f4
-  data.tar.gz: 6f788725919d5a6627410ded3a6c046a21abe7d7f1efb48de82592a8221dddb917fa6fbd1e7f086b02d1c8172ce42cae46ed6b100ec6b8b1ab95e658c01622d3
+  metadata.gz: a7e4bd908db5af74c49d9306580fbfb743de780e000ba3c8d3406da35f454cfc74fef146255d1bde7e1677207cc9cb0b5bb75b2c357a2c11e0057de631c56ea1
+  data.tar.gz: 2d0658c343d3d30b3fc86c11c41fc273c45b00014bda643d0afd21f21a43fcf7803e1b8b6f9de093aee489e76f1b16f3efb8ade979b9c987d923c7c88ea22d24

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

@@ -20,7 +20,7 @@ module Cats
             jwt = Cats::Core::TokenAuthService.issue(payload)
             render json: { token: jwt, user: payload }
           else
-            rener json: { error: 'Invalid username or password.' }, status: 400
+            render json: { error: 'Invalid username or password.' }, status: 400
           end
         else
           render json: { error: 'User does not exist.' }, status: 400

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

@@ -15,6 +15,26 @@ module Cats
       validates :quantity, presence: true, numericality: { greater_than: 0 }
       validates :commodity_status, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
       validates :allocation_status, inclusion: { in: ALLOCATION_STATUSES }
+      validate :validate_quantity_against_items, :validate_quantity_against_commodity
+
+      def validate_quantity_against_items
+        return unless quantity
+
+        return unless quantity_changed?
+
+        allocated = allocation_items.sum(:quantity)
+        errors.add(:quantity, "is below items quantity. Minimum allowed is #{allocated}") if quantity < allocated
+      end
+
+      def validate_quantity_against_commodity
+        return unless quantity && commodity
+
+        allocated = Allocation.where(commodity: commodity).sum(:quantity)
+        remaining = commodity.quantity - allocated
+
+        remaining += quantity_was if quantity_was
+        errors.add(:quantity, "exceeds commodity quantity. Maximum allowed is #{remaining}") if quantity > remaining
+      end
 
       delegate(:reference_no, to: :rhn_request, prefix: :rhn, allow_nil: true)
       delegate(:batch_no, to: :commodity, prefix: true)

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

@@ -6,7 +6,7 @@ module Cats
 
       validates :from, :to, presence: true
       validates :quantity, presence: true, numericality: { greater_than: 0 }
-      validate :validate_source_and_destination
+      validate :validate_source_and_destination, :validate_quantity
 
       def validate_source_and_destination
         return unless allocation.present? && destination.present?
@@ -14,6 +14,16 @@ module Cats
         errors.add(:base, 'source and destination cannot be the same') if allocation.source == destination
       end
 
+      def validate_quantity
+        return unless quantity && allocation
+
+        return unless quantity_changed?
+
+        allocated = AllocationItem.where(allocation: allocation).sum(:quantity)
+        remaining = allocation.quantity - allocated
+        errors.add(:quantity, "exceeds allocated quantity. Maximum allowed is #{remaining}") if quantity > remaining
+      end
+
       delegate(:name, to: :destination, prefix: true)
       delegate(:reference_no, to: :allocation, prefix: true)
       delegate(:location_type, to: :destination, prefix: true)

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

@@ -3,7 +3,9 @@ module Cats
     class Hrp < ApplicationRecord
       DRAFT = 'Draft'.freeze
       APPROVED = 'Approved'.freeze
-      STATUSES = [DRAFT, APPROVED].freeze
+      NEEDS_APPROVED = 'Needs Approved'.freeze
+
+      STATUSES = [DRAFT, APPROVED, NEEDS_APPROVED].freeze
 
       BELG = 'Belg'.freeze
       MEHER = 'Meher'.freeze

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

@@ -0,0 +1,29 @@
+# To deliver this notification:
+#
+# AllocationNotification.with(post: @post).deliver_later(current_user)
+# AllocationNotification.with(post: @post).deliver(current_user)
+
+module Cats
+  module Core
+    class AllocationNotification < Noticed::Base
+      deliver_by :database
+
+      param :allocation_item
+
+      def message
+        allocation_item = params[:allocation_item]
+        commodity = allocation_item.allocation.commodity.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}
+              Commodity = #{commodity}
+              Quantity = #{allocation_item.quantity}
+          The commodity is expected to be delivered from #{allocation_item.from} to #{allocation_item.to}
+        BODY
+        { title: title, date: date, body: body }
+      end
+    end
+  end
+end

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

@@ -7,13 +7,14 @@ module Cats
 
       def message
         dispatch = params[:dispatch]
-        title = 'Dispatch Notification'
+        commodity = dispatch.allocation_item.allocation.commodity.name
+        title = "Dispatch Notification - #{commodity}"
         date = Date.today
         body = <<~BODY
           Commodity with the following details has been dispatched to you:
               Dispatch Ref. = #{dispatch.reference_no}
               Batch No. = #{dispatch.allocation_item.allocation.commodity.batch_no}
-              Commodity = #{dispatch.allocation_item.allocation.commodity.name}
+              Commodity = #{commodity}
               Allocated Quantity = #{dispatch.allocation_item.quantity}
               Quantity = #{dispatch.quantity}
               Truck Plate No. = #{dispatch.plate_no}

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.31'.freeze
+    VERSION = '1.1.35'.freeze
   end
 end

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

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :allocation_item, class: 'Cats::Core::AllocationItem' do
     allocation
     destination factory: :location
-    quantity { 100 }
+    quantity { 50 }
     from { Date.today }
     to { Date.today + 1.week }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.31
+  version: 1.1.35
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -286,6 +286,7 @@ files:
 - app/models/cats/core/transporter.rb
 - app/models/cats/core/unit_of_measure.rb
 - app/models/cats/core/user.rb
+- app/notifications/cats/core/allocation_notification.rb
 - app/notifications/cats/core/dispatch_notification.rb
 - app/notifications/cats/core/simple_notification.rb
 - app/serializers/cats/core/commodity_category_serializer.rb