cats_core 1.5.29 → 1.5.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3871baf3450e7366757ebaa26bbf157b8bed3d9445f8cedd32a384be3c085a75
-  data.tar.gz: bade4250d1176e8ebc8bc99136dafcbab78761b8d2d8dab93d004f3eabbc49d4
+  metadata.gz: 03b358ca3dc8a8908dc00309ca843ab82e9703f9224c5d726cf1762034bf76ed
+  data.tar.gz: 3e0da8d5c95a1bd32c90f76d78bd17bd3b70e2c5466916945b96d6292c3ae3f7
 SHA512:
-  metadata.gz: 87458b788af5a370a0fdc04ef9214ae4b2abefdb5c4a94e472bbccc71281c9d464a00fa5f6046a722946aaf9a30cbacbe5fe370ac3a236e88ae6705fe7a3fc89
-  data.tar.gz: 3e618ea3300eb3b742668ccd3e694672545d9bef499a4bd46b4221505cc6fb396c0bee19dda5d0f65788fc50e70803cb167337f828013e55331b946fcea6b185
+  metadata.gz: fb22c2473633590d0c8f760b2a8dd178d19646e6ff9193b79f7536c0bbe9e3f2c16e3a860b9de66938d13279a1bcd0a3855b9593ff48ac5662ce10c9bc071c6c
+  data.tar.gz: 73fe0f22b150696c145d28eb4343145f033643ec7259f6865f6b725e2c052880e1905c28b78ea860858da58bb5d0753b96a16fa358e9a7cd2319b3376de27f4f

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

@@ -1,12 +1,17 @@
 module Cats
   module Core
     class TransportContract < ApplicationRecord
+      ACTIVE = "Active".freeze
+      CANCELLED = "Cancelled".freeze
+      CONTRACT_STATUSES = [ACTIVE, CANCELLED].freeze
+
       belongs_to :transporter
       belongs_to :transport_bid
       has_many :contract_items
 
       validates :contract_no, presence: true, uniqueness: true
       validates :contract_date, :expires_on, presence: true
+      validates :status, presence: true, inclusion: {in: CONTRACT_STATUSES}
 
       delegate(:name, to: :transporter, prefix: true)
       delegate(:reference_no, to: :transport_bid, prefix: :bid)

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

@@ -5,6 +5,10 @@ module Cats
       APPROVED = "Approved".freeze
       STATUSES = [DRAFT, APPROVED].freeze
 
+      ACTIVE = "Active".freeze
+      CANCELLED = "Cancelled".freeze
+      ORDER_STATUSES = [ACTIVE, CANCELLED].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
@@ -12,7 +16,8 @@ module Cats
       has_many :transport_order_items
 
       validates :status, presence: true, inclusion: {in: STATUSES}
-      validates :order_date, presence: true
+      validates :order_status, presence: true, inclusion: {in: ORDER_STATUSES}
+      validates :order_date, :order_no, presence: true
       validate :validate_against_requisition, :validate_status
 
       delegate(:full_name, to: :prepared_by, prefix: true)

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

@@ -1,18 +1,27 @@
 module Cats
   module Core
     class TransportOrderItem < ApplicationRecord
+      ACTIVE = "Active".freeze
+      CANCELLED = "Cancelled".freeze
+
+      ORDER_ITEM_STATUSES = [ACTIVE, CANCELLED].freeze
       belongs_to :transport_order
       belongs_to :transporter
       belongs_to :transport_requisition_item
       belongs_to :transport_contract, optional: true
+      belongs_to :unit, class_name: "Cats::Core::UnitOfMeasure"
+      belongs_to :route
 
-      validates :valid_for, presence: true
+      validates :valid_for, :quantity, presence: true
       validates :valid_for, numericality: {greater_than: 0}
+      validates :status, presence: true, inclusion: {in: ORDER_ITEM_STATUSES}
       validates :transport_requisition_item_id, uniqueness: true
       validate :validate_requisition
 
       delegate(:name, to: :transporter, prefix: true)
-      delegate(:contract_no, to: :transport_contract, prefix: false)
+      delegate(:name, to: :route, prefix: true)
+      delegate(:abbreviation, to: :unit, prefix: true)
+      delegate(:contract_no, to: :transport_contract, prefix: false, allow_nil: true)
 
       def validate_requisition
         return unless transport_requisition_item

data/db/migrate/20240125051557_add_status_unit_and_quantity_to_transport_order_item.rb

@@ -0,0 +1,18 @@
+class AddStatusUnitAndQuantityToTransportOrderItem < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cats_core_transport_order_items, :unit_id, :integer
+    add_foreign_key :cats_core_transport_order_items,
+                    :cats_core_unit_of_measures,
+                    column: :unit_id, null: false,
+                    index: {name: "unit_on_toi_indx"}
+    add_column :cats_core_transport_order_items, :route_id, :integer
+    add_foreign_key :cats_core_transport_order_items,
+                    :cats_core_routes,
+                    column: :route_id, null: false,
+                    index: {name: "route_on_toi_indx"}
+    add_column :cats_core_transport_order_items, :quantity, :float, null: false
+    add_column :cats_core_transport_order_items, :status, :string, null: false
+    remove_index :cats_core_transport_order_items, :transport_requisition_item_id,
+                 name: "tri_on_toi_uniq_indx"
+  end
+end

data/db/migrate/20240125051632_add_status_to_transport_order.rb

@@ -0,0 +1,6 @@
+class AddStatusToTransportOrder < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cats_core_transport_orders, :order_status, :string, null: false, default: "Active"
+    add_column :cats_core_transport_orders, :order_no, :string, null: false
+  end
+end

data/db/migrate/20240125051644_add_status_to_contract.rb

@@ -0,0 +1,5 @@
+class AddStatusToContract < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cats_core_transport_contracts, :status, :string, null: false, default: "Active"
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = "1.5.29".freeze
+    VERSION = "1.5.30".freeze
   end
 end

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

@@ -6,5 +6,6 @@ FactoryBot.define do
     contract_date { Date.today }
     expires_on { Date.today + 6.month }
     payment_term { FFaker::Name.name }
+    status { Cats::Core::TransportContract::ACTIVE }
   end
 end

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

@@ -5,5 +5,9 @@ FactoryBot.define do
     transport_contract
     transport_requisition_item { transport_order.transport_requisition.transport_requisition_items.first }
     valid_for { 10 }
+    quantity { 12 }
+    status { Cats::Core::TransportOrderItem::ACTIVE }
+    unit factory: :unit_of_measure
+    route
   end
 end

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

@@ -5,5 +5,7 @@ FactoryBot.define do
     approved_by factory: :user
     order_date { Date.today }
     status { Cats::Core::TransportOrder::DRAFT }
+    order_status { Cats::Core::TransportOrder::ACTIVE }
+    order_no { "2/2024/TNA/REQ-001" }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.5.29
+  version: 1.5.30
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-03 00:00:00.000000000 Z
+date: 2024-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -532,6 +532,9 @@ files:
 - db/migrate/20230102064317_add_receipt_number_to_cats_core_receipt_transactions.rb
 - db/migrate/20231129071520_create_cats_core_inventory_adjustments.rb
 - db/migrate/20231227114358_add_beneficiaries_to_cats_core_dispatch_plan_items.rb
+- db/migrate/20240125051557_add_status_unit_and_quantity_to_transport_order_item.rb
+- db/migrate/20240125051632_add_status_to_transport_order.rb
+- db/migrate/20240125051644_add_status_to_contract.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb