cats_core 1.4.3 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2624794cc9a3787caefb212037b9f33f8964e9d5512fcc40a7dbb31fa129009
-  data.tar.gz: 0f2d9b94ca4dc8794fe89928449b6c26cac67a78e2ffffadfa5be8d49baef52c
+  metadata.gz: 564c9a64ea8c7ddbcdd6afcd9b8270091f9f47484dc16e51c33eae196c584410
+  data.tar.gz: 29e5f1548a143c4bddfb74ac1984f63ce29b442ce86067efef3bfe150558f339
 SHA512:
-  metadata.gz: c0f3fc9431f4b011ca5015f9bf288627b51b547d79323e48d1f0221baae4781766b63ab521c23652feda8cd2fefb7f17a2242166ace64875cf4418138dc37c54
-  data.tar.gz: c9b0ec89851d48c0fcc9338dd749364d4a1a66e0a4291085c59f70b73605f5b47b4831cbfd03d01683f0b1ed829309247069f0878b6bc199cf2791936e416978
+  metadata.gz: 74a80138ca25fe94455f36b1b4bfaa5b8e5522fc0a6a6beea072358e82b233e1a19d2d08a981f551a628d0d65c18e8a180ff2777f4ef7764dbbb9b3f759b5cc0
+  data.tar.gz: d029c881f9b027f87bcdc73f5ff211e700b9e63bc9a71cc3fa5c8f610cab67f6d3787d4e9613b95778924318abd35b93d8cc98c8293faab2eb896402ebd580ba

data/app/controllers/cats/core/dispatch_plan_items_controller.rb

@@ -17,7 +17,7 @@ module Cats
 
       def model_params
         params.require(:payload).permit(:dispatch_plan_id, :source_id, :destination_id, :quantity, :commodity_status,
-                                        :status)
+                                        :status, :commodity_id)
       end
     end
   end

data/app/controllers/cats/core/dispatch_plans_controller.rb

@@ -33,7 +33,7 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:reference_no, :dispatchable_id, :dispatchable_type, :commodity_id)
+        params.require(:payload).permit(:reference_no, :dispatchable_id, :dispatchable_type)
       end
     end
   end

data/app/controllers/cats/core/dispatch_transactions_controller.rb

@@ -14,7 +14,7 @@ module Cats
       # user to give us a source.
       def create_allocation
         dispatch = Dispatch.find(model_params[:dispatch_id])
-        commodity = dispatch.dispatch_plan_item.dispatch_plan.commodity
+        commodity = dispatch.dispatch_plan_item.commodity
         transaction = DispatchTransaction.new(model_params)
 
         # Fetch supplier stack by commodity

data/app/controllers/cats/core/dispatches_controller.rb

@@ -49,7 +49,7 @@ module Cats
       end
 
       def commodity
-        data = @dispatch.dispatch_plan_item.dispatch_plan.commodity
+        data = @dispatch.dispatch_plan_item.commodity
         render json: { success: true, data: serialize(data) }
       end
 

data/app/controllers/cats/core/stacks_controller.rb

@@ -13,9 +13,9 @@ module Cats
         render json: { success: true, data: serialize(query.result) }
       end
 
-      def commodity_for_location
+      def items_for_location
         service = StackService.new
-        commodities = service.commodity_for_location(current_user)
+        commodities = service.items_for_location(current_user)
         render json: { success: true, data: serialize(commodities) }
       end
 

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

@@ -38,7 +38,7 @@ module Cats
       validates :arrival_status, presence: true, inclusion: { in: ARRIVAL_STATUSES }
       validates :status, presence: true, inclusion: { in: STATUSES }
 
-      delegate(:abbreviation, to: :unit_of_measure, prefix: true)
+      delegate(:abbreviation, to: :unit_of_measure, prefix: 'unit')
       delegate(:reference_no, to: :source, prefix: true)
 
       def name

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

@@ -8,7 +8,6 @@ module Cats
       belongs_to :dispatchable, polymorphic: true, optional: true
       belongs_to :prepared_by, class_name: 'Cats::Core::User'
       belongs_to :approved_by, class_name: 'Cats::Core::User', optional: true
-      belongs_to :commodity
 
       has_many :dispatch_plan_items
 
@@ -16,7 +15,6 @@ module Cats
       validates :status, inclusion: { in: STATUSES }
       validate :validate_dispatchable, on: :create
 
-      delegate(:batch_no, :name, :quantity, to: :commodity, prefix: true)
       delegate(:request_reference, to: :dispatchable, allow_nil: true)
       delegate(:request_quantity, to: :dispatchable, allow_nil: true)
 

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

@@ -10,6 +10,8 @@ module Cats
       belongs_to :source, class_name: 'Cats::Core::Location'
       belongs_to :destination, class_name: 'Cats::Core::Location'
       belongs_to :dispatch_plan
+      belongs_to :commodity
+
       has_many :dispatches
       has_many :hub_authorizations
 
@@ -18,7 +20,7 @@ module Cats
       validates :status, presence: true, inclusion: { in: STATUSES }
 
       delegate(:reference_no, to: :dispatch_plan, prefix: :plan, allow_nil: true)
-      delegate(:commodity_batch_no, :commodity_name, to: :dispatch_plan)
+      delegate(:batch_no, :name, to: :commodity, prefix: true)
       delegate(:name, to: :source, prefix: true)
       delegate(:name, to: :destination, prefix: true)
       delegate(:location_type, to: :source, prefix: true)

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

@@ -11,6 +11,7 @@ module Cats
       validates :transport_plan_item_id, uniqueness: true
 
       delegate(:reference_no, to: :transport_bid, prefix: true)
+      delegate(:abbreviation, to: :unit, prefix: true)
 
       def route
         transport_plan_item.route.name

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

@@ -0,0 +1,28 @@
+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)
+
+      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,14 @@
+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)
+    end
+  end
+end

data/app/notifications/cats/core/allocation_notification.rb

@@ -12,14 +12,14 @@ module Cats
 
       def message
         allocation_item = params[:allocation_item]
-        commodity = allocation_item.dispatch_plan.commodity.name
+        commodity = allocation_item.commodity.name
         source = allocation_item.source.name
         destination = allocation_item.destination.name
         title = "Allocation Notification - #{commodity}"
         date = Date.today
         body = <<~BODY
           Commodity with the following specification has been allocated to you:
-              Batch No. = #{allocation_item.dispatch_plan.commodity.batch_no}
+              Batch No. = #{allocation_item.commodity.batch_no}
               Commodity = #{commodity}
               Quantity = #{allocation_item.quantity}
           The commodity is expected to be delivered from #{source} to #{destination}

data/app/notifications/cats/core/dispatch_notification.rb

@@ -7,7 +7,7 @@ module Cats
 
       def message
         dispatch = params[:dispatch]
-        commodity = dispatch.dispatch_plan_item.dispatch_plan.commodity
+        commodity = dispatch.dispatch_plan_item.commodity
         title = "Dispatch Notification - #{commodity.name}"
         date = Date.today
         body = <<~BODY

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

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class CommoditySerializer < ActiveModel::Serializer
-      attributes :id, :name, :batch_no, :description, :unit_of_measure_id, :unit_of_measure_abbreviation, :source_id,
+      attributes :id, :name, :batch_no, :description, :unit_of_measure_id, :unit_abbreviation, :source_id,
                  :source_type, :source_reference_no, :quantity, :best_use_before, :volume_per_metric_ton,
                  :arrival_status, :status, :shipping_reference
     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/app/serializers/cats/core/dispatch_plan_serializer.rb

@@ -2,8 +2,7 @@ module Cats
   module Core
     class DispatchPlanSerializer < ActiveModel::Serializer
       attributes :id, :reference_no, :status, :dispatchable_id, :dispatchable_type, :request_reference,
-                 :request_quantity, :commodity_id, :commodity_name, :commodity_batch_no, :commodity_quantity,
-                 :upstream
+                 :request_quantity, :upstream
     end
   end
 end

data/app/services/cats/core/stack_service.rb

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class StackService
-      def commodity_for_location(user)
+      def items_for_location(user)
         details = user.details
 
         key_available = details.keys.any? { |key| %w[stores warehouse hub].include?(key) }
@@ -17,7 +17,7 @@ module Cats
 
         allocation_items =
           DispatchPlanItem
-          .joins(dispatch_plan: :commodity)
+          .joins(:dispatch_plan)
           .where(destination: hub, dispatch_plan: { status: DispatchPlan::APPROVED })
 
         allocation_items.map do |item|
@@ -26,10 +26,10 @@ module Cats
             source: item.source.name,
             destination: item.destination.name,
             quantity: item.quantity,
-            batch_no: item.dispatch_plan.commodity.batch_no,
-            commodity_id: item.dispatch_plan.commodity_id,
-            commodity_name: item.dispatch_plan.commodity.name,
-            unit: item.dispatch_plan.commodity.unit_of_measure.abbreviation
+            batch_no: item.commodity.batch_no,
+            commodity_id: item.commodity_id,
+            commodity_name: item.commodity.name,
+            unit: item.commodity.unit_abbreviation
           }
         end
       end
@@ -39,7 +39,7 @@ module Cats
         warehouses = location.children
         stores = Store.where(warehouse: warehouses)
 
-        commodity = receipt.dispatch.dispatch_plan_item.dispatch_plan.commodity
+        commodity = receipt.dispatch.dispatch_plan_item.commodity
         Stack.where(commodity: commodity, store: stores)
       end
 
@@ -48,7 +48,7 @@ module Cats
         warehouses = location.children
         stores = Store.where(warehouse: warehouses)
 
-        commodity = dispatch.dispatch_plan_item.dispatch_plan.commodity
+        commodity = dispatch.dispatch_plan_item.commodity
         Stack.where(commodity: commodity, store: stores)
       end
     end

data/config/routes.rb

@@ -137,7 +137,7 @@ Cats::Core::Engine.routes.draw do
 
   get '/stores/:id/stacks', controller: :stacks, action: :index, as: :stacks_store
   post '/stores/:id/stacks', controller: :stacks, action: :filter
-  get '/stacks/commodity_for_location', controller: :stacks, action: :commodity_for_location, as: :commodity_for_location
+  get '/stacks/items_for_location', controller: :stacks, action: :items_for_location, as: :items_for_location
   get '/receipts/:id/stacks', controller: :stacks, action: :receipt_stacks, as: :receipt_stacks
   get '/dispatches/:id/stacks', controller: :stacks, action: :dispatch_stacks, as: :dispatch_stacks
   resources :stacks, only: %i[show index create update]

data/db/migrate/20210718043328_create_cats_core_dispatch_plans.rb

@@ -6,11 +6,6 @@ class CreateCatsCoreDispatchPlans < ActiveRecord::Migration[6.1]
       t.string :status, null: false, default: 'Draft'
       t.references :dispatchable, polymorphic: true
       t.boolean :upstream, null: false, default: false
-      t.references :commodity,
-                   null: false,
-                   index: { name: 'commodity_on_dp_indx' },
-                   foreign_key: { to_table: :cats_core_commodities }
-
       t.references :prepared_by,
                    null: false,
                    index: { name: 'pb_on_dp_indx' },

data/db/migrate/20210718043401_create_cats_core_dispatch_plan_items.rb

@@ -13,6 +13,10 @@ class CreateCatsCoreDispatchPlanItems < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'dpi_on_destination_indx'},
                    foreign_key: { to_table: :cats_core_locations }
+      t.references :commodity,
+                  null: false,
+                  index: { name: 'commodity_on_dpi_indx' },
+                  foreign_key: { to_table: :cats_core_commodities }
       t.float :quantity, null: false
       t.string :commodity_status, null: false, default: 'Good'
       t.string :status, null: false, default: 'Unauthorized'

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.3'.freeze
+    VERSION = '1.4.6'.freeze
   end
 end

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

@@ -4,6 +4,7 @@ FactoryBot.define do
     destination factory: :location
     dispatch_plan
     quantity { 100 }
+    commodity
     commodity_status { Cats::Core::Commodity::GOOD }
     status { Cats::Core::DispatchPlanItem::UNAUTHORIZED }
   end

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

@@ -4,7 +4,6 @@ FactoryBot.define do
     status { Cats::Core::DispatchPlan::DRAFT }
     dispatchable { nil }
     upstream { false }
-    commodity
     prepared_by factory: :user
     approved_by { nil }
 

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.3
+  version: 1.4.6
 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