cats_core 1.4.4 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05ec37047a728927e68df2e0a0ae34dd16cca869cfe658314ea5fb0738ae894b
-  data.tar.gz: 272f1c6cb33e96a8407cab42c3b9bd8b01540156feee9bf4d6012b5b97600b52
+  metadata.gz: dd88ba053bde7688e286bd43301fbd8b7d8c09eb3d76a22c5da0f70c80f8f733
+  data.tar.gz: 3377e493badbe09bd8d152bb93aad0843b427e72fad83273eeb5177257fc7dd0
 SHA512:
-  metadata.gz: 19a5247f29b37ca8dc8a0176719b22b924069166168ddcf684a84ca0bcbd45ae170a164516ffada4cb2066b428ece538f89c8daa45bfb2db15bd432fb9676dab
-  data.tar.gz: b41ed1c8028112b527cd21b01821187260ba85ab2647fe7f477422a69f40a72420aed74d6741d3525f5812d110354b85bc12cf23b54163ce921286be1d185e10
+  metadata.gz: 011ad9d0b3d1906c2cd7a3f978d5a2116c37af34bb199f1c52618682cc49064abcf533543cb088026f10d06b658cfbb40b21eccfb4d045605f4d93a55b729f47
+  data.tar.gz: 605b33ec788fff1f0514e7093f4d03698de791f84bd49744856664f045349570bf767ed767e31eded4ef0206902f3e7d07f3686796d31e219baf4d0c21c2ecab

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

@@ -0,0 +1,29 @@
+module Cats
+  module Core
+    class TransportRequisition < ApplicationRecord
+      DRAFT = 'Draft'.freeze
+      APPROVED = 'Approved'.freeze
+      STATUSES = [DRAFT, APPROVED].freeze
+
+      belongs_to :dispatch_plan
+      belongs_to :requested_by, class_name: 'Cats::Core::User'
+      belongs_to :approved_by, class_name: 'Cats::Core::User', optional: true
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
+
+      has_many :transport_requisition_items
+
+      validates :reference_no, presence: true, uniqueness: true
+      validates :status, presence: true, inclusion: { in: STATUSES }
+
+      delegate(:full_name, to: :requested_by, prefix: 'requestor')
+      delegate(:full_name, to: :approved_by, prefix: 'approver', allow_nil: true)
+      delegate(:abbreviation, to: :unit, prefix: true)
+      delegate(:reference_no, to: :dispatch_plan, prefix: true)
+
+      def quantity
+        quantities = transport_requisition_items.map { |item| UnitConversion.convert(item.unit, unit, item.quantity) }
+        quantities.sum
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Cats
+  module Core
+    class TransportRequisitionDetail < ApplicationRecord
+      belongs_to :transport_requisition_item
+      belongs_to :fdp, class_name: 'Cats::Core::Location'
+
+      validates :quantity, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:name, to: :fdp, prefix: true)
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Cats
+  module Core
+    class TransportRequisitionItem < ApplicationRecord
+      belongs_to :transport_requisition
+      belongs_to :dispatch_plan_item
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
+
+      validates :quantity, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:reference_no, to: :transport_requisition, prefix: 'requisition')
+      delegate(:abbreviation, to: :unit, prefix: true)
+
+      def commodity_name
+        dispatch_plan_item.commodity.source.commodity_category.name
+      end
+
+      def woreda
+        dispatch_plan_item.destination.name
+      end
+    end
+  end
+end

data/app/serializers/cats/core/dispatch_plan_item_serializer.rb

@@ -3,7 +3,7 @@ module Cats
     class DispatchPlanItemSerializer < ActiveModel::Serializer
       attributes :id, :dispatch_plan_id, :plan_reference_no, :source_id, :source_name, :destination_id,
                  :destination_name, :quantity, :source_location_type, :destination_location_type, :commodity_status,
-                 :status
+                 :status, :commodity_id, :commodity_name, :commodity_batch_no
     end
   end
 end

data/db/migrate/20220417105839_create_cats_core_transport_requisitions.rb

@@ -0,0 +1,26 @@
+class CreateCatsCoreTransportRequisitions < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_transport_requisitions do |t|
+      t.references :dispatch_plan,
+                   null: false,
+                   index: { name: 'dp_on_tr_indx' },
+                   foreign_key: { to_table: :cats_core_dispatch_plans }
+      t.string :reference_no, null: false, unique: true
+      t.references :requested_by,
+                   null: false,
+                   index: { name: 'rb_on_tr_indx' },
+                   foreign_key: { to_table: :cats_core_users }
+      t.references :approved_by,
+                   null: true,
+                   index: { name: 'ab_on_tr_indx' },
+                   foreign_key: { to_table: :cats_core_users }
+      t.string :status, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_tr_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20220417123835_create_cats_core_transport_requisition_items.rb

@@ -0,0 +1,21 @@
+class CreateCatsCoreTransportRequisitionItems < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_transport_requisition_items do |t|
+      t.references :transport_requisition,
+                   null: false,
+                   index: { name: 'tr_on_tri_indx' },
+                   foreign_key: { to_table: :cats_core_transport_requisitions }
+      t.references :dispatch_plan_item,
+                   null: false,
+                   index: { name: 'dpi_on_tri_indx' },
+                   foreign_key: { to_table: :cats_core_dispatch_plan_items }
+      t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_tri_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20220417151821_create_cats_core_transport_requisition_details.rb

@@ -0,0 +1,17 @@
+class CreateCatsCoreTransportRequisitionDetails < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_transport_requisition_details do |t|
+      t.references :transport_requisition_item,
+                   null: false,
+                   index: { name: 'tri_on_trd_indx'},
+                   foreign_key: { to_table: :cats_core_transport_requisition_items }
+      t.float :quantity, null: false
+      t.references :fdp,
+                   null: false,
+                   index: { name: 'fdp_on_tri_indx'},
+                   foreign_key: { to_table: :cats_core_locations }
+
+      t.timestamps
+    end
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.4'.freeze
+    VERSION = '1.4.7'.freeze
   end
 end

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

@@ -6,23 +6,28 @@ FactoryBot.define do
     ancestry { nil }
   end
 
-  factory :hub, parent: :location, class: 'Cats::Core::Location' do
-    location_type { Cats::Core::Location::HUB }
+  factory :zone, parent: :location, class: 'Cats::Core::Location' do
+    location_type { Cats::Core::Location::ZONE }
     parent
   end
 
-  factory :warehouse, parent: :location, class: 'Cats::Core::Location' do
-    location_type { Cats::Core::Location::WAREHOUSE }
+  factory :woreda, parent: :location, class: 'Cats::Core::Location' do
+    location_type { Cats::Core::Location::WOREDA }
     parent
   end
 
-  factory :woreda, parent: :location, class: 'Cats::Core::Location' do
-    location_type { Cats::Core::Location::WOREDA }
+  factory :fdp, parent: :woreda, class: 'Cats::Core::Location' do
+    location_type { Cats::Core::Location::FDP }
     parent
   end
 
-  factory :zone, parent: :location, class: 'Cats::Core::Location' do
-    location_type { Cats::Core::Location::ZONE }
+  factory :hub, parent: :location, class: 'Cats::Core::Location' do
+    location_type { Cats::Core::Location::HUB }
+    parent
+  end
+
+  factory :warehouse, parent: :location, class: 'Cats::Core::Location' do
+    location_type { Cats::Core::Location::WAREHOUSE }
     parent
   end
 end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :transport_requisition_detail, class: 'Cats::Core::TransportRequisitionDetail' do
+    transport_requisition_item
+    quantity { 50 }
+    fdp factory: :fdp
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :transport_requisition_item, class: 'Cats::Core::TransportRequisitionItem' do
+    transport_requisition
+    dispatch_plan_item
+    quantity { 100 }
+    unit factory: :unit_of_measure
+  end
+end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :transport_requisition, class: 'Cats::Core::TransportRequisition' do
+    dispatch_plan
+    reference_no { FFaker::Name.name }
+    requested_by factory: :user
+    approved_by factory: :user
+    status { Cats::Core::TransportRequisition::DRAFT }
+    unit factory: :unit_of_measure
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.7
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-17 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -309,6 +309,9 @@ files:
 - app/models/cats/core/transport_offer.rb
 - app/models/cats/core/transport_plan.rb
 - app/models/cats/core/transport_plan_item.rb
+- app/models/cats/core/transport_requisition.rb
+- app/models/cats/core/transport_requisition_detail.rb
+- app/models/cats/core/transport_requisition_item.rb
 - app/models/cats/core/transporter.rb
 - app/models/cats/core/unit_conversion.rb
 - app/models/cats/core/unit_of_measure.rb
@@ -404,6 +407,9 @@ files:
 - db/migrate/20220107132433_create_cats_core_monthly_plan_item_details.rb
 - db/migrate/20220209083928_create_cats_core_hub_authorizations.rb
 - db/migrate/20220416143416_create_cats_core_unit_conversions.rb
+- 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
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -460,6 +466,9 @@ files:
 - spec/factories/cats/core/transport_offers.rb
 - spec/factories/cats/core/transport_plan_items.rb
 - spec/factories/cats/core/transport_plans.rb
+- spec/factories/cats/core/transport_requisition_details.rb
+- spec/factories/cats/core/transport_requisition_items.rb
+- spec/factories/cats/core/transport_requisitions.rb
 - spec/factories/cats/core/transporters.rb
 - spec/factories/cats/core/unit_conversions.rb
 - spec/factories/cats/core/unit_of_measures.rb