cats_core 1.4.9 → 1.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1eacca23e0a10e3a707dcc45f51e2c44013fccb7a35182f3d7476c95d0bcad8
-  data.tar.gz: bcbcaf4bda959f028521528e8e7c979bca422037c9e4abb913449f831cadc73b
+  metadata.gz: 3724badb244476dc73d7c35fac9971114160be9781ba3a386f2d35ef70226324
+  data.tar.gz: 9f29cd5757d75472e03f8baa3bd4421fc78109d50612955ebdd666a354c17ca6
 SHA512:
-  metadata.gz: b34d8901501515edaa28a7aea773ccea4156f079124be80200ab77673f22357e3f1e7891e667244ec8ffcc11a6310a5a575a36ab549468dc292fc7ad5bc868b5
-  data.tar.gz: bc9c7ea903b2cfaf05db1819391c0c5b2d2999498b3ee488263c240bc2971a67fe85b24911afd1432ef7aef81bc6b6f473cfc0ba34516839a93cc69b06571ad1
+  metadata.gz: e5a859815e6420692ab833b54372ae47c0fbf835b8384c8d18421eadb79125deb3a2c91ae740dfb9abe1817bf7e01e45cc14312e94d95aaadaade3e767a64dfe
+  data.tar.gz: a85113ab315551f8684accc9d21345b684d9762c73bfc44538bf6d8ac30a4d8e1f2aea24620fc0ebdee000f97de0ae18745b72a28a68cb6f44f6e3b9b184b209

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

@@ -0,0 +1,25 @@
+module Cats
+  module Core
+    class TransportOrder < ApplicationRecord
+      DRAFT = 'Draft'.freeze
+      APPROVED = 'Approved'.freeze
+      STATUSES = [DRAFT, APPROVED].freeze
+
+      belongs_to :transport_requisition
+      belongs_to :prepared_by, class_name: 'Cats::Core::User'
+      belongs_to :approved_by, class_name: 'Cats::Core::User', optional: true
+
+      validates :status, presence: true, inclusion: { in: STATUSES }
+      validates :order_date, presence: true
+      validate :validate_against_requisition
+
+      def validate_against_requisition
+        return unless transport_requisition
+
+        return if transport_requisition.approved?
+
+        errors.add(:transport_requisition, 'is not approved.')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Cats
+  module Core
+    class TransportOrderItem < ApplicationRecord
+      belongs_to :transport_order
+      belongs_to :transporter
+      belongs_to :transport_requisition_item
+      belongs_to :transport_contract, optional: true
+
+      validates :valid_for, presence: true
+      validates :valid_for, numericality: { greater_than: 0 }
+      validates :transport_requisition_item_id, uniqueness: true
+      validate :validate_requisition
+
+      def validate_requisition
+        return unless transport_requisition_item
+
+        return unless transport_order
+
+        return if transport_order.transport_requisition_id == transport_requisition_item.transport_requisition_id
+
+        errors.add(:transport_requisition_item, 'does not belong to the requisition of the order.')
+      end
+    end
+  end
+end

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

@@ -14,6 +14,7 @@ module Cats
 
       validates :reference_no, presence: true, uniqueness: true
       validates :status, presence: true, inclusion: { in: STATUSES }
+      validate :validate_status
 
       delegate(:full_name, to: :requested_by, prefix: 'requestor')
       delegate(:full_name, to: :approved_by, prefix: 'approver', allow_nil: true)
@@ -28,13 +29,28 @@ module Cats
       def approve
         raise(StandardError, 'Transport requisition is already approved.') if status == APPROVED
 
-        if transport_requisition_items.count.zero?
-          raise(StandardError, 'Transport requisition has no requisition items.')
+        begin
+          self.status = APPROVED
+          save!
+          self
+        rescue ActiveRecord::RecordInvalid => e
+          error = e.record.errors.full_messages_for(:status)[0]
+          raise(StandardError, error)
         end
