cats_core 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b08867f616a2f760492e1a866ff5b0145babdb3099162319edd14b037bc4c10
-  data.tar.gz: 0b5237c0cd384b3b87b38b377bc87499d26e24fbd8fa1e31b48896730d313ce9
+  metadata.gz: e9a6ea1b862a6804a3e215898c7aac9966ffedbdf7aa3c8d9661f9356c4b8a24
+  data.tar.gz: f08e17d946b62d02d148cffbe97ab52c9b1f113245d4dffca6f5d67256ec7ea0
 SHA512:
-  metadata.gz: 8764be6cd42ce15582359de5543f801b8b8d6f7974b15cbec6dc2bea649dba0ad698a9e44cbe60a4925ab5f8239c270cc9e4b6d01f9670e80417f214b77b68b0
-  data.tar.gz: 923adf41d9972d43697e7862697fc07ac9b76eab2706ea6c954612aa5467b86f24ddf515f3c5f54e4ec6e7495dba9c3286c05a1db5532fc952f7ccb183dd1fbb
+  metadata.gz: ea2045f6a7a7954a4157952747c932e096f5df6e8ab2a56e888ca1f656a85eb7bd08a572ad0f15a05b53b0defc51354c27755be960c69c4c0ec49b232ad9b5db
+  data.tar.gz: d91d382689b7abab6221e64457123334bc93bc0357ffdf6eb28e71466d46183ba3aeab2b0d01b24abb0184a7b01b06ae5d0e2331220b710b3a193ac751061ad6

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

@@ -5,7 +5,7 @@ module Cats
 
       def index
         super do
-          Commodity.all.includes({ project: { source: :commodity_category } }, :unit_of_measure)
+          Commodity.all.includes({ project: { source: :commodity_category } }, :unit_of_measure, :package_unit)
         end
       end
 
@@ -18,7 +18,7 @@ module Cats
       end
 
       def filter
-        query = Commodity.includes(:project, :unit_of_measure).ransack(params[:q])
+        query = Commodity.includes(:project, :unit_of_measure, :package_unit).ransack(params[:q])
         render json: { success: true, data: serialize(query.result) }
       end
 

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

@@ -5,7 +5,7 @@ module Cats
 
       def index
         super do
-          DispatchAuthorization.includes(:dispatch, :store, :authorized_by).where(dispatch_id: params[:id])
+          DispatchAuthorization.includes(:dispatch, :store, :authorized_by, :unit).where(dispatch_id: params[:id])
         end
       end
 
@@ -21,7 +21,7 @@ module Cats
         storekeeper = User.find(params[:id])
         stores = storekeeper.stores
         authorizations = DispatchAuthorization.joins(:dispatch)
-                                              .includes(:dispatch, :store, :authorized_by)
+                                              .includes(:dispatch, :store, :authorized_by, :unit)
                                               .where(store: stores, dispatch: { dispatch_status: Dispatch::APPROVED })
         render json: { success: true, data: serialize(authorizations) }
       end

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

@@ -5,7 +5,7 @@ module Cats
 
       def index
         super do
-          DispatchTransaction.includes(:source).where(dispatch_authorization_id: params[:id])
+          DispatchTransaction.includes(:source, :unit).where(dispatch_authorization_id: params[:id])
         end
       end
 

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

@@ -5,7 +5,7 @@ module Cats
 
       def index
         super do
-          LostCommodity.where(receipt_authorization_id: params[:id])
+          LostCommodity.includes(:unit).where(receipt_authorization_id: params[:id])
         end
       end
 

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

@@ -7,7 +7,7 @@ module Cats
 
       def index
         super do
-          ReceiptAuthorization.includes(:dispatch, :store, :authorized_by).where(dispatch_id: params[:id])
+          ReceiptAuthorization.includes(:dispatch, :store, :authorized_by, :unit).where(dispatch_id: params[:id])
         end
       end
 
@@ -40,7 +40,7 @@ module Cats
         storekeeper = User.find(params[:id])
         status = params[:status]
         stores = storekeeper.stores
-        authorizations = ReceiptAuthorization.includes(:dispatch, :store, :authorized_by)
+        authorizations = ReceiptAuthorization.includes(:dispatch, :store, :authorized_by, :unit)
                                              .where(store: stores, status: status)
         render json: { success: true, data: serialize(authorizations) }
       end

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

@@ -5,7 +5,7 @@ module Cats
 
       def index
         super do
-          ReceiptTransaction.includes(:destination, { receipt_authorization: :dispatch })
+          ReceiptTransaction.includes(:destination, { receipt_authorization: :dispatch }, :unit)
                             .where(receipt_authorization_id: params[:id])
         end
       end

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

@@ -5,7 +5,7 @@ module Cats
 
       def index
         super do
-          Receipt.where(receipt_authorization_id: params[:id])
+          Receipt.includes(:unit).where(receipt_authorization_id: params[:id])
         end
       end
 

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

@@ -5,12 +5,12 @@ module Cats
 
       def index
         super do
-          Stack.includes(:commodity).where(store_id: params[:id])
+          Stack.includes(:commodity, :unit).where(store_id: params[:id])
         end
       end
 
       def filter
-        query = Stack.includes(:commodity).where(store_id: params[:id]).ransack(params[:q])
+        query = Stack.includes(:commodity, :unit).where(store_id: params[:id]).ransack(params[:q])
         render json: { success: true, data: serialize(query.result) }
       end
 

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

@@ -3,7 +3,7 @@ module Cats
     class Authorization < ApplicationRecord
       self.abstract_class = true
       after_initialize :set_status
-      before_save :set_unit
+      before_validation :set_unit
 
       # Authorization statuses
       AUTHORIZED = 'Authorized'.freeze
@@ -25,6 +25,7 @@ module Cats
       delegate(:dispatch_status, to: :dispatch)
       delegate(:plate_no, to: :dispatch)
       delegate(:driver_name, to: :dispatch)
+      delegate(:abbreviation, to: :unit, prefix: true)
 
       def set_unit
         return if unit
@@ -64,7 +65,7 @@ module Cats
             save!
             reload
             if dispatch.all_authorizations_confirmed?
-              dispatch.generate_pin
+              Util.generate_pin(dispatch)
               dispatch.quantity = dispatch.dispatch_transactions.sum(:quantity)
               dispatch.dispatch_status = Dispatch::READY_TO_START
               dispatch.save!
@@ -81,17 +82,11 @@ module Cats
           self.received_quantity = total_received
           self.status = CONFIRMED
           save!
-          generate_pin
+          Util.generate_pin(self)
         end
         self
       end
 
-      def generate_pin
-        pin = SecureRandom.hex(10)
-        self.auth_details = { pin: pin, active: true, expires_at: DateTime.now + 1.hour }
-        save!
-      end
-
       private
 
       def set_status

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

@@ -57,6 +57,7 @@ module Cats
 
       delegate(:abbreviation, to: :unit_of_measure, prefix: 'unit')
       delegate(:code, to: :project, prefix: true)
+      delegate(:abbreviation, to: :package_unit, prefix: true, allow_nil: true)
 
       alias_attribute :unit, :unit_of_measure
 

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

@@ -118,12 +118,6 @@ module Cats
           }
         end
       end
-
-      def generate_pin
-        pin = SecureRandom.hex(10)
-        self.auth_details = { pin: pin, active: true, expires_at: DateTime.now + 24.hour }
-        save!
-      end
     end
   end
 end

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

@@ -54,7 +54,9 @@ module Cats
       # A method which returns the total quantity in the dispatch plan
       # based on dispatch plan item quantities.
       def quantity
-        dispatch_plan_items.sum(:quantity)
+        raise(StandardError, 'Dispatchable must be RHN request.') unless dispatchable.instance_of?(RhnRequest)
+
+        UnitConversion.harmonized_total(dispatch_plan_items, dispatchable.unit)
       end
 
       def region

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

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class DispatchTransaction < Transaction
-      before_save :set_unit
+      before_validation :set_unit
 
       belongs_to :source, class_name: 'Cats::Core::Stack'
       belongs_to :dispatch_authorization

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

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class HubAuthorization < ApplicationRecord
-      before_save :set_unit
+      before_validation :set_unit
 
       SOURCE = 'Source'.freeze
       DESTINATION = 'Destination'.freeze
@@ -20,6 +20,7 @@ module Cats
       delegate(:plan_reference_no, to: :dispatch_plan_item)
       delegate(:full_name, to: :authorized_by, prefix: true)
       delegate(:name, to: :store, prefix: true)
+      delegate(:abbreviation, to: :unit, prefix: true)
 
       def set_unit
         return if unit

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

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class LostCommodity < ApplicationRecord
-      before_save :set_unit
+      before_validation :set_unit
 
       belongs_to :receipt_authorization
       belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
@@ -9,6 +9,8 @@ module Cats
       validates :quantity, presence: true, numericality: { greater_than: 0 }
       validate :validate_quantity
 
+      delegate(:abbreviation, to: :unit, prefix: true)
+
       def set_unit
         return if unit
 

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

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class Receipt < ApplicationRecord
-      before_save :set_unit
+      before_validation :set_unit
 
       belongs_to :receipt_authorization
       belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
@@ -11,6 +11,8 @@ module Cats
       validates :quantity, presence: true, numericality: { greater_than: 0 }
       validate :validate_quantity
 
+      delegate(:abbreviation, to: :unit, prefix: true)
+
       def set_unit
         return if unit
 

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

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class ReceiptTransaction < Transaction
-      before_save :set_unit
+      before_validation :set_unit
 
       belongs_to :receipt_authorization
       belongs_to :destination, class_name: 'Cats::Core::Stack'

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

@@ -3,7 +3,7 @@ module Cats
     class RhnRequest < ApplicationRecord
       include Dispatchable
 
-      before_save :set_unit
+      before_validation :set_unit
 
       ALLOCATED = 'Allocated'.freeze
       STATUSES << ALLOCATED
@@ -18,6 +18,7 @@ module Cats
       validate :validate_commodity_status, :validate_quantity
 
       delegate(:batch_no, to: :commodity, prefix: true)
+      delegate(:abbreviation, to: :unit, prefix: true)
 
       def set_unit
         return if unit

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

@@ -27,6 +27,7 @@ module Cats
                unless: -> { store && (store.code == 'SUP-STORE' || store.code.start_with?('FDP-ST')) }
 
       delegate :batch_no, to: :commodity, prefix: true
+      delegate :abbreviation, to: :unit, prefix: true
 
       after_save :update_store_space
 

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

@@ -15,6 +15,8 @@ module Cats
       validates :quantity, numericality: { greater_than: 0 }
       validates :status, inclusion: { in: STATUSES }
 
+      delegate(:abbreviation, to: :unit, prefix: true)
+
       def commit
         raise(NotImplementedError, 'Method should be implemented in child classes.')
       end

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

@@ -3,7 +3,7 @@ module Cats
     class CommoditySerializer < ActiveModel::Serializer
       attributes :id, :name, :batch_no, :description, :unit_of_measure_id, :unit_abbreviation, :project_id,
                  :project_code, :quantity, :best_use_before, :volume_per_metric_ton, :arrival_status, :status,
-                 :shipping_reference, :commodity_grade
+                 :shipping_reference, :commodity_grade, :package_unit_id, :package_unit_abbreviation
     end
   end
 end

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

@@ -2,7 +2,8 @@ module Cats
   module Core
     class DispatchAuthorizationSerializer < ActiveModel::Serializer
       attributes :id, :dispatch_id, :dispatch_reference_no, :store_id, :store_name, :quantity, :authorized_by_id,
-                 :authorizer_full_name, :dispatch_status, :plate_no, :driver_name, :status
+                 :authorizer_full_name, :dispatch_status, :plate_no, :driver_name, :status, :unit_id,
+                 :unit_abbreviation
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Cats
       attributes :id, :reference_no, :dispatch_plan_id, :plan_reference_no, :source_id, :source_name, :destination_id,
                  :destination_name, :quantity, :source_location_type, :destination_location_type, :commodity_status,
                  :status, :commodity_id, :commodity_name, :commodity_batch_no, :unit_abbreviation,
-                 :commodity_shipping_reference
+                 :commodity_shipping_reference, :unit_id
     end
   end
 end

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

@@ -1,7 +1,8 @@
 module Cats
   module Core
     class DispatchTransactionSerializer < ActiveModel::Serializer
-      attributes :id, :source_id, :source_code, :dispatch_authorization_id, :quantity, :transaction_date, :status
+      attributes :id, :source_id, :source_code, :dispatch_authorization_id, :quantity, :transaction_date, :status,
+                 :unit_id, :unit_abbreviation
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class LostCommoditySerializer < ActiveModel::Serializer
-      attributes :id, :receipt_authorization_id, :quantity, :remark
+      attributes :id, :receipt_authorization_id, :quantity, :remark, :unit_id, :unit_abbreviation
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Cats
     class ReceiptAuthorizationSerializer < ActiveModel::Serializer
       attributes :id, :dispatch_id, :dispatch_reference_no, :store_id, :store_name, :quantity, :received_quantity,
                  :remark, :status, :authorized_by_id, :authorizer_full_name, :auth_details, :plate_no, :driver_name,
-                 :dispatch_status
+                 :dispatch_status, :unit_id, :unit_abbreviation
     end
   end
 end

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

@@ -1,7 +1,8 @@
 module Cats
   module Core
     class ReceiptSerializer < ActiveModel::Serializer
-      attributes :id, :receipt_authorization_id, :commodity_status, :commodity_grade, :quantity, :remark
+      attributes :id, :receipt_authorization_id, :commodity_status, :commodity_grade, :quantity, :remark,
+                 :unit_id, :unit_abbreviation
     end
   end
 end

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

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

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

@@ -2,7 +2,7 @@ module Cats
   module Core
     class StackSerializer < ActiveModel::Serializer
       attributes :id, :code, :length, :width, :height, :start_x, :start_y, :commodity_id, :store_id, :commodity_status,
-                 :stack_status, :quantity, :commodity_batch_no
+                 :stack_status, :quantity, :commodity_batch_no, :unit_id, :unit_abbreviation
     end
   end
 end

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

@@ -4,6 +4,12 @@ module Cats
       def self.send_chain(obj, arr)
         arr.inject(obj) { |o, a| o.send(a) }
       end
+
+      def self.generate_pin(obj)
+        pin = SecureRandom.hex(10)
+        obj.auth_details = { pin: pin, active: true, expires_at: DateTime.now + 24.hour }
+        obj.save!
+      end
     end
   end
 end

data/lib/cats/core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2022-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers