cats_core 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae62c0b230969901c7405d3bdf56b72dc099e77e4e6d9a21ba89243f91a1bd07
-  data.tar.gz: cc0d85257ffb25fc70a890011b1ae670dd18a0ea6938f79e73ec87a757787cd1
+  metadata.gz: 20f6349c8a17610b338d05e2fa64a35d76bf0f3737f898ed9ab4d58d76053085
+  data.tar.gz: 74f16a28eaaf4608b0b2d1935331d8837f49cc805511412df57f902c6d421349
 SHA512:
-  metadata.gz: 582d0f4d63492a2ce3b3e12a7d6e84088c5c5badab3135cb108fc8876348f3e593f70d0498d6c23e79de143efb04436fd858325c6bac8a5bf29785d3a1d4d899
-  data.tar.gz: 581e221e3dff760e51095cc7094736b0a2c7f7c261d4693c8f811f3b9e2aac1ee5093ba6823895bb910488947f8616cee32b799178b5d1da64905ca40cc7b20c
+  metadata.gz: 1b3dbbd8c4da02cb692bf9eae19d6e653ced98de74f54a6a9cae9c6c0dddbe2dfd7fb7b5ec4d1881445e0cf159a2e093111b2acc25dd72309b2c183ff6f94c5b
+  data.tar.gz: 05ad4779c0d90d975fc172c4c98c6729e3ff45092953408c31f4cdade4b01dae94eaf655dc857d793e6064770a3a44b93127e62b31ee890633871a509998768a

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

@@ -23,19 +23,26 @@ module Cats
       def validate_dispatch_status
         return unless dispatch
 
-        return if dispatch.dispatch_status == Cats::Core::Dispatch::STARTED
+        statuses = [Cats::Core::Dispatch::STARTED, Cats::Core::Dispatch::RECEIVED]
+        return if statuses.include?(dispatch.dispatch_status)
 
-        errors.add(:dispatch, 'Dispatch should be in "Started" state.')
+        errors.add(:dispatch, 'should be in "Started" state.')
       end
 
       def validate_total_quantity
         return unless dispatch && quantity
 
-        received = Cats::Core::Receipt.where(dispatch: dispatch).sum(:quantity)
-        remaining = dispatch.quantity - received
-        return if quantity <= remaining
+        received = dispatch.receipts.sum(:quantity)
+        diff = dispatch.quantity - received
+        if new_record?
+          return if quantity <= diff
 
-        errors.add(:quantity, "Total receipt quantity is higher than dispatch quantity (Max = #{remaining}).")
+          errors.add(:quantity, "total is higher than dispatch quantity (Max = #{diff}).")
+        else
+          return unless diff.negative?
+
+          errors.add(:quantity, "total is higher than dispatch quantity (Max = #{diff.abs}).")
+        end
       end
     end
   end

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

@@ -3,6 +3,8 @@ module Cats
     class ReceiptTransaction < Transaction
       belongs_to :source, class_name: 'Cats::Core::Receipt'
       belongs_to :destination, class_name: 'Cats::Core::Stack'
+
+      delegate(:code, to: :destination, prefix: true)
     end
   end
 end

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

@@ -12,12 +12,14 @@ module Cats
       validates :transaction_date, :quantity, :status, presence: true
       validates :quantity, numericality: { greater_than: 0 }
       validates :status, inclusion: { in: STATUSES }
-      validate :validate_quantity
+      validate :validate_quantity, unless: :skip_quantity_validation
 
       def validate_quantity
         return unless quantity.present? && source.present?
 
-        errors.add(:quantity, 'cannot be more than source quantity') if quantity > source.quantity
+        total = self.class.where(source: source).sum(:quantity)
+        diff = source.quantity - total
+        errors.add(:quantity, "total is higher than source quantity (Max = #{diff}).") if quantity > diff
       end
 
       def commit
@@ -27,10 +29,23 @@ module Cats
           source.save
           destination.save
           self.status = COMMITTED
-          save
+          save!
         end
       end
 
+      def skip_quantity_validation
+        # Quantity validation should be skipped if we are commiting transactions.
+        (
+          instance_of?(Cats::Core::DispatchTransaction) &&
+          destination &&
+          destination.dispatch_status == Cats::Core::Dispatch::STARTED
+        ) || (
+          instance_of?(Cats::Core::ReceiptTransaction) &&
+          source &&
+          source.status == Cats::Core::Receipt::STACKING
+        )
+      end
+
       def set_status
         return unless new_record?
 

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

@@ -126,7 +126,7 @@ module Cats
           dispatch.dispatch_status = Cats::Core::Dispatch::RECEIVED
           dispatch.receipts.each { |r| r.status = Cats::Core::Receipt::CONFIRMED }
           dispatch.save
-          dispatch.receipts.each(&:save)
+          dispatch.receipts.each(&:save!)
         end
 
         dispatch

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.2'.freeze
+    VERSION = '1.1.3'.freeze
   end
 end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :receipt_transaction do
+  factory :receipt_transaction, class: 'Cats::Core::ReceiptTransaction' do
     source factory: :receipt
     destination factory: :stack
     transaction_date { Date.today }

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :receipt, class: 'Cats::Core::Receipt' do
     dispatch factory: :dispatch, dispatch_status: Cats::Core::Dispatch::STARTED
-    quantity { 1.5 }
+    quantity { 50 }
     commodity_status { Cats::Core::Commodity::GOOD }
     status { Cats::Core::Receipt::DRAFT }
     remark { FFaker::Name.name }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Henock L.