+      end
+
+      def approved?
+        status == APPROVED
+      end
+
+      def validate_status
+        return unless status
+
+        return if status == DRAFT
+
+        return if transport_requisition_items.count.positive?
 
-        self.status = APPROVED
-        save!
-        self
+        errors.add(:status, 'cannot be set to "APPROVED" because the requisition has no items.') if status == APPROVED
       end
     end
   end

data/db/migrate/20220506082329_create_cats_core_transport_orders.rb

@@ -0,0 +1,22 @@
+class CreateCatsCoreTransportOrders < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_transport_orders do |t|
+      t.references :transport_requisition,
+                   null: false,
+                   index: { name: 'tr_on_to_indx' },
+                   foreign_key: { to_table: :cats_core_transport_requisitions }
+      t.references :prepared_by,
+                   null: false,
+                   index: { name: 'pb_on_to_indx' },
+                   foreign_key: { to_table: :cats_core_users }
+      t.references :approved_by,
+                   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
+    end
+  end
+end

data/db/migrate/20220506083042_create_cats_core_transport_order_items.rb

@@ -0,0 +1,32 @@
+class CreateCatsCoreTransportOrderItems < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_transport_order_items do |t|
+      t.references :transport_order,
+                   null: false,
+                   index: { name: 'to_on_toi_indx' },
+                   foreign_key: { to_table: :cats_core_transport_orders }
+      t.references :transporter,
+                   null: false,
+                   index: { name: 'transporter_on_toi_indx' },
+                   foreign_key: { to_table: :cats_core_transporters }
+      t.references :transport_contract,
+                   null: true,
+                   index: { name: 'tc_on_toi_indx' },
+                   foreign_key: { to_table: :cats_core_transport_contracts }
+      t.references :transport_requisition_item,
+                   null: false,
+                   index: { name: 'tri_on_toi_indx' },
+                   foreign_key: { to_table: :cats_core_transport_requisition_items }
+      t.integer :valid_for, null: false, default: 10
+
+      t.timestamps
+    end
+
+    add_index(
+      :cats_core_transport_order_items,
+      :transport_requisition_item_id,
+      unique: true,
+      name: 'tri_on_toi_uniq_indx'
+    )
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.9'.freeze
+    VERSION = '1.4.12'.freeze
   end
 end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :transport_order_item, class: 'Cats::Core::TransportOrderItem' do
+    transport_order
+    transporter
+    transport_contract
+    transport_requisition_item { transport_order.transport_requisition.transport_requisition_items.first }
+    valid_for { 10 }
+  end
+end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :transport_order, class: 'Cats::Core::TransportOrder' do
+    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.9
+  version: 1.4.12
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -307,6 +307,8 @@ files:
 - app/models/cats/core/transport_bid_item.rb
 - app/models/cats/core/transport_contract.rb
 - app/models/cats/core/transport_offer.rb
+- app/models/cats/core/transport_order.rb
+- app/models/cats/core/transport_order_item.rb
 - app/models/cats/core/transport_plan.rb
 - app/models/cats/core/transport_plan_item.rb
 - app/models/cats/core/transport_requisition.rb
@@ -410,6 +412,8 @@ files:
 - db/migrate/20220417105839_create_cats_core_transport_requisitions.rb
 - db/migrate/20220417123835_create_cats_core_transport_requisition_items.rb
 - db/migrate/20220417151821_create_cats_core_transport_requisition_details.rb
+- db/migrate/20220506082329_create_cats_core_transport_orders.rb
+- db/migrate/20220506083042_create_cats_core_transport_order_items.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -464,6 +468,8 @@ files:
 - spec/factories/cats/core/transport_bids.rb
 - spec/factories/cats/core/transport_contracts.rb
 - spec/factories/cats/core/transport_offers.rb
+- spec/factories/cats/core/transport_order_items.rb
+- spec/factories/cats/core/transport_orders.rb
 - spec/factories/cats/core/transport_plan_items.rb
 - spec/factories/cats/core/transport_plans.rb
 - spec/factories/cats/core/transport_requisition_details.rb