cats_core 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f44f88a61efb78a98b957e1125a822e36a3fba743e600f28da163dcf3ee8e1fd
-  data.tar.gz: ba63704a7b079b931187ca2ea007202d57e94b3b4bba19c133dd9028873cae8d
+  metadata.gz: 4b08867f616a2f760492e1a866ff5b0145babdb3099162319edd14b037bc4c10
+  data.tar.gz: 0b5237c0cd384b3b87b38b377bc87499d26e24fbd8fa1e31b48896730d313ce9
 SHA512:
-  metadata.gz: 8dbba69e6545334259ca98493c13a2571754ff2d1eccf9ef6178e7a38105c319c3345106683415dc1654fa35c26d03df04ce7a072b235aa8e0e4c7f2afafd390
-  data.tar.gz: 1e827e9172351fca12b42fc2910a639b2cb0556e64b1608bee56704892de22f39a897c03b0688a0cc1596b425c8ed5e41bbe9a894e20a3536f801b8d4e91bb2c
+  metadata.gz: 8764be6cd42ce15582359de5543f801b8b8d6f7974b15cbec6dc2bea649dba0ad698a9e44cbe60a4925ab5f8239c270cc9e4b6d01f9670e80417f214b77b68b0
+  data.tar.gz: 923adf41d9972d43697e7862697fc07ac9b76eab2706ea6c954612aa5467b86f24ddf515f3c5f54e4ec6e7495dba9c3286c05a1db5532fc952f7ccb183dd1fbb

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

@@ -29,7 +29,7 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:dispatch_id, :store_id, :quantity, :status, :authorized_by_id)
+        params.require(:payload).permit(:dispatch_id, :store_id, :quantity, :unit_id, :status, :authorized_by_id)
       end
     end
   end

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

@@ -37,7 +37,7 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:source_id, :dispatch_authorization_id, :transaction_date, :quantity)
+        params.require(:payload).permit(:source_id, :dispatch_authorization_id, :transaction_date, :quantity, :unit_id)
       end
     end
   end

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

@@ -10,7 +10,7 @@ module Cats
       end
 
       def model_params
-        params.require(:payload).permit(:receipt_authorization_id, :quantity, :remark)
+        params.require(:payload).permit(:receipt_authorization_id, :quantity, :unit_id, :remark)
       end
     end
   end

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

@@ -48,7 +48,8 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:dispatch_id, :store_id, :quantity, :remark, :status, :authorized_by_id)
+        params.require(:payload).permit(:dispatch_id, :store_id, :quantity, :unit_id, :remark, :status,
+                                        :authorized_by_id)
       end
 
       def driver_confirm_params

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

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

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

@@ -13,7 +13,7 @@ module Cats
 
       def model_params
         params.require(:payload).permit(:receipt_authorization_id, :commodity_status, :commodity_grade, :quantity,
-                                        :remark)
+                                        :unit_id, :remark)
       end
     end
   end

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

@@ -38,7 +38,7 @@ module Cats
 
       def model_params
         params.require(:payload).permit(:code, :length, :width, :height, :start_x, :start_y, :commodity_id, :store_id,
-                                        :commodity_status, :stack_status, :quantity)
+                                        :commodity_status, :stack_status, :quantity, :unit_id)
       end
     end
   end

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

@@ -0,0 +1,10 @@
+module Cats
+  module Core
+    class ApplicationSetting < ApplicationRecord
+      belongs_to :application_module
+
+      validates :key, presence: true, uniqueness: true
+      validates :value, presence: true
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ module Cats
     class Authorization < ApplicationRecord
       self.abstract_class = true
       after_initialize :set_status
+      before_save :set_unit
 
       # Authorization statuses
       AUTHORIZED = 'Authorized'.freeze
@@ -11,6 +12,7 @@ module Cats
 
       belongs_to :dispatch
       belongs_to :store
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
       belongs_to :authorized_by, class_name: 'Cats::Core::User'
 
       validates :quantity, presence: true, numericality: { greater_than: 0 }
@@ -24,6 +26,14 @@ module Cats
       delegate(:plate_no, to: :dispatch)
       delegate(:driver_name, to: :dispatch)
 
+      def set_unit
+        return if unit
+
+        return unless dispatch
+
+        self.unit = dispatch.unit
+      end
+
       def validate_dispatch_status
         return unless dispatch
 
@@ -52,6 +62,7 @@ module Cats
             transactions.each(&:commit)
             self.status = CONFIRMED
             save!
+            reload
             if dispatch.all_authorizations_confirmed?
               dispatch.generate_pin
               dispatch.quantity = dispatch.dispatch_transactions.sum(:quantity)

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

@@ -44,6 +44,7 @@ module Cats
 
       belongs_to :unit_of_measure
       belongs_to :project
+      belongs_to :package_unit, class_name: 'Cats::Core::UnitOfMeasure', optional: true
 
       validates :best_use_before, presence: true
       validates :batch_no, presence: true, uniqueness: true
@@ -57,6 +58,8 @@ module Cats
       delegate(:abbreviation, to: :unit_of_measure, prefix: 'unit')
       delegate(:code, to: :project, prefix: true)
 
+      alias_attribute :unit, :unit_of_measure
+
       def name
         # For this to be efficient, our query should use includes like
         # Commodity.includes(project: { source: commodity_category })
@@ -86,6 +89,7 @@ module Cats
             store: store,
             commodity: self,
             quantity: quantity,
+            unit: unit,
             commodity_status: GOOD,
             stack_status: Stack::ALLOCATED,
             length: 100,
@@ -98,6 +102,11 @@ module Cats
         end
         result
       end
+
+      def requested_quantity
+        requests = RhnRequest.where(commodity: self)
+        UnitConversion.harmonized_total(requests, unit_of_measure)
+      end
     end
   end
 end

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

@@ -35,10 +35,6 @@ module Cats
         dispatch_plan_item.destination.name
       end
 
-      def authorized_quantity
-        dispatch_authorizations.sum(:quantity)
-      end
-
       def validate_dispatch_plan_status
         return unless dispatch_plan_item
 
@@ -52,16 +48,9 @@ module Cats
         # Check if dispatch has authorizations
         raise(StandardError, 'Dispatch has no authorizations.') unless dispatch_authorizations.count.positive?
 
-        dispatches = Dispatch.where(dispatch_plan_item: dispatch_plan_item)
-        authorized = dispatches.inject(0) do |result, dispatch|
-          result += dispatch.authorized_quantity
-          result
-        end
-        diff = authorized - dispatch_plan_item.quantity
-        error = "Total authorized quantity exceeds allocated quantity (Extra = #{diff})."
-        raise(StandardError, error) if diff.positive?
-
+        dispatch_total = UnitConversion.harmonized_total(dispatch_authorizations, unit)
         self.dispatch_status = APPROVED
+        self.quantity = dispatch_total
         save!
       end
 
@@ -86,6 +75,7 @@ module Cats
           dispatch: self,
           store: store,
           quantity: quantity,
+          unit: unit,
           received_quantity: 0,
           status: Authorization::AUTHORIZED,
           authorized_by: authorized_by
@@ -131,7 +121,7 @@ module Cats
 
       def generate_pin
         pin = SecureRandom.hex(10)
-        self.auth_details = { pin: pin, active: true, expires_at: DateTime.now + 1.hour }
+        self.auth_details = { pin: pin, active: true, expires_at: DateTime.now + 24.hour }
         save!
       end
     end

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

@@ -3,11 +3,24 @@ module Cats
     class DispatchAuthorization < Authorization
       has_many :dispatch_transactions
 
+      validate :validate_quantity
+
       def validate_dispatch_status
         return unless dispatch
 
         errors.add(:dispatch, 'is not in draft state.') unless dispatch.dispatch_status == Dispatch::DRAFT
       end
+
+      def validate_quantity
+        return unless dispatch && quantity && unit
+
+        authorizations = DispatchAuthorization.joins(:dispatch).where(
+          dispatch: { dispatch_plan_item_id: dispatch.dispatch_plan_item_id }
+        )
+        quantity_attribs = %w[dispatch_plan_item quantity]
+        unit_attribs = %w[dispatch_plan_item unit]
+        ValidationUtil.validate_quantity(self, 'dispatch', authorizations, 'allocated', quantity_attribs, unit_attribs)
+      end
     end
   end
 end

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

@@ -58,8 +58,8 @@ module Cats
           )
         end
 
-        total_src = source_auth.sum(&:quantity)
-        total_dest = dest_auth.sum(&:quantity)
+        total_src = UnitConversion.harmonized_total(source_auth, unit)
+        total_dest = UnitConversion.harmonized_total(dest_auth, unit)
 
         if source_auth.count == count
           validate_quantity(total_src, SOURCE_AUTHORIZED)
@@ -81,9 +81,10 @@ module Cats
 
         diff = self.quantity - quantity
         desc = type.split(' ')[0].downcase
+        amount = "#{diff} #{unit.abbreviation}"
         raise(
           StandardError,
-          "Authorized #{desc} quantity is not the same as plan item quantity (#{diff} unaccounted for)."
+          "Authorized #{desc} quantity is not the same as plan item quantity (#{amount} unaccounted for)."
         )
       end
     end

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

@@ -1,6 +1,8 @@
 module Cats
   module Core
     class DispatchTransaction < Transaction
+      before_save :set_unit
+
       belongs_to :source, class_name: 'Cats::Core::Stack'
       belongs_to :dispatch_authorization
 
@@ -10,9 +12,17 @@ module Cats
 
       delegate(:code, to: :source, prefix: true)
 
+      def set_unit
+        return if unit
+
+        return unless dispatch_authorization
+
+        self.unit = dispatch_authorization.unit
+      end
+
       def commit
         Transaction.transaction do
-          source.quantity -= quantity
+          source.quantity -= UnitConversion.convert(unit, source.unit, quantity)
           source.save!
 
           self.status = COMMITTED
@@ -30,19 +40,22 @@ module Cats
       def validate_source_quantity
         return unless quantity && source
 
-        total = DispatchTransaction.where(status: DRAFT, source: source).sum(:quantity)
-        diff = quantity - (source.quantity - total)
-        diff -= quantity_was if quantity_was
-        errors.add(:quantity, "exceeds source quantity by #{diff}") if diff.positive?
+        total = UnitConversion.convert(source.unit, unit, source.quantity)
+        transactions = DispatchTransaction.where(status: DRAFT, source: source)
+        used = UnitConversion.harmonized_total(transactions, unit)
+        used -= quantity_was if quantity_was
+
+        remaining = total - used
+        return unless quantity > remaining
+
+        errors.add(:quantity, "exceeds source quantity. Maximum allowed is #{remaining} #{unit.abbreviation}")
       end
 
       def validate_authorized_quantity
-        return unless quantity && dispatch_authorization
+        return unless quantity && unit && dispatch_authorization
 
-        total = DispatchTransaction.where(dispatch_authorization: dispatch_authorization).sum(:quantity)
-        diff = dispatch_authorization.quantity - total
-        diff += quantity_was if quantity_was
-        errors.add(:quantity, "exceeds authorized quantity (Max. = #{diff}).") if quantity > diff
+        transactions = DispatchTransaction.where(dispatch_authorization: dispatch_authorization)
+        ValidationUtil.validate_quantity(self, 'dispatch_authorization', transactions, 'authorized')
       end
 
       def skip_quantity_validation

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

@@ -1,6 +1,8 @@
 module Cats
   module Core
     class HubAuthorization < ApplicationRecord
+      before_save :set_unit
+
       SOURCE = 'Source'.freeze
       DESTINATION = 'Destination'.freeze
       AUTHORIZATION_TYPES = [SOURCE, DESTINATION].freeze
@@ -8,6 +10,7 @@ module Cats
       belongs_to :dispatch_plan_item, optional: true
       belongs_to :store
       belongs_to :authorized_by, class_name: 'Cats::Core::User'
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
 
       validates :quantity, :authorization_type, presence: true
       validates :quantity, numericality: { greater_than: 0 }
@@ -18,20 +21,22 @@ module Cats
       delegate(:full_name, to: :authorized_by, prefix: true)
       delegate(:name, to: :store, prefix: true)
 
-      def validate_quantity
-        return unless quantity
+      def set_unit
+        return if unit
 
         return unless dispatch_plan_item
 
-        total = dispatch_plan_item.quantity
-        used = HubAuthorization.where(
+        self.unit = dispatch_plan_item.unit
+      end
+
+      def validate_quantity
+        return unless quantity && unit && dispatch_plan_item
+
+        authorizations = HubAuthorization.where(
           dispatch_plan_item: dispatch_plan_item,
           authorization_type: authorization_type
-        ).sum(:quantity)
-        used -= quantity_was if quantity_was
-
-        remaining = total - used
-        errors.add(:quantity, "exceeds allocated quantity. Maximum allowed is #{remaining}") if quantity > remaining
+        )
+        ValidationUtil.validate_quantity(self, 'dispatch_plan_item', authorizations, 'allocated')
       end
     end
   end

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

@@ -1,9 +1,36 @@
 module Cats
   module Core
     class LostCommodity < ApplicationRecord
+      before_save :set_unit
+
       belongs_to :receipt_authorization
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
 
       validates :quantity, presence: true, numericality: { greater_than: 0 }
+      validate :validate_quantity
+
+      def set_unit
+        return if unit
+
+        return unless receipt_authorization
+
+        self.unit = receipt_authorization.unit
+      end
+
+      def validate_quantity
+        return unless quantity && unit && receipt_authorization
+
+        total = UnitConversion.convert(receipt_authorization.unit, unit, receipt_authorization.quantity)
+        receipts = Receipt.where(receipt_authorization: receipt_authorization)
+        losses = LostCommodity.where(receipt_authorization: receipt_authorization)
+        used = UnitConversion.harmonized_total(receipts, unit) + UnitConversion.harmonized_total(losses, unit)
+        used -= quantity_was if quantity_was
+
+        remaining = total - used
+        return unless quantity > remaining
+
+        errors.add(:quantity, "exceeds authorized quantity. Maximum allowed is #{remaining} #{unit.abbreviation}")
+      end
     end
   end
 end

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

@@ -1,11 +1,31 @@
 module Cats
   module Core
     class Receipt < ApplicationRecord
+      before_save :set_unit
+
       belongs_to :receipt_authorization
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
 
       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 }
+      validate :validate_quantity
+
+      def set_unit
+        return if unit
+
+        return unless receipt_authorization
+
+        self.unit = receipt_authorization.unit
+      end
+
+      def validate_quantity
+        return unless quantity && unit && receipt_authorization
+
+        receipts = Receipt.where(receipt_authorization: receipt_authorization)
+        losses = LostCommodity.where(receipt_authorization: receipt_authorization)
+        ValidationUtil.validate_quantity(self, 'receipt_authorization', receipts + losses, 'authorized')
+      end
     end
   end
 end

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

@@ -6,16 +6,13 @@ module Cats
       has_many :receipt_transactions
 
       validates :received_quantity, presence: true, numericality: { greater_than_or_equal_to: 0 }
-      validate :validate_total_quantity
+      validate :validate_quantity
 
-      def validate_total_quantity
-        return unless dispatch && quantity
+      def validate_quantity
+        return unless dispatch && quantity && unit
 
-        received = dispatch.receipt_authorizations.sum(:quantity)
-        diff = dispatch.quantity - received
-        diff += quantity_was if quantity_was
-
-        errors.add(:quantity, "authorized is higher than dispatch quantity (Max = #{diff}).") if quantity > diff
+        authorizations = ReceiptAuthorization.where(dispatch: dispatch)
+        ValidationUtil.validate_quantity(self, 'dispatch', authorizations, 'dispatch')
       end
     end
   end

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

@@ -1,6 +1,8 @@
 module Cats
   module Core
     class ReceiptTransaction < Transaction
+      before_save :set_unit
+
       belongs_to :receipt_authorization
       belongs_to :destination, class_name: 'Cats::Core::Stack'
 
@@ -11,6 +13,14 @@ module Cats
       delegate(:code, to: :destination, prefix: true)
       delegate(:dispatch_reference_no, to: :receipt_authorization)
 
+      def set_unit
+        return if unit
+
+        return unless receipt_authorization
+
+        self.unit = receipt_authorization.unit
+      end
+
       def validate_receipt
         return unless receipt_authorization
 
@@ -21,15 +31,13 @@ module Cats
       def validate_quantity
         return unless quantity && destination && receipt_authorization
 
-        total = ReceiptTransaction.where(receipt_authorization: receipt_authorization).sum(:quantity)
-        diff = receipt_authorization.quantity - total
-        diff += quantity_was if quantity_was
-        errors.add(:quantity, "exceeds authorized quantity (Max. = #{diff}).") if quantity > diff
+        transactions = ReceiptTransaction.where(receipt_authorization: receipt_authorization)
+        ValidationUtil.validate_quantity(self, 'receipt_authorization', transactions, 'authorized')
       end
 
       def commit
         ReceiptTransaction.transaction do
-          destination.quantity += quantity
+          destination.quantity += UnitConversion.convert(unit, destination.unit, quantity)
           destination.stack_status = Cats::Core::Stack::ALLOCATED
           destination.save!
           self.status = COMMITTED

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

@@ -3,13 +3,13 @@ module Cats
     class RhnRequest < ApplicationRecord
       include Dispatchable
 
-      # DRAFT = 'Draft'.freeze
-      # APPROVED = 'Approved'.freeze
-      # RESERVED = 'Reserved'.freeze
+      before_save :set_unit
+
       ALLOCATED = 'Allocated'.freeze
       STATUSES << ALLOCATED
 
       belongs_to :commodity
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
 
       validates :reference_no, :request_date, :quantity, presence: true
       validates :reference_no, uniqueness: true
@@ -19,6 +19,14 @@ module Cats
 
       delegate(:batch_no, to: :commodity, prefix: true)
 
+      def set_unit
+        return if unit
+
+        return unless commodity
+
+        self.unit = commodity.unit
+      end
+
       def request_reference
         reference_no
       end
@@ -34,13 +42,21 @@ module Cats
       end
 
       def validate_quantity
-        return unless commodity && quantity
+        return unless commodity && quantity && unit
 
-        requested = RhnRequest.where(commodity: commodity).sum(:quantity)
-        remaining = commodity.quantity - requested
+        requested = commodity.requested_quantity
 
-        remaining += quantity_was if quantity_was
-        errors.add(:quantity, "exceeds commodity quantity. Maximum allowed is #{remaining}") if quantity > remaining
+        remaining = commodity.quantity - requested
+        if quantity_was
+          additional = UnitConversion.convert(unit, commodity.unit_of_measure, quantity_was)
+          remaining += additional
+        end
+        new_quantity = UnitConversion.convert(unit, commodity.unit_of_measure, quantity)
+        return unless new_quantity > remaining
+
+        remaining = UnitConversion.convert(commodity.unit_of_measure, unit, remaining)
+        message = "exceeds commodity quantity. Maximum allowed is #{remaining} #{unit.abbreviation}"
+        errors.add(:quantity, message)
       end
 
       def approve

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

@@ -9,6 +9,8 @@ module Cats
 
       belongs_to :commodity
       belongs_to :store
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
+
       has_many :dispatch_transactions, foreign_key: :source_id
       has_many :receipt_transactions, foreign_key: :destination_id
 

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

@@ -3,6 +3,7 @@ module Cats
     class StackTransaction < Transaction
       belongs_to :source, class_name: 'Cats::Core::Stack'
       belongs_to :destination, class_name: 'Cats::Core::Stack'
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
 
       def validate_quantity
         return unless quantity.present? && source.present?

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

@@ -9,6 +9,8 @@ module Cats
       COMMITTED = 'Committed'.freeze
       STATUSES = [DRAFT, COMMITTED].freeze
 
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
+
       validates :transaction_date, :quantity, :status, presence: true
       validates :quantity, numericality: { greater_than: 0 }
       validates :status, inclusion: { in: STATUSES }

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

@@ -15,10 +15,28 @@ module Cats
         return value if from == to
 
         conversion = find_by(from: from, to: to)
-        error = "Conversion factor from #{from.abbreviation} to #{to.abbreviation} not found."
-        raise(StandardError, error) unless conversion
+        return value * conversion.factor if conversion
 
-        value * conversion.factor
+        # Check if there is reverse conversion entry defined
+        conversion = find_by(from: to, to: from)
+        unless conversion
+          raise(StandardError, "Conversion factor between #{from.abbreviation} and #{to.abbreviation} not found.")
+        end
+
+        value / conversion.factor
+      end
+
+      ##
+      # This function calculates the sum of quantities of a list of objects with quantities and different
+      # units into one. The list can be a list of hub authorizations, RHN requests, dispatch plan items,
+      # etc ... This method assumes that quantity is represented by the attribute <tt>quantity</tt> and unit of
+      # measure is represented by the attribute <tt>unit</tt> for each object in the object list. If that is not
+      # true then one should create those two attributes as aliases in the respective models.
+      #
+      def self.harmonized_total(list, unit)
+        list.inject(0) do |res, obj|
+          res + UnitConversion.convert(obj.unit, unit, obj.quantity)
+        end
       end
     end
   end

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

@@ -12,11 +12,13 @@ module Cats
         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}
               Allocated Quantity = #{dispatch.dispatch_plan_item.quantity}
               Quantity = #{dispatch.quantity}
+              Unit = #{dispatch.unit.abbreviation}
               Truck Plate No. = #{dispatch.plate_no}
               Driver Name = #{dispatch.driver_name}
               Driver Phone = #{dispatch.driver_phone}

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

@@ -46,6 +46,7 @@ module Cats
           start_x: 2,
           start_y: 2,
           commodity: commodity,
+          unit: commodity.package_unit,
           store: authorization.store,
           commodity_status: Commodity::GOOD,
           stack_status: Stack::ALLOCATED
@@ -54,6 +55,7 @@ module Cats
           receipt_authorization: authorization,
           destination: stack,
           quantity: authorization.received_quantity,
+          unit: authorization.unit,
           status: Transaction::DRAFT,
           transaction_date: Date.today
         )

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

@@ -15,6 +15,7 @@ module Cats
               dispatch_plan_item_id: item.id,
               store_id: store.id,
               quantity: item.quantity,
+              unit_id: item.unit_id,
               authorization_type: HubAuthorization::SOURCE,
               authorized_by_id: keeper.id,
               created_at: Date.today,

data/app/utils/cats/core/util.rb

