cats_core 1.4.18 → 1.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e9cb9c40a02753dac38f29bc222ca8f49af59d44f952126919be10544c4fe30
-  data.tar.gz: 6c96f5a25060732795cd874c04d8f41f711597015e0d49586bbbcf91b171a72f
+  metadata.gz: 4f2cc951417c8b5c1586ad4deb540c51e54177eac53c54a689f31c35bfbfbb67
+  data.tar.gz: f25cbb325f2eb8b8c9081ec0660b3c3028fe45ee0b7f003c40e96c91cdfebd15
 SHA512:
-  metadata.gz: 28a2461af42fd0325081029bd524488716f838e4574ae2bec6589f328b2731189b0b108d9909e426734b502608c7a02de1cc3c1ab7514c12dd97c1a9b2a08a25
-  data.tar.gz: 7a9f3d7e2f05170d74387a034e2ef0c9205c9e1f1bc0d95dcb470fb29099e64a002d250d126f5cd098b1d01af8d7f5cd41d38f239e62bb66c1156107e6b1a2b0
+  metadata.gz: 610169114a8fd878d1fd47b771f55a5bfef3e79c3d660b8148642a8fd9def6e018f4cea2b6cda50ee381970f2bee3e9e98ff5d5f0a3f66436d340b8334e4bf75
+  data.tar.gz: b0d90834aba82fd86dfb53bd6b51a875ff1131c4a3096813d6132efc860915e89ea4dd63c7272518158af8c0d21b355557e055b86d08938e82f063ce743a8f0a

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

@@ -13,7 +13,7 @@ module Cats
 
       validates :status, presence: true, inclusion: { in: STATUSES }
       validates :order_date, presence: true
-      validate :validate_against_requisition
+      validate :validate_against_requisition, :validate_status
 
       delegate(:full_name, to: :prepared_by, prefix: true)
       delegate(:full_name, to: :approved_by, prefix: true, allow_nil: true)
@@ -26,6 +26,30 @@ module Cats
 
         errors.add(:transport_requisition, 'is not approved.')
       end
+
+      def validate_status
+        return unless status
+
+        return if status == DRAFT
+
+        return if transport_order_items.count.positive?
+
+        errors.add(:status, 'cannot be set to "APPROVED" because the order has no items.') if status == APPROVED
+      end
+      
+      def approve(user)
+        raise(StandardError, 'Transport order is already approved.') if status == APPROVED
+
+        begin
+          self.status = APPROVED
+          self.approved_by = user
+          save!
+          self
+        rescue ActiveRecord::RecordInvalid => e
+          error = e.record.errors.full_messages_for(:status)[0]
+          raise(StandardError, error)
+        end
+      end
     end
   end
 end

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

@@ -26,11 +26,12 @@ module Cats
         quantities.sum
       end
 
-      def approve
+      def approve(user)
         raise(StandardError, 'Transport requisition is already approved.') if status == APPROVED
 
         begin
           self.status = APPROVED
+          self.approved_by = user
           save!
           self
         rescue ActiveRecord::RecordInvalid => e

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.18'.freeze
+    VERSION = '1.4.19'.freeze
   end
 end

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

@@ -9,8 +9,9 @@ FactoryBot.define do
 
     trait :approved do
       after(:create) do |requisition|
+        user = create(:user)
         create(:transport_requisition_item, transport_requisition: requisition)
-        requisition.approve
+        requisition.approve(user)
       end
     end
   end

metadata

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