cats_core 1.4.10 → 1.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c497f5ed7c7fd9a82dd7a8f2450db08ab9e6ea307cfebf448819c15affe9baa
-  data.tar.gz: 0c7514559659448cf6b1b83381b3eda706b37497b7fc2d4e2556430c50cfe21a
+  metadata.gz: c2a2d3b649cc7d706426630befadcda681cb80e886fb1347a9621c2c2db38a6c
+  data.tar.gz: fb61fef9d7d60138b51e833009f467389ce76323c72cbe32d96b5016ca93f26f
 SHA512:
-  metadata.gz: cda6953720eb9492fd45083008ab61c38dc28ed1d7f1995f882335725d9f2beeb07b4e1bf1b012eddb6639bce628c6c3e98c939fe6ce59d18ad450d91bd17ffc
-  data.tar.gz: 8785eba470967b8c6b765363c9c88d27270e482a1196decc995182030a6448160590eabe0bb696fabcdceed73e59f17cfffd2c6edb88d9870b4c45fe496652e7
+  metadata.gz: '090040e502dd0cca57b485ec9fd17deed37c9fec16d3ac39ee28e274b82ebacc2e9a77e38942e5cfdbc864c843de3c820ea0b4e469422694351a15754a7c3e9d'
+  data.tar.gz: b98de5aa7d98ce805bf738c3250268f2746fcf212233b9e3bbd30d87b072e98e54e03a53f490d90762182ad2b3387667fd460ef6aeb480a8c14fcb6c46b2d052

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

@@ -7,11 +7,18 @@ module Cats
 
       belongs_to :transport_requisition
       belongs_to :prepared_by, class_name: 'Cats::Core::User'
-      belongs_to :approved_by, class_name: 'Cats::Core::User'
+      belongs_to :approved_by, class_name: 'Cats::Core::User', optional: true
+
+      has_many :transport_order_items
 
       validates :status, presence: true, inclusion: { in: STATUSES }
+      validates :order_date, presence: true
       validate :validate_against_requisition
 
+      delegate(:full_name, to: :prepared_by, prefix: true)
+      delegate(:full_name, to: :approved_by, prefix: true, allow_nil: true)
+      delegate(:reference_no, to: :transport_requisition, prefix: 'requisition')
+
       def validate_against_requisition
         return unless transport_requisition
 

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

@@ -6,11 +6,14 @@ module Cats
       belongs_to :transport_requisition_item
       belongs_to :transport_contract, optional: true
 
-      validates :order_date, :valid_for, presence: true
+      validates :valid_for, presence: true
       validates :valid_for, numericality: { greater_than: 0 }
       validates :transport_requisition_item_id, uniqueness: true
       validate :validate_requisition
 
+      delegate(:name, to: :transporter, prefix: true)
+      delegate(:contract_no, to: :transport_contract, prefix: false)
+
       def validate_requisition
         return unless transport_requisition_item
 

data/db/migrate/20220506082329_create_cats_core_transport_orders.rb

@@ -10,9 +10,10 @@ class CreateCatsCoreTransportOrders < ActiveRecord::Migration[7.0]
                    index: { name: 'pb_on_to_indx' },
                    foreign_key: { to_table: :cats_core_users }
       t.references :approved_by,
-                   null: false,
+                   null: true,
                    index: { name: 'ab_on_to_indx' },
                    foreign_key: { to_table: :cats_core_users }
+      t.date :order_date, null: false
       t.string :status, null: false, default: 'Draft'
 
       t.timestamps

data/db/migrate/20220506083042_create_cats_core_transport_order_items.rb

@@ -17,7 +17,6 @@ class CreateCatsCoreTransportOrderItems < ActiveRecord::Migration[7.0]
                    null: false,
                    index: { name: 'tri_on_toi_indx' },
                    foreign_key: { to_table: :cats_core_transport_requisition_items }
-      t.date :order_date, null: false, default: Date.today
       t.integer :valid_for, null: false, default: 10
 
       t.timestamps

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.10'.freeze
+    VERSION = '1.4.13'.freeze
   end
 end

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

@@ -4,7 +4,6 @@ FactoryBot.define do
     transporter
     transport_contract
     transport_requisition_item { transport_order.transport_requisition.transport_requisition_items.first }
-    order_date { Date.today }
     valid_for { 10 }
   end
 end

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

@@ -1,13 +1,9 @@
 FactoryBot.define do
   factory :transport_order, class: 'Cats::Core::TransportOrder' do
-    transport_requisition do
-      requisition = create(:transport_requisition)
-      create(:transport_requisition_item, transport_requisition: requisition)
-      requisition.approve
-      requisition
-    end
+    association :transport_requisition, :approved
     prepared_by factory: :user
     approved_by factory: :user
+    order_date { Date.today }
     status { Cats::Core::TransportOrder::DRAFT }
   end
 end

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

@@ -6,5 +6,12 @@ FactoryBot.define do
     approved_by factory: :user
     status { Cats::Core::TransportRequisition::DRAFT }
     unit factory: :unit_of_measure
+
+    trait :approved do
+      after(:create) do |requisition|
+        create(:transport_requisition_item, transport_requisition: requisition)
+        requisition.approve
+      end
+    end
   end
 end

metadata

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