@@ -0,0 +1,9 @@
+module Cats
+  module Core
+    class Util
+      def self.send_chain(obj, arr)
+        arr.inject(obj) { |o, a| o.send(a) }
+      end
+    end
+  end
+end

data/app/utils/cats/core/validation_util.rb

@@ -0,0 +1,20 @@
+module Cats
+  module Core
+    class ValidationUtil
+      def self.validate_quantity(obj, parent_attr, relation, error_key, quantity_attribs = nil, unit_attribs = nil)
+        parent = obj.send(parent_attr)
+        quantity = quantity_attribs ? Util.send_chain(parent, quantity_attribs) : parent.quantity
+        unit = unit_attribs ? Util.send_chain(parent, unit_attribs) : parent.unit
+        total = UnitConversion.convert(unit, obj.unit, quantity)
+        used = UnitConversion.harmonized_total(relation, obj.unit)
+        used -= obj.quantity_was if obj.quantity_was
+
+        remaining = total - used
+        return unless obj.quantity > remaining
+
+        error = "exceeds #{error_key} quantity. Maximum allowed is #{remaining} #{obj.unit.abbreviation}"
+        obj.errors.add(:quantity, error)
+      end
+    end
+  end
+end

data/db/migrate/20210717033223_create_cats_core_commodities.rb

@@ -10,6 +10,11 @@ class CreateCatsCoreCommodities < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'project_on_commodity_indx' },
                    foreign_key: { to_table: :cats_core_projects }
+      t.references :package_unit,
+                   null: true,
+                   index: { name: 'pu_on_commodity_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+
       t.float :quantity, null: false
       t.string :description
       t.date :best_use_before, null: false

data/db/migrate/20210717171101_create_cats_core_stacks.rb

@@ -18,6 +18,10 @@ class CreateCatsCoreStacks < ActiveRecord::Migration[6.1]
       t.string :commodity_status, null: false, default: 'Good'
       t.string :stack_status, null: false, default: 'Reserved'
       t.float :quantity, null: false, default: 0
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_stack_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
 
       t.timestamps
     end

data/db/migrate/20210718042755_create_cats_core_rhn_requests.rb

@@ -7,6 +7,10 @@ class CreateCatsCoreRhnRequests < ActiveRecord::Migration[6.1]
                    index: { name: 'commodity_on_rhn_indx' },
                    foreign_key: { to_table: :cats_core_commodities }
       t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_rhn_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
       t.date :request_date, null: false
       t.string :requested_by
 

data/db/migrate/20210718045516_create_cats_core_dispatches.rb

@@ -17,7 +17,7 @@ class CreateCatsCoreDispatches < ActiveRecord::Migration[6.1]
       t.references :unit,
                    null: false,
                    index: { name: 'unit_on_dispatches_indx' },
-                   foreign_key: { to_table: :cats_core_unit_of_measures } 
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
       t.string :commodity_status, null: false, default: 'Good'
       t.string :remark
       t.references :prepared_by,

data/db/migrate/20210718055414_create_cats_core_dispatch_authorizations.rb

@@ -10,6 +10,10 @@ class CreateCatsCoreDispatchAuthorizations < ActiveRecord::Migration[7.0]
                    index: { name: 'store_on_da_indx' },
                    foreign_key: { to_table: :cats_core_stores }
       t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_da_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
       t.string :status, null: false, default: 'Authorized'
       t.references :authorized_by,
                    null: false,

data/db/migrate/20210718202957_create_cats_core_dispatch_transactions.rb

@@ -11,6 +11,10 @@ class CreateCatsCoreDispatchTransactions < ActiveRecord::Migration[6.1]
                    foreign_key: { to_table: :cats_core_dispatch_authorizations }
       t.date :transaction_date, null: false
       t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_dt_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
       t.string :status, null: false, default: 'Draft'
 
       t.timestamps

data/db/migrate/20210727074646_create_cats_core_receipt_authorizations.rb

@@ -10,6 +10,10 @@ class CreateCatsCoreReceiptAuthorizations < ActiveRecord::Migration[6.1]
                    index: { name: 'store_on_ra_indx' },
                    foreign_key: { to_table: :cats_core_stores } 
       t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'r_unit_on_da_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
       t.float :received_quantity, null: false, default: 0
       t.string :status, null: false, default: 'Authorized'
       t.string :remark

data/db/migrate/20210727105834_create_cats_core_receipts.rb

@@ -8,6 +8,10 @@ class CreateCatsCoreReceipts < ActiveRecord::Migration[7.0]
       t.string :commodity_status, null: false
       t.string :commodity_grade
       t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_receipts_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
       t.string :remark
 
       t.timestamps

data/db/migrate/20210728041505_create_cats_core_lost_commodities.rb

@@ -6,6 +6,10 @@ class CreateCatsCoreLostCommodities < ActiveRecord::Migration[7.0]
                    index: { name: 'ra_on_lc_indx' },
                    foreign_key: { to_table: :cats_core_receipt_authorizations }
       t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_lc_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
       t.string :remark
 
       t.timestamps

data/db/migrate/20210814160628_create_cats_core_receipt_transactions.rb

@@ -11,6 +11,10 @@ class CreateCatsCoreReceiptTransactions < ActiveRecord::Migration[6.1]
                    foreign_key: { to_table: :cats_core_stacks }
       t.date :transaction_date, null: false
       t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'r_unit_on_dt_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
       t.string :status, null: false, default: 'Draft'
 
       t.timestamps

data/db/migrate/20210814175406_create_cats_core_stack_transactions.rb

@@ -11,6 +11,10 @@ class CreateCatsCoreStackTransactions < ActiveRecord::Migration[6.1]
                    foreign_key: { to_table: :cats_core_stacks }
       t.date :transaction_date, null: false
       t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_st_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
       t.string :status, null: false, default: 'Draft'
 
       t.timestamps

data/db/migrate/20220209083928_create_cats_core_hub_authorizations.rb

@@ -10,6 +10,10 @@ class CreateCatsCoreHubAuthorizations < ActiveRecord::Migration[7.0]
                    index: { name: 'store_on_ha_indx' },
                    foreign_key: { to_table: :cats_core_stores }
       t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_ha_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
       t.string :authorization_type, null: false
       t.references :authorized_by,
                    null: false,

data/db/migrate/20220923190857_create_cats_core_application_settings.rb

@@ -0,0 +1,14 @@
+class CreateCatsCoreApplicationSettings < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_application_settings do |t|
+      t.string :key, unique: true
+      t.string :value, null: false
+      t.references :application_module,
+                   null: false,
+                   index: { name: 'am_on_as_indx' },
+                   foreign_key: { to_table: :cats_core_application_modules }
+
+      t.timestamps
+    end
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.5.2'.freeze
+    VERSION = '1.5.3'.freeze
   end
 end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :application_setting, class: 'Cats::Core::ApplicationSetting' do
+    key { FFaker::Name.name }
+    value { FFaker::Name.name }
+    application_module
+  end
+end

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

@@ -3,6 +3,7 @@ FactoryBot.define do
     batch_no { FFaker::Name.name }
     description { FFaker::Name.name }
     unit_of_measure
+    package_unit factory: :unit_of_measure
     project
     quantity { 100 }
     best_use_before { Date.today + 2.month }

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

@@ -7,6 +7,7 @@ FactoryBot.define do
     dispatch
     store { s }
     quantity { 100 }
+    unit { dispatch.unit }
     status { Cats::Core::ReceiptAuthorization::AUTHORIZED }
     authorized_by factory: :user
 

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

@@ -1,12 +1,13 @@
 FactoryBot.define do
   factory :dispatch_transaction, class: 'Cats::Core::DispatchTransaction' do
-    transient do
-      stack { create(:stack) }
-    end
-    source { stack }
     association :dispatch_authorization, :approved
+    source do
+      create(:stack, unit: dispatch_authorization.unit)
+    end
+
     transaction_date { Date.today }
     quantity { 100 }
+    unit { dispatch_authorization.unit }
     status { Cats::Core::Transaction::DRAFT }
   end
 end

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

@@ -10,7 +10,7 @@ FactoryBot.define do
       create(:hub_authorization, dispatch_plan_item: plan_item, quantity: 100, store: stack.store)
       plan_item
     end
-    unit factory: :unit_of_measure
+    unit { dispatch_plan_item.unit }
     transporter
     plate_no { FFaker::Name.name }
     driver_name { FFaker::Name.name }
@@ -29,6 +29,8 @@ FactoryBot.define do
       after(:create) do |dispatch, options|
         authorization = create(:dispatch_authorization, dispatch: dispatch, store: options.stack.store)
         dispatch.approve
+        options.stack.unit = dispatch.unit
+        options.stack.save!
         create(:dispatch_transaction, dispatch_authorization: authorization, source: options.stack, quantity: 100)
       end
     end
@@ -37,6 +39,8 @@ FactoryBot.define do
       after(:create) do |dispatch, options|
         authorization = create(:dispatch_authorization, dispatch: dispatch, store: options.stack.store)
         dispatch.approve
+        options.stack.unit = dispatch.unit
+        options.stack.save!
         create(:dispatch_transaction, dispatch_authorization: authorization, source: options.stack, quantity: 100)
         authorization.confirm
         dispatch.quantity = 100
@@ -49,6 +53,8 @@ FactoryBot.define do
       after(:create) do |dispatch, options|
         authorization = create(:dispatch_authorization, dispatch: dispatch, store: options.stack.store)
         dispatch.approve
+        options.stack.unit = dispatch.unit
+        options.stack.save!
         create(:dispatch_transaction, dispatch_authorization: authorization, source: options.stack, quantity: 100)
         authorization.confirm
         dispatch.quantity = 100

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

@@ -3,6 +3,7 @@ FactoryBot.define do
     dispatch_plan_item
     store
     quantity { 100 }
+    unit { dispatch_plan_item.unit }
     authorization_type { Cats::Core::HubAuthorization::SOURCE }
     authorized_by factory: :user
   end

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

@@ -2,6 +2,7 @@ FactoryBot.define do
   factory :lost_commodity, class: 'Cats::Core::LostCommodity' do
     receipt_authorization
     quantity { 100 }
+    unit { receipt_authorization.unit }
     remark { FFaker::Name.name }
   end
 end

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

@@ -3,6 +3,7 @@ FactoryBot.define do
     association :dispatch, :started
     store
     quantity { 100 }
+    unit { dispatch.unit }
     received_quantity { 0 }
     remark { FFaker::Name.name }
     status { Cats::Core::ReceiptAuthorization::AUTHORIZED }

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

@@ -1,9 +1,13 @@
 FactoryBot.define do
   factory :receipt_transaction, class: 'Cats::Core::ReceiptTransaction' do
     association :receipt_authorization, :confirmed
-    destination factory: :stack
+    destination do
+      create(:stack, unit: receipt_authorization.unit)
+    end
+
     transaction_date { Date.today }
     quantity { 100 }
+    unit { receipt_authorization.unit }
     status { Cats::Core::Transaction::DRAFT }
   end
 end

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

@@ -3,6 +3,7 @@ FactoryBot.define do
     receipt_authorization
     commodity_status { Cats::Core::Commodity::GOOD }
     quantity { 50 }
+    unit { receipt_authorization.unit }
     remark { FFaker::Name.name }
   end
 end

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

@@ -6,6 +6,7 @@ FactoryBot.define do
       c.approve
       c
     end
+    unit { commodity.unit_of_measure }
     quantity { 100 }
     request_date { Date.today }
     requested_by { FFaker::Name.name }

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

@@ -4,6 +4,7 @@ FactoryBot.define do
     destination factory: :stack
     transaction_date { Date.today }
     quantity { 25 }
+    unit { source.unit }
     status { Cats::Core::Transaction::DRAFT }
   end
 end

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

@@ -11,5 +11,6 @@ FactoryBot.define do
     commodity_status { Cats::Core::Commodity::GOOD }
     stack_status { Cats::Core::Stack::RESERVED }
     quantity { 100 }
+    unit { commodity.package_unit }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-17 00:00:00.000000000 Z
+date: 2022-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -282,6 +282,7 @@ files:
 - app/jobs/cats/core/application_job.rb
 - app/models/cats/core/application_module.rb
 - app/models/cats/core/application_record.rb
+- app/models/cats/core/application_setting.rb
 - app/models/cats/core/authorization.rb
 - app/models/cats/core/beneficiary.rb
 - app/models/cats/core/beneficiary_category.rb
@@ -398,6 +399,8 @@ files:
 - app/services/cats/core/space_service.rb
 - app/services/cats/core/stack_service.rb
 - app/services/cats/core/token_auth_service.rb
+- app/utils/cats/core/util.rb
+- app/utils/cats/core/validation_util.rb
 - config/routes.rb
 - db/migrate/20210715114238_create_cats_core_application_modules.rb
 - db/migrate/20210715114910_create_cats_core_users.rb
@@ -471,12 +474,14 @@ files:
 - db/migrate/20220626063501_create_cats_core_loans.rb
 - db/migrate/20220626063757_create_cats_core_swaps.rb
 - db/migrate/20220626132050_create_cats_core_round_beneficiaries.rb
+- db/migrate/20220923190857_create_cats_core_application_settings.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
 - lib/cats_core.rb
 - lib/tasks/cats_core_tasks.rake
 - spec/factories/cats/core/application_modules.rb
+- spec/factories/cats/core/application_settings.rb
 - spec/factories/cats/core/beneficiaries.rb
 - spec/factories/cats/core/beneficiary_categories.rb
 - spec/factories/cats/core/beneficiary_plan_items.rb