cats_core 1.1.34 → 1.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04aa5725df06bf149cf057515dd11ef721dc9511b9aa9555cd2dd311ad9e96ff
-  data.tar.gz: ec1393337a6276fec08d3897618bb2ed345f66dd027a8a07efc59544bcd326d6
+  metadata.gz: 03dde5a3e8c977259c5f5c64e2c72feb8212babba6ed10e7d02ea85db7e5eac2
+  data.tar.gz: 970ad6b55fbe1ff4d4c2cc6cecc48585f6d51b5773ba876cce143ad241827f6a
 SHA512:
-  metadata.gz: d5b97bdff8990988dd0bebeba15e24fadc28328970e1343f36617c3ee93a149af2470320ad8b7adafca36dcfddcb927acbed34e67b325dbb3828e2941ab5f9cc
-  data.tar.gz: ec0011655502fd35e6313bd4e5f079557cc58de783d093d640e122fbcd894bbcca459225ebafdc83f7c4c2770a116477dd4f09061ee33c5fadeee0e32790445d
+  metadata.gz: a7e4bd908db5af74c49d9306580fbfb743de780e000ba3c8d3406da35f454cfc74fef146255d1bde7e1677207cc9cb0b5bb75b2c357a2c11e0057de631c56ea1
+  data.tar.gz: 2d0658c343d3d30b3fc86c11c41fc273c45b00014bda643d0afd21f21a43fcf7803e1b8b6f9de093aee489e76f1b16f3efb8ade979b9c987d923c7c88ea22d24

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/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.34'.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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.34
+  version: 1.1.35
 platform: ruby
 authors:
 - Henock L.