cats_core 1.2.34 → 1.2.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28997d39a875dc6d5747f18de4f4803264aa98e8a49ee6fd09d79da78bf6a959
-  data.tar.gz: 2ce0c99ef80307ad76a4a070174898edda15ecc7a26b088f279109b9af065a8c
+  metadata.gz: 5171c4d2223bd7da58d76a43f140fd5e96f3b00efd377cc41a79e245cc8ad455
+  data.tar.gz: 21cc696b9784fbca0f6c8ab9ccdb133787164850d43d52516de8acf99c995855
 SHA512:
-  metadata.gz: 6ce37b77dd8690b49307d4748a45ac60294e978d8ebb825e5f81324141ad464d0e021ba005dfa149553449f82e5e8fac68dbea2d679e13741d67b87cde1b75c0
-  data.tar.gz: 03fe91c921eb78c722bf959b5ac6f6c6368a86da82100f4238e8b854d4ad4b87b30d9ce5a24c2289a864eeba0588e4b5fb7f8bb76c500540ccdce5a51f16a69e
+  metadata.gz: d8ded0f55e9f636f3e2726606cb1f14c412d0123cdef3d408503702e86f9cef373c68042cdb0a3e6c1279f96b6ea6c035f6f3c43c37424c33b3a4a76ae64eea6
+  data.tar.gz: bdf907e3fec9b8aab351977f0729f8cf3c41dafeef74b4fd5be6fd3800f9f556dbf96694b46055a65d5cc75c7a4ea225d948704063544ddc2eeaba38933592d4

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

@@ -5,7 +5,7 @@ module Cats
       belongs_to :ration
       belongs_to :unit_of_measure
 
-      validates :amount, presence: true, numericality: { greater_than: 0 }
+      validates :amount, :no_of_days, presence: true, numericality: { greater_than: 0 }
 
       delegate(:name, to: :commodity_category, prefix: true)
       delegate(:abbreviation, to: :unit_of_measure, prefix: true)

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

@@ -8,23 +8,17 @@ module Cats
       WINNERS_DECLARED = 'Winner Declared'.freeze
       STATUSES = [NEW, OPEN, CLOSED, RANKED, WINNERS_DECLARED].freeze
 
-      # Bid types
-      REGIONAL = 'Regional'.freeze
-      NON_REGIONAL = 'Non Regional'.freeze
-      BID_TYPES = [REGIONAL, NON_REGIONAL].freeze
-
       has_many :transport_bid_items
       has_many :transport_offers
       has_many :offer_items, through: :transport_offers
       belongs_to :region, class_name: 'Cats::Core::Location', optional: true
+      belongs_to :transport_plan
 
       validates :reference_no, presence: true, uniqueness: true
-      validates :start_date, :end_date, :status, :bid_type, :bid_bond_amount, presence: true
+      validates :start_date, :end_date, :status, :bid_bond_amount, presence: true
       validates :bid_bond_amount, numericality: { greater_than_or_equal_to: 0 }
       validates :status, inclusion: { in: STATUSES }
-      validates :bid_type, inclusion: { in: BID_TYPES }
       validate :validate_start_date_against_end_date
-      validate :validate_region
 
       def validate_start_date_against_end_date
         return unless start_date && end_date
@@ -32,16 +26,6 @@ module Cats
         errors.add(:start_date, 'should be before end date.') if start_date >= end_date
       end
 
-      def validate_region
-        return unless bid_type
-
-        errors.add(:region, 'should be null.') if bid_type == NON_REGIONAL && region
-
-        errors.add(:region, 'should not be null.') if bid_type == REGIONAL && !region
-
-        errors.add(:region, 'is not valid.') if region && region.location_type != Location::REGION
-      end
-
       def open
         raise(StandardError, 'Bid is already open.') if status == OPEN
 

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

@@ -2,15 +2,13 @@ module Cats
   module Core
     class TransportBidItem < ApplicationRecord
       belongs_to :transport_bid
-      belongs_to :route
-      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure', optional: true
+      belongs_to :transport_plan_item
 
       has_many :offer_items
 
       validates :quantity, presence: true, numericality: { greater_than: 0 }
+      validates :transport_plan_item_id, uniqueness: true
 
-      delegate(:name, to: :route, prefix: true)
-      delegate(:name, to: :unit, prefix: true, allow_nil: true)
       delegate(:reference_no, to: :transport_bid, prefix: true)
     end
   end

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

@@ -0,0 +1,29 @@
+module Cats
+  module Core
+    class TransportPlan < ApplicationRecord
+      # Plan types
+      REGIONAL = 'Regional'.freeze
+      NON_REGIONAL = 'Non Regional'.freeze
+      PLAN_TYPES = [REGIONAL, NON_REGIONAL].freeze
+
+      belongs_to :region, class_name: 'Cats::Core::Location', optional: true
+      has_many :transport_plan_items
+
+      validates :reference_no, presence: true, uniqueness: true
+      validates :plan_type, presence: true, inclusion: { in: PLAN_TYPES }
+      validate :validate_region
+
+      delegate(:name, to: :region, prefix: true)
+
+      def validate_region
+        return unless plan_type
+
+        errors.add(:region, 'should be null.') if plan_type == NON_REGIONAL && region
+
+        errors.add(:region, 'should not be null.') if plan_type == REGIONAL && !region
+
+        errors.add(:region, 'is not valid.') if region && region.location_type != Location::REGION
+      end
+    end
+  end
+end

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

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

data/db/migrate/20210717031343_create_cats_core_ration_items.rb

@@ -14,6 +14,7 @@ class CreateCatsCoreRationItems < ActiveRecord::Migration[6.1]
                    index: { name: 'uom_on_ration_indx' },
                    foreign_key: { to_table: :cats_core_unit_of_measures }
       t.float :amount, null: false
+      t.integer :no_of_days, null: false
 
       t.timestamps
     end

data/db/migrate/20211215114737_create_cats_core_transport_plans.rb

@@ -0,0 +1,14 @@
+class CreateCatsCoreTransportPlans < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_transport_plans do |t|
+      t.string :reference_no, unique: true
+      t.string :plan_type, null: false, default: 'Regional'
+      t.references :region,
+                   null: true,
+                   index: { name: 'region_on_tp_indx' },
+                   foreign_key: { to_table: :cats_core_locations }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20211215114835_create_cats_core_transport_plan_items.rb

@@ -0,0 +1,22 @@
+class CreateCatsCoreTransportPlanItems < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_transport_plan_items do |t|
+      t.references :route,
+                   null: false,
+                   index: { name: 'route_on_tpi_indx' },
+                   foreign_key: { to_table: :cats_core_routes }
+      t.references :transport_plan,
+                   null: false,
+                   index: { name: 'tp_on_tpi_indx' },
+                   foreign_key: { to_table: :cats_core_transport_plans }
+      t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_tpi_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.boolean :planned, null: false, default: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20211215121151_create_cats_core_transport_bids.rb

@@ -6,12 +6,11 @@ class CreateCatsCoreTransportBids < ActiveRecord::Migration[6.1]
       t.date :start_date, null: false
       t.date :end_date, null: false
       t.string :status, null: false, default: 'New'
-      t.string :bid_type, null: false, default: 'Regional'
-      t.references :region,
-                   null: true,
-                   index: { name: 'region_on_tb_indx' },
-                   foreign_key: { to_table: :cats_core_locations } 
       t.float :bid_bond_amount, null: false, default: 0
+      t.references :transport_plan,
+                   null: false,
+                   index: { name: 'tp_on_tb_indx' },
+                   foreign_key: { to_table: :cats_core_transport_plans } 
 
       t.timestamps
     end

data/db/migrate/20211215124452_create_cats_core_transport_bid_items.rb

@@ -5,17 +5,15 @@ class CreateCatsCoreTransportBidItems < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'tb_on_tbi_indx' },
                    foreign_key: { to_table: :cats_core_transport_bids }
-      t.references :route,
+      t.references :transport_plan_item,
                    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 }
+                   index: { name: 'tpi_on_tbi_indx' },
+                   foreign_key: { to_table: :cats_core_transport_plan_items }
       t.float :quantity, null: false
 
       t.timestamps
     end
+
+    add_index :cats_core_transport_bid_items, :transport_plan_item_id, unique: true
   end
 end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.2.34'.freeze
+    VERSION = '1.2.38'.freeze
   end
 end

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

@@ -4,5 +4,6 @@ FactoryBot.define do
     ration
     amount { 150 }
     unit_of_measure
+    no_of_days { 1 }
   end
 end

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

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

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

@@ -4,8 +4,7 @@ FactoryBot.define do
     description { FFaker::Name.name }
     start_date { Date.today - 1.week }
     end_date { Date.today }
-    bid_type { Cats::Core::TransportBid::REGIONAL }
-    region factory: :location
     bid_bond_amount { 100 }
+    transport_plan
   end
 end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :transport_plan_item, class: 'Cats::Core::TransportPlanItem' do
+    route
+    transport_plan
+    quantity { 100 }
+    unit factory: :unit_of_measure
+    planned { false }
+  end
+end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :transport_plan, class: 'Cats::Core::TransportPlan' do
+    reference_no { FFaker::Name.name }
+    plan_type { Cats::Core::TransportPlan::REGIONAL }
+    region factory: :location
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.2.34
+  version: 1.2.38
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-02 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -296,6 +296,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_plan.rb
+- app/models/cats/core/transport_plan_item.rb
 - app/models/cats/core/transporter.rb
 - app/models/cats/core/unit_of_measure.rb
 - app/models/cats/core/user.rb
@@ -367,6 +369,8 @@ 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/20211215114737_create_cats_core_transport_plans.rb
+- db/migrate/20211215114835_create_cats_core_transport_plan_items.rb
 - db/migrate/20211215121151_create_cats_core_transport_bids.rb
 - db/migrate/20211215124452_create_cats_core_transport_bid_items.rb
 - db/migrate/20211229160125_create_cats_core_transport_offers.rb
@@ -423,6 +427,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_plan_items.rb
+- spec/factories/cats/core/transport_plans.rb
 - spec/factories/cats/core/transporters.rb
 - spec/factories/cats/core/unit_of_measures.rb
 - spec/factories/cats/core/users.rb