cats_core 1.2.16 → 1.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ed27840275615cce0b4a2fdee9d147a61407eef87df375e9db5e0424d4e923
-  data.tar.gz: 06a77ee55dec5a1d292afeaa225b35629867d85eac43640d5073aab84b657634
+  metadata.gz: 17f638d1558c70663410c90630da5764199dba7c9475162e40ba51ff4eb4e6ab
+  data.tar.gz: ecdb4518988dd53281e19c942edb3295bc410e1f10bf6ac765b07e5c05b85c99
 SHA512:
-  metadata.gz: f57ac8ebc0d69cb0abc5e0b19a28ae3afd4b3549a72b2fe34469bf63e15bc05067fa101bc378b97f073b5650b66d21516d9ea7998d165e8e5b133d971e08dbfe
-  data.tar.gz: 41f293dd59320cafef958b1d1dcf6b2342e2af1d696e31fb761ff50cf749966e5a993062d23f3e859c32bbb0431cba93c333b7410977be67a33c1bb8575e829a
+  metadata.gz: d618acb0e39c3ee0932b25a8e5b2f41dded24cad7867b35a86d1062f70f3d4de857865c1e38f8da3c903b3c26e9d3b19264a717cdc29eecdbf3e34acda967566
+  data.tar.gz: 3730419db5c67164ad6a7809e10bbce30a1b4f9a83f8639371f5e5f6758f628d346291a1072e613e43d3ace9838aed73a96eec441ded96ad5b29a7216b9f8544

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

@@ -0,0 +1,13 @@
+module Cats
+  module Core
+    class RoutesController < ApplicationController
+      include Common
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:source_id, :destination_id)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Cats
+  module Core
+    class ContractItem < ApplicationRecord
+      belongs_to :transport_contract
+      belongs_to :route
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
+
+      validates :price, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:name, to: :route, prefix: true)
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Cats
       DONATION_TYPES = [CASH, KIND].freeze
 
       belongs_to :donor
-      belongs_to :hrp
+      belongs_to :plan
       belongs_to :currency, optional: true
       belongs_to :commodity_category, optional: true
       belongs_to :unit_of_measure, optional: true
@@ -19,7 +19,7 @@ module Cats
       validates :unit_of_measure, presence: true, if: -> { donation_type == KIND }
 
       delegate(:name, to: :donor, prefix: true)
-      delegate(:reference_no, to: :hrp, prefix: true)
+      delegate(:reference_no, to: :plan, prefix: true)
       delegate(:name, to: :commodity_category, prefix: true, allow_nil: true)
       delegate(:code, to: :currency, prefix: true, allow_nil: true)
       delegate(:abbreviation, to: :unit_of_measure, prefix: true, allow_nil: true)

data/app/models/cats/core/{hrp.rb → plan.rb}

@@ -1,6 +1,6 @@
 module Cats
   module Core
-    class Hrp < ApplicationRecord
+    class Plan < ApplicationRecord
       DRAFT = 'Draft'.freeze
       APPROVED = 'Approved'.freeze
       NEEDS_APPROVED = 'Needs Approved'.freeze
@@ -13,7 +13,7 @@ module Cats
 
       belongs_to :program
       belongs_to :ration, optional: true
-      has_many :hrp_items
+      has_many :plan_items
 
       validates :reference_no, :year, :status, presence: true
       validates :season, presence: true, inclusion: { in: SEASONS }

data/app/models/cats/core/{hrp_item.rb → plan_item.rb}

@@ -1,14 +1,14 @@
 module Cats
   module Core
-    class HrpItem < ApplicationRecord
-      belongs_to :hrp
+    class PlanItem < ApplicationRecord
+      belongs_to :plan
       belongs_to :woreda, -> { where(location_type: Cats::Core::Location::WOREDA) }, class_name: 'Cats::Core::Location'
       belongs_to :operator
 
-      has_many :hrp_item_details
+      has_many :plan_item_details
 
       validates :beneficiaries, presence: true, numericality: { greater_than: 0 }
-      validates :hrp_id, uniqueness: { scope: :woreda_id }
+      validates :plan_id, uniqueness: { scope: :woreda_id }
 
       delegate(:name, to: :woreda, prefix: true)
       delegate(:name, to: :operator, prefix: true)

data/app/models/cats/core/{hrp_item_detail.rb → plan_item_detail.rb}

@@ -1,11 +1,11 @@
 module Cats
   module Core
-    class HrpItemDetail < ApplicationRecord
-      belongs_to :hrp_item
+    class PlanItemDetail < ApplicationRecord
+      belongs_to :plan_item
       belongs_to :ration_item
 
       validates :amount, presence: true, numericality: { greater_than: 0 }
-      validates :hrp_item_id, uniqueness: { scope: :ration_item_id }
+      validates :plan_item_id, uniqueness: { scope: :ration_item_id }
     end
   end
 end

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

@@ -0,0 +1,18 @@
+module Cats
+  module Core
+    class Route < ApplicationRecord
+      before_validation :set_name, on: %i[create update]
+
+      belongs_to :source, class_name: 'Cats::Core::Location'
+      belongs_to :destination, class_name: 'Cats::Core::Location'
+
+      validates :source_id, uniqueness: { scope: :destination_id }
+
+      def set_name
+        return unless source && destination
+
+        self.name = "#{source.name} - #{destination.name}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+module Cats
+  module Core
+    class TransportBid < ApplicationRecord
+      NEW = 'New'.freeze
+      OPEN = 'Open'.freeze
+      CLOSED = 'Closed'.freeze
+      STATUSES = [NEW, OPEN, CLOSED].freeze
+
+      has_many :transport_bid_items
+
+      validates :reference_no, presence: true, uniqueness: true
+      validates :start_date, :end_date, :status, presence: true
+      validates :status, inclusion: { in: STATUSES }
+      validate :validate_start_date_against_end_date
+
+      def validate_start_date_against_end_date
+        return unless start_date && end_date
+
+        errors.add(:start_date, 'should be before end date.') if start_date >= end_date
+      end
+
+      def open
+        raise(StandardError, 'Bid is already open.') if status == OPEN
+
+        raise(StandardError, 'Bid is empty.') if transport_bid_items.count.zero?
+
+        self.status = OPEN
+        save!
+        self
+      end
+
+      def close
+        raise(StandardError, 'Bid is already closed.') if status == CLOSED
+
+        raise(StandardError, 'Bid should first be open.') if status == NEW
+
+        self.status = CLOSED
+        save!
+        self
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Cats
+  module Core
+    class TransportBidItem < ApplicationRecord
+      belongs_to :transport_bid
+      belongs_to :route
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure', optional: true
+
+      has_many :transport_offers
+
+      validates :quantity, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:name, to: :route, prefix: true)
+      delegate(:name, to: :unit, prefix: true, allow_nil: true)
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module Cats
+  module Core
+    class TransportContract < ApplicationRecord
+      belongs_to :region, class_name: 'Cats::Core::Location'
+      belongs_to :transporter
+
+      validates :contract_date, :expires_on, presence: true
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class TransportOffer < ApplicationRecord
-      belongs_to :transport_request_item
+      belongs_to :transport_bid_item
       belongs_to :transporter
 
       validates :price, presence: true, numericality: { greater_than: 0 }

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

@@ -0,0 +1,7 @@
+module Cats
+  module Core
+    class RouteSerializer < ActiveModel::Serializer
+      attributes :id, :name, :source_id, :destination_id
+    end
+  end
+end

data/config/routes.rb

@@ -66,6 +66,7 @@ Cats::Core::Engine.routes.draw do
   end
   resources :currencies, except: %i[destroy]
   resources :unit_of_measures, except: %i[destroy]
+  resources :routes, except: %i[destroy]
 
   post '/dispatch_plans/filter', controller: :dispatch_plans, action: :filter
   resources :dispatch_plans do

data/db/migrate/{20210717031810_create_cats_core_hrps.rb → 20210717031810_create_cats_core_plans.rb}

@@ -1,6 +1,6 @@
-class CreateCatsCoreHrps < ActiveRecord::Migration[6.1]
+class CreateCatsCorePlans < ActiveRecord::Migration[6.1]
   def change
-    create_table :cats_core_hrps do |t|
+    create_table :cats_core_plans do |t|
       t.string :reference_no, unique: true
       t.integer :year, null: false
       t.string :season, null: false
@@ -8,11 +8,11 @@ class CreateCatsCoreHrps < ActiveRecord::Migration[6.1]
 
       t.references :program,
                    null: false,
-                   index: { name: 'program_on_hrp_indx' },
+                   index: { name: 'program_on_plan_indx' },
                    foreign_key: { to_table: :cats_core_programs }
       t.references :ration,
                    null: true,
-                   index: { name: 'ration_on_hrp_indx' },
+                   index: { name: 'ration_on_plan_indx' },
                    foreign_key: { to_table: :cats_core_rations }
 
       t.timestamps

data/db/migrate/20210717032024_create_cats_core_plan_items.rb

@@ -0,0 +1,23 @@
+class CreateCatsCorePlanItems < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_plan_items do |t|
+      t.references :plan,
+                   null: false,
+                   index: { name: 'plan_on_plan_items_indx' },
+                   foreign_key: { to_table: :cats_core_plans }
+      t.references :woreda,
+                   null: false,
+                   index: { name: 'woreda_on_plan_items_idnx' },
+                   foreign_key: { to_table: :cats_core_locations }
+      t.integer :beneficiaries, null: false
+      t.references :operator,
+                   null: false,
+                   index: { name: 'operator_on_plan_items_indx' },
+                   foreign_key: { to_table: :cats_core_operators }
+
+      t.timestamps
+    end
+
+    add_index :cats_core_plan_items, [:plan_id, :woreda_id], unique: true
+  end
+end

data/db/migrate/20210717032240_create_cats_core_plan_item_details.rb

@@ -0,0 +1,18 @@
+class CreateCatsCorePlanItemDetails < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_plan_item_details do |t|
+      t.references :plan_item,
+                   null: false,
+                   index: { name: 'pi_on_pid_indx' },
+                   foreign_key: { to_table: :cats_core_plan_items }
+      t.references :ration_item,
+                   null: false,
+                   index: { name: 'ri_on_pid_indx' },
+                   foreign_key: { to_table: :cats_core_ration_items }
+      t.float :amount, null: false
+
+      t.timestamps
+    end
+    add_index(:cats_core_plan_item_details, [:plan_item_id, :ration_item_id], unique: true, name: 'pii_rii_on_pid_indx')
+  end
+end

data/db/migrate/20210717032330_create_cats_core_donations.rb

@@ -8,10 +8,10 @@ class CreateCatsCoreDonations < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'donor_on_donation_indx' },
                    foreign_key: { to_table: :cats_core_donors }
-      t.references :hrp,
+      t.references :plan,
                    null: false,
-                   index: { name: 'hrp_on_donation_indx' },
-                   foreign_key: { to_table: :cats_core_hrps }
+                   index: { name: 'plan_on_donation_indx' },
+                   foreign_key: { to_table: :cats_core_plans }
       t.float :amount, null: false
       t.references :currency,
                    null: true,

data/db/migrate/20210718040129_create_cats_core_routes.rb

@@ -0,0 +1,19 @@
+class CreateCatsCoreRoutes < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_routes do |t|
+      t.string :name, null: false
+      t.references :source,
+                   null: false,
+                   index: { name: 'source_on_routes_indx' },
+                   foreign_key: { to_table: :cats_core_locations }
+      t.references :destination,
+                   null: false,
+                   index: { name: 'destination_on_routes_indx' },
+                   foreign_key: { to_table: :cats_core_locations }
+
+      t.timestamps
+
+      t.index [:source_id, :destination_id], unique: true
+    end
+  end
+end

data/db/migrate/20211215121151_create_cats_core_transport_bids.rb

@@ -0,0 +1,13 @@
+class CreateCatsCoreTransportBids < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_transport_bids do |t|
+      t.string :reference_no, unique: true
+      t.string :description
+      t.date :start_date, null: false
+      t.date :end_date, null: false
+      t.string :status, null: false, default: 'New'
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20211215124452_create_cats_core_transport_bid_items.rb

@@ -0,0 +1,21 @@
+class CreateCatsCoreTransportBidItems < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_transport_bid_items do |t|
+      t.references :transport_bid,
+                   null: false,
+                   index: { name: 'tb_on_tbi_indx' },
+                   foreign_key: { to_table: :cats_core_transport_bids }
+      t.references :route,
+                   null: false,
+                   index: { name: 'route_on_tbi_indx' },
+                   foreign_key: { to_table: :cats_core_routes }
+      t.references :unit,
+                   null: true,
+                   index: { name: 'unit_on_tbi_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.float :quantity, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/{20211209160126_create_cats_core_transport_offers.rb → 20211229160126_create_cats_core_transport_offers.rb}

@@ -1,10 +1,10 @@
 class CreateCatsCoreTransportOffers < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_transport_offers do |t|
-      t.references :transport_request_item,
+      t.references :transport_bid_item,
                    null: false,
-                   index: { name: 'to_on_tri_indx' },
-                   foreign_key: { to_table: :cats_core_transport_request_items }
+                   index: { name: 'to_on_tbi_indx' },
+                   foreign_key: { to_table: :cats_core_transport_bid_items }
       t.references :transporter,
                    null: false,
                    index: { name: 'to_on_transporter_indx' },

data/db/migrate/20211229160127_create_cats_core_transport_contracts.rb

@@ -0,0 +1,19 @@
+class CreateCatsCoreTransportContracts < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_transport_contracts do |t|
+      t.references :region,
+                   null: false,
+                   index: { name: 'region_on_tc_indx' },
+                   foreign_key: { to_table: :cats_core_locations }
+      t.references :transporter,
+                   null: false,
+                   index: { name: 'transporter_on_tc_indx' },
+                   foreign_key: { to_table: :cats_core_transporters }
+      t.date :contract_date, null: false
+      t.date :expires_on, null: false
+      t.string :payment_term
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20211229160128_create_cats_core_contract_items.rb

@@ -0,0 +1,21 @@
+class CreateCatsCoreContractItems < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_contract_items do |t|
+      t.references :transport_contract,
+                   null: false,
+                   index: { name: 'tc_on_ci_indx' },
+                   foreign_key: { to_table: :cats_core_transport_contracts }
+      t.references :route,
+                   null: false,
+                   index: { name: 'route_on_ci_indx' },
+                   foreign_key: { to_table: :cats_core_routes }
+      t.float :price, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_ci_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+
+      t.timestamps
+    end
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.2.16'.freeze
+    VERSION = '1.2.20'.freeze
   end
 end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :contract_item, class: 'Cats::Core::ContractItem' do
+    transport_contract
+    route
+    price { 150 }
+    unit factory: :unit_of_measure
+  end
+end

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

@@ -4,7 +4,7 @@ FactoryBot.define do
     donation_type { Cats::Core::Donation::KIND }
     donated_on { Date.today }
     donor
-    hrp
+    plan
     amount { 100 }
     currency { nil }
     commodity_category

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :plan_item_detail, class: 'Cats::Core::PlanItemDetail' do
+    plan_item
+    ration_item
+    amount { 150 }
+  end
+end

data/spec/factories/cats/core/{hrp_items.rb → plan_items.rb}

@@ -1,6 +1,6 @@
 FactoryBot.define do
-  factory :hrp_item, class: 'Cats::Core::HrpItem' do
-    hrp
+  factory :plan_item, class: 'Cats::Core::PlanItem' do
+    plan
     woreda
     beneficiaries { 100 }
     operator

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :plan, class: 'Cats::Core::Plan' do
+    reference_no { FFaker::Name.name }
+    year { 1 }
+    season { Cats::Core::Plan::BELG }
+    status { Cats::Core::Plan::DRAFT }
+    program
+    ration
+  end
+end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :route, class: 'Cats::Core::Route' do
+    source factory: :location
+    destination factory: :location
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :transport_bid_item, class: 'Cats::Core::TransportBidItem' do
+    transport_bid
+    route
+    unit factory: :unit_of_measure
+    quantity { 100 }
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :transport_bid, class: 'Cats::Core::TransportBid' do
+    reference_no { FFaker::Name.name }
+    description { FFaker::Name.name }
+    start_date { Date.today - 1.week }
+    end_date { Date.today }
+  end
+end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :transport_contract, class: 'Cats::Core::TransportContract' do
+    region factory: :location
+    transporter
+    contract_date { Date.today }
+    expires_on { Date.today + 6.month }
+    payment_term { FFaker::Name.name }
+  end
+end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :transport_offer, class: 'Cats::Core::TransportOffer' do
-    transport_request_item
+    transport_bid_item
     transporter
     price { 100 }
     winner { false }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.2.16
+  version: 1.2.20
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2021-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -244,6 +244,7 @@ files:
 - app/controllers/cats/core/receipt_transactions_controller.rb
 - app/controllers/cats/core/receipts_controller.rb
 - app/controllers/cats/core/roles_controller.rb
+- app/controllers/cats/core/routes_controller.rb
 - app/controllers/cats/core/spaces_controller.rb
 - app/controllers/cats/core/unit_of_measures_controller.rb
 - app/controllers/cats/core/users_controller.rb
@@ -255,6 +256,7 @@ files:
 - app/models/cats/core/application_record.rb
 - app/models/cats/core/commodity.rb
 - app/models/cats/core/commodity_category.rb
+- app/models/cats/core/contract_item.rb
 - app/models/cats/core/currency.rb
 - app/models/cats/core/dispatch.rb
 - app/models/cats/core/dispatch_plan.rb
@@ -263,15 +265,15 @@ files:
 - app/models/cats/core/donation.rb
 - app/models/cats/core/donor.rb
 - app/models/cats/core/gift_certificate.rb
-- app/models/cats/core/hrp.rb
-- app/models/cats/core/hrp_item.rb
-- app/models/cats/core/hrp_item_detail.rb
 - app/models/cats/core/location.rb
 - app/models/cats/core/menu.rb
 - app/models/cats/core/menu_item.rb
 - app/models/cats/core/notification.rb
 - app/models/cats/core/notification_rule.rb
 - app/models/cats/core/operator.rb
+- app/models/cats/core/plan.rb
+- app/models/cats/core/plan_item.rb
+- app/models/cats/core/plan_item_detail.rb
 - app/models/cats/core/program.rb
 - app/models/cats/core/purchase_order.rb
 - app/models/cats/core/ration.rb
@@ -281,12 +283,16 @@ files:
 - app/models/cats/core/rhn_request.rb
 - app/models/cats/core/role.rb
 - app/models/cats/core/role_menu.rb
+- app/models/cats/core/route.rb
 - app/models/cats/core/stack.rb
 - app/models/cats/core/stack_transaction.rb
 - app/models/cats/core/stacking_rule.rb
 - app/models/cats/core/store.rb
 - app/models/cats/core/supplier.rb
 - app/models/cats/core/transaction.rb
+- app/models/cats/core/transport_bid.rb
+- 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_request.rb
 - app/models/cats/core/transport_request_item.rb
@@ -308,6 +314,7 @@ files:
 - app/serializers/cats/core/receipt_transaction_serializer.rb
 - app/serializers/cats/core/role_menu_serializer.rb
 - app/serializers/cats/core/role_serializer.rb
+- app/serializers/cats/core/route_serializer.rb
 - app/serializers/cats/core/unit_of_measure_serializer.rb
 - app/serializers/cats/core/user_serializer.rb
 - app/services/cats/core/dispatch_plan_service.rb
@@ -334,15 +341,16 @@ files:
 - db/migrate/20210717031108_create_cats_core_donors.rb
 - db/migrate/20210717031216_create_cats_core_rations.rb
 - db/migrate/20210717031343_create_cats_core_ration_items.rb
-- db/migrate/20210717031810_create_cats_core_hrps.rb
-- db/migrate/20210717032024_create_cats_core_hrp_items.rb
-- db/migrate/20210717032240_create_cats_core_hrp_item_details.rb
+- db/migrate/20210717031810_create_cats_core_plans.rb
+- db/migrate/20210717032024_create_cats_core_plan_items.rb
+- db/migrate/20210717032240_create_cats_core_plan_item_details.rb
 - db/migrate/20210717032330_create_cats_core_donations.rb
 - db/migrate/20210717032602_create_cats_core_gift_certificates.rb
 - db/migrate/20210717032855_create_cats_core_purchase_orders.rb
 - db/migrate/20210717033223_create_cats_core_commodities.rb
 - db/migrate/20210717140855_create_cats_core_stores.rb
 - db/migrate/20210717171101_create_cats_core_stacks.rb
+- db/migrate/20210718040129_create_cats_core_routes.rb
 - db/migrate/20210718042749_create_cats_core_transporters.rb
 - db/migrate/20210718042755_create_cats_core_rhn_requests.rb
 - db/migrate/20210718042823_create_cats_core_allocations.rb
@@ -359,9 +367,11 @@ files:
 - db/migrate/20211002050739_create_cats_core_notification_rules.rb
 - db/migrate/20211024063240_add_status_to_cats_core_rhn_requests.rb
 - db/migrate/20211030133752_add_status_to_cats_core_commodities.rb
-- db/migrate/20211209155113_create_cats_core_transport_requests.rb
-- db/migrate/20211209155915_create_cats_core_transport_request_items.rb
-- db/migrate/20211209160126_create_cats_core_transport_offers.rb
+- db/migrate/20211215121151_create_cats_core_transport_bids.rb
+- db/migrate/20211215124452_create_cats_core_transport_bid_items.rb
+- db/migrate/20211229160126_create_cats_core_transport_offers.rb
+- db/migrate/20211229160127_create_cats_core_transport_contracts.rb
+- db/migrate/20211229160128_create_cats_core_contract_items.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -372,6 +382,7 @@ files:
 - spec/factories/cats/core/application_modules.rb
 - spec/factories/cats/core/commodities.rb
 - spec/factories/cats/core/commodity_categories.rb
+- spec/factories/cats/core/contract_items.rb
 - spec/factories/cats/core/currencies.rb
 - spec/factories/cats/core/dispatch_plan_items.rb
 - spec/factories/cats/core/dispatch_plans.rb
@@ -380,15 +391,15 @@ files:
 - spec/factories/cats/core/donations.rb
 - spec/factories/cats/core/donors.rb
 - spec/factories/cats/core/gift_certificates.rb
-- spec/factories/cats/core/hrp_item_details.rb
-- spec/factories/cats/core/hrp_items.rb
-- spec/factories/cats/core/hrps.rb
 - spec/factories/cats/core/locations.rb
 - spec/factories/cats/core/menu_items.rb
 - spec/factories/cats/core/menus.rb
 - spec/factories/cats/core/notification_rules.rb
 - spec/factories/cats/core/notifications.rb
 - spec/factories/cats/core/operators.rb
+- spec/factories/cats/core/plan_item_details.rb
+- spec/factories/cats/core/plan_items.rb
+- spec/factories/cats/core/plans.rb
 - spec/factories/cats/core/programs.rb
 - spec/factories/cats/core/purchase_orders.rb
 - spec/factories/cats/core/ration_items.rb
@@ -398,14 +409,16 @@ files:
 - spec/factories/cats/core/rhn_requests.rb
 - spec/factories/cats/core/role_menus.rb
 - spec/factories/cats/core/roles.rb
+- spec/factories/cats/core/routes.rb
 - spec/factories/cats/core/stack_transactions.rb
 - spec/factories/cats/core/stacking_rules.rb
 - spec/factories/cats/core/stacks.rb
 - spec/factories/cats/core/stores.rb
 - spec/factories/cats/core/suppliers.rb
+- spec/factories/cats/core/transport_bid_items.rb
+- 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_request_items.rb
-- spec/factories/cats/core/transport_requests.rb
 - spec/factories/cats/core/transporters.rb
 - spec/factories/cats/core/unit_of_measures.rb
 - spec/factories/cats/core/users.rb

data/db/migrate/20210717032024_create_cats_core_hrp_items.rb

@@ -1,23 +0,0 @@
-class CreateCatsCoreHrpItems < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_hrp_items do |t|
-      t.references :hrp,
-                   null: false,
-                   index: { name: 'hrp_on_hrp_items_indx' },
-                   foreign_key: { to_table: :cats_core_hrps }
-      t.references :woreda,
-                   null: false,
-                   index: { name: 'woreda_on_hrp_items_idnx' },
-                   foreign_key: { to_table: :cats_core_locations }
-      t.integer :beneficiaries, null: false
-      t.references :operator,
-                   null: false,
-                   index: { name: 'operator_on_hrp_items_indx' },
-                   foreign_key: { to_table: :cats_core_operators }
-
-      t.timestamps
-    end
-
-    add_index :cats_core_hrp_items, [:hrp_id, :woreda_id], unique: true
-  end
-end

data/db/migrate/20210717032240_create_cats_core_hrp_item_details.rb

@@ -1,18 +0,0 @@
-class CreateCatsCoreHrpItemDetails < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_hrp_item_details do |t|
-      t.references :hrp_item,
-                   null: false,
-                   index: { name: 'hi_on_hid_indx' },
-                   foreign_key: { to_table: :cats_core_hrp_items }
-      t.references :ration_item,
-                   null: false,
-                   index: { name: 'ri_on_hid_indx' },
-                   foreign_key: { to_table: :cats_core_ration_items }
-      t.float :amount, null: false
-
-      t.timestamps
-    end
-    add_index(:cats_core_hrp_item_details, [:hrp_item_id, :ration_item_id], unique: true, name: 'hii_rii_on_hid_indx')
-  end
-end

data/db/migrate/20211209155113_create_cats_core_transport_requests.rb

@@ -1,19 +0,0 @@
-class CreateCatsCoreTransportRequests < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_transport_requests do |t|
-      t.string :reference_no, unique: true
-      t.date :request_date, null: false
-      t.string :status, null: false, default: 'Draft'
-      t.references :requested_by,
-                   null: false,
-                   index: { name: 'tsr_on_rb_indx' },
-                   foreign_key: { to_table: :cats_core_users }
-      t.references :approved_by,
-                   null: true,
-                   index: { name: 'tsr_on_ab_indx' },
-                   foreign_key: { to_table: :cats_core_users }
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20211209155915_create_cats_core_transport_request_items.rb

@@ -1,24 +0,0 @@
-class CreateCatsCoreTransportRequestItems < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_transport_request_items do |t|
-      t.references :transport_request,
-                   null: false,
-                   index: { name: 'tri_on_tr_indx' },
-                   foreign_key: { to_table: :cats_core_transport_requests }
-      t.references :source,
-                   null: false,
-                   index: { name: 'tri_on_source_indx' },
-                   foreign_key: { to_table: :cats_core_locations }
-      t.references :destination,
-                   null: false,
-                   index: { name: 'tri_on_destination_indx'},
-                   foreign_key: { to_table: :cats_core_locations }
-      t.references :commodity,
-                   null: false,
-                   index: { name: 'tri_on_commodity_indx' },
-                   foreign_key: { to_table: :cats_core_commodities }
-
-      t.timestamps
-    end
-  end
-end

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

@@ -1,7 +0,0 @@
-FactoryBot.define do
-  factory :hrp_item_detail, class: 'Cats::Core::HrpItemDetail' do
-    hrp_item
-    ration_item
-    amount { 150 }
-  end
-end

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

@@ -1,10 +0,0 @@
-FactoryBot.define do
-  factory :hrp, class: 'Cats::Core::Hrp' do
-    reference_no { FFaker::Name.name }
-    year { 1 }
-    season { Cats::Core::Hrp::BELG }
-    status { Cats::Core::Hrp::DRAFT }
-    program
-    ration
-  end
-end

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

@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :transport_request_item, class: 'Cats::Core::TransportRequestItem' do
-    transport_request
-    source factory: :location
-    destination factory: :location
-    commodity
-  end
-end

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

@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :transport_request, class: 'Cats::Core::TransportRequest' do
-    reference_no { FFaker::Name.name }
-    request_date { Date.today }
-    requested_by factory: :user
-    approved_by factory: :user
-  end
-end