cats_core 1.5.12 → 1.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 276a2fded748139110b7415ef828d512d5c589f9363fc5519619d7fe5a02ddf7
-  data.tar.gz: c10be63fba572250f567c947c3bd09c06592d8ae1e323d60a0f3464c9796ed2f
+  metadata.gz: 6e2ffcd4caf018a81ee3d83fabd7b7e20ddf97c9f6309a66a005805c78c41bc4
+  data.tar.gz: 4d139393006f70306d84cbef40f273e1e578cf855783f63dc1ee37ff2d2e979f
 SHA512:
-  metadata.gz: cb500f43316387c327ec23d75c514b96e707b81b839fa690578261d9b1be74ddc4bed2d9fc1cb2796d7bb210b434ce4443cd17e37da0b946345d217289f6957c
-  data.tar.gz: a8bed5ed9018d105a24cd701ef904a11d067513901be84354df3619d2b02ab0a191f23fc59234aa656b44b5c81f06b53c22c18eea3df9df3701bff9b66590b30
+  metadata.gz: '0309049d3508085b5cacfb155388fab2de02480a91b7869b9b2f1f5e8a51e6f574a70955e04aaa8b9524fd3f374410a27c864217d524557015eaf08b293ff57c'
+  data.tar.gz: 3667ef926f2952820d2b6c73c20fe3515ccdd411f7e8b91605e90f7e3bcaba7507611f74f76a2f389e4236eb96ca63ab4e6ef10da74c146b97b753dc5dec595f

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

@@ -37,7 +37,8 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:source_id, :dispatch_authorization_id, :transaction_date, :quantity, :unit_id)
+        params.require(:payload).permit(:source_id, :dispatch_authorization_id, :transaction_date, :quantity, :unit_id,
+                                        :reference_no)
       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,
-                                        :unit_id, :remark)
+                                        :unit_id, :remark, :reference_no)
       end
     end
   end

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

@@ -61,6 +61,7 @@ module Cats
 
       def region
         return nil if dispatchable.instance_of?(RhnRequest)
+        return dispatch_plan_items.first.source.parent.name if dispatchable.nil?
 
         dispatchable.region.name
       end

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

@@ -7,6 +7,7 @@ module Cats
       belongs_to :dispatch_authorization
 
       validates :source_id, uniqueness: { scope: :dispatch_authorization_id }
+      validates :reference_no, presence: true
       validate :validate_dispatch
       validate :validate_source_quantity, :validate_authorized_quantity, unless: :skip_quantity_validation
 

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

@@ -17,6 +17,9 @@ module Cats
       validates :location_type, inclusion: { in: LOCATION_TYPES }
       validate :validate_location_parent
 
+      delegate(:code, to: :parent, prefix: true, allow_nil: true)
+      delegate(:name, to: :parent, prefix: true, allow_nil: true)
+
       def validate_location_parent
         parents = {
           REGION => [],

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

@@ -4,7 +4,7 @@ module Cats
       belongs_to :transport_offer
       belongs_to :transport_bid_item
 
-      validates :price, presence: true, numericality: { greater_than: 0 }
+      validates :price, presence: true, numericality: { greater_than_or_equal_to: 0 }
       validates :rank, numericality: { greater_than: 0 }, allow_nil: true
       validate :validate_rank_is_set_for_winner
 

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

@@ -9,6 +9,7 @@ module Cats
       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 }
+      validates :reference_no, presence: true
       validate :validate_quantity
 
       delegate(:abbreviation, to: :unit, prefix: true)

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

@@ -13,7 +13,7 @@ module Cats
 
       validates :reference_no, :request_date, :quantity, presence: true
       validates :reference_no, uniqueness: true
-      validates :quantity, numericality: { greater_than: 0 }
+      validates :quantity, numericality: { greater_than_or_equal_to: 0 }
       validates :status, presence: true, inclusion: { in: STATUSES }
       validate :validate_commodity_status, :validate_quantity
 

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

@@ -15,7 +15,7 @@ module Cats
         return value if from == to
 
         conversion = find_by(from: from, to: to)
-        return value * conversion.factor if conversion
+        return (value * conversion.factor).round(2) if conversion
 
         # Check if there is reverse conversion entry defined
         conversion = find_by(from: to, to: from)
@@ -23,7 +23,7 @@ module Cats
           raise(StandardError, "Conversion factor between #{from.abbreviation} and #{to.abbreviation} not found.")
         end
 
-        value / conversion.factor
+        (value / conversion.factor).round(2)
       end
 
       ##

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

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

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

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class LocationSerializer < ActiveModel::Serializer
-      attributes :id, :code, :name, :location_type, :description, :parent_id
+      attributes :id, :code, :name, :location_type, :description, :parent_id, :parent_name
     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, :unit_id, :unit_abbreviation
+                 :dispatch_status, :unit_id, :unit_abbreviation, :driver_confirmed
     end
   end
 end

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

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

data/db/migrate/20221024081134_add_reference_no_to_cats_core_receipts.rb

@@ -0,0 +1,5 @@
+class AddReferenceNoToCatsCoreReceipts < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cats_core_receipts, :reference_no, :string, null: false
+  end
+end

data/db/migrate/20221024081141_add_reference_no_to_cats_core_dispatch_transactions.rb

@@ -0,0 +1,5 @@
+class AddReferenceNoToCatsCoreDispatchTransactions < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cats_core_dispatch_transactions, :reference_no, :string, null: false
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.5.12'.freeze
+    VERSION = '1.5.14'.freeze
   end
 end

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

@@ -9,5 +9,6 @@ FactoryBot.define do
     quantity { 100 }
     unit { dispatch_authorization.unit }
     status { Cats::Core::Transaction::DRAFT }
+    reference_no { FFaker::Name.name }
   end
 end

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

@@ -5,5 +5,6 @@ FactoryBot.define do
     quantity { 50 }
     unit { receipt_authorization.unit }
     remark { FFaker::Name.name }
+    reference_no { FFaker::Name.name }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.5.12
+  version: 1.5.14
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2023-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -475,6 +475,8 @@ files:
 - 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
+- db/migrate/20221024081134_add_reference_no_to_cats_core_receipts.rb
+- db/migrate/20221024081141_add_reference_no_to_cats_core_dispatch_transactions.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb