cats_core 1.2.28 → 1.2.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fb2a7abf04c5411df9257ef309f1a6af300e3a2bc1788d0967077b6e09f27ec
-  data.tar.gz: 1a4bc874a3ea71f92ac6de37f5f826c3095f326ca808527705850d5f2d3a3f08
+  metadata.gz: 28dccafb9f531a0e9c13331b7a3c0cb807ddfeb42504bb1b484e58837c852219
+  data.tar.gz: 92f65296583c53ef16ac6e07fc849b6541fa5d69ba0f8d5f1b2920b16bdd2924
 SHA512:
-  metadata.gz: d9e67913462314e8969df71f63e25ad5866e4274755c8c0bf88c24654d9be70ede9c99b5ae4e8363e87089eb792a54c6506ae622ff217ad97eff6b292b8fb8ef
-  data.tar.gz: d8c7d1ffae92d0297b0b23ea2a3032fc08e4859ba0ea172a46ac8de2ca3ebc1644cc9172c2b7fc8a8cabeb4cafb161947ef5f667fd09b2764c44f94f4208cc22
+  metadata.gz: aa1f417bf917a6d670ac4e787343b520650f46d05d43ec77cd0b747484b3114abee8f03136b9aa71f247b188dfc4a062c6710c8dda44f29b4ba47f20dc271ed5
+  data.tar.gz: 8583a0ba4f7354469161c43e95fe150a3156b4ec3c1c08b0f0ed1f44924e7b7a620a763dd02c134b6a0c8c0ce34b6f2075e21d0209e43e3f5b392365b341f834

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

@@ -6,7 +6,7 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:source_id, :destination_id)
+        params.require(:payload).permit(:region_id, :source_id, :destination_id)
       end
     end
   end

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

@@ -8,6 +8,8 @@ module Cats
       validates :price, presence: true, numericality: { greater_than: 0 }
 
       delegate(:name, to: :route, prefix: true)
+      delegate(:contract_no, to: :transport_contract, prefix: false)
+      delegate(:name, to: :unit, prefix: true)
     end
   end
 end

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

@@ -0,0 +1,26 @@
+module Cats
+  module Core
+    class OfferItem < ApplicationRecord
+      belongs_to :transport_offer
+      belongs_to :transport_bid_item
+
+      validates :price, presence: true, numericality: { greater_than: 0 }
+      validates :rank, numericality: { greater_than: 0 }, allow_nil: true
+      validate :validate_rank_is_set_for_winner
+
+      def mark_as_winner(rank)
+        raise(StandardError, 'Offer item already marked as winner.') if winner
+
+        self.rank = rank
+        self.winner = true
+        save!
+      end
+
+      def validate_rank_is_set_for_winner
+        return if rank
+
+        errors.add(:winner, 'cannot be set for a non-ranked offer item.') if winner
+      end
+    end
+  end
+end

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

@@ -3,16 +3,36 @@ module Cats
     class Route < ApplicationRecord
       before_validation :set_name, on: %i[create update]
 
+      belongs_to :region, class_name: 'Cats::Core::Location'
       belongs_to :source, class_name: 'Cats::Core::Location'
       belongs_to :destination, class_name: 'Cats::Core::Location'
 
       validates :source_id, uniqueness: { scope: :destination_id }
+      validate :validate_region, :validate_source, :validate_destination
 
       def set_name
         return unless source && destination
 
         self.name = "#{source.name} - #{destination.name}"
       end
+
+      def validate_region
+        return unless region
+
+        errors.add(:region, 'should be a valid region.') unless region.location_type == Location::REGION
+      end
+
+      def validate_source
+        return unless source
+
+        errors.add(:source, 'cannot be a region.') if source.location_type == Location::REGION
+      end
+
+      def validate_destination
+        return unless destination
+
+        errors.add(:destination, 'cannot be a region.') if destination.location_type == Location::REGION
+      end
     end
   end
 end

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

@@ -8,13 +8,22 @@ 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, through: :transport_bid_items
+      has_many :transport_offers
+      belongs_to :region, class_name: 'Cats::Core::Location', optional: true
 
       validates :reference_no, presence: true, uniqueness: true
-      validates :start_date, :end_date, :status, presence: true
+      validates :start_date, :end_date, :status, :bid_type, :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
@@ -22,6 +31,16 @@ 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

@@ -5,7 +5,7 @@ module Cats
       belongs_to :route
       belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure', optional: true
 
-      has_many :transport_offers
+      has_many :offer_items
 
       validates :quantity, presence: true, numericality: { greater_than: 0 }
 

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

@@ -4,6 +4,7 @@ module Cats
       belongs_to :region, class_name: 'Cats::Core::Location'
       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

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

@@ -1,28 +1,15 @@
 module Cats
   module Core
     class TransportOffer < ApplicationRecord
-      belongs_to :transport_bid_item
+      belongs_to :transport_bid
       belongs_to :transporter
+      has_many :offer_items
 
-      validates :price, presence: true, numericality: { greater_than: 0 }
-      validates :rank, numericality: { greater_than: 0 }, allow_nil: true
-      validate :validate_rank_is_set_for_winner
+      validates :offer_date, :bid_bond_amount, presence: true
+      validates :bid_bond_amount, numericality: { greater_than_or_equal_to: 0 }
 
       delegate(:name, to: :transporter, prefix: true)
-
-      def mark_as_winner(rank)
-        raise(StandardError, 'Offer already marked as winner.') if winner
-
-        self.rank = rank
-        self.winner = true
-        save!
-      end
-
-      def validate_rank_is_set_for_winner
-        return if rank
-
-        errors.add(:winner, 'cannot be set for a non-ranked offer.') if winner
-      end
+      delegate(:reference_no, to: :transport_bid, prefix: 'bid')
     end
   end
 end

data/db/migrate/20210718040129_create_cats_core_routes.rb

@@ -2,6 +2,10 @@ class CreateCatsCoreRoutes < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_routes do |t|
       t.string :name, null: false
+      t.references :region,
+                   null: false,
+                   index: { name: 'region_on_routes_indx' },
+                   foreign_key: { to_table: :cats_core_locations }
       t.references :source,
                    null: false,
                    index: { name: 'source_on_routes_indx' },
@@ -13,7 +17,7 @@ class CreateCatsCoreRoutes < ActiveRecord::Migration[6.1]
 
       t.timestamps
 
-      t.index [:source_id, :destination_id], unique: true
+      t.index %i[source_id destination_id], unique: true
     end
   end
 end

data/db/migrate/20211215121151_create_cats_core_transport_bids.rb

@@ -6,6 +6,12 @@ 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.timestamps
     end

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

@@ -1,17 +1,16 @@
 class CreateCatsCoreTransportOffers < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_transport_offers do |t|
-      t.references :transport_bid_item,
+      t.references :transport_bid,
                    null: false,
-                   index: { name: 'to_on_tbi_indx' },
-                   foreign_key: { to_table: :cats_core_transport_bid_items }
+                   index: { name: 'to_on_tb_indx' },
+                   foreign_key: { to_table: :cats_core_transport_bids }
       t.references :transporter,
                    null: false,
                    index: { name: 'to_on_transporter_indx' },
                    foreign_key: { to_table: :cats_core_transporters }
-      t.float :price, null: false
-      t.boolean :winner, null: false, default: false
-      t.integer :rank
+      t.date :offer_date, null: false
+      t.float :bid_bond_amount, null: false, default: 0
 
       t.timestamps
     end

data/db/migrate/20211229160126_create_cats_core_offer_items.rb

@@ -0,0 +1,19 @@
+class CreateCatsCoreOfferItems < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_offer_items do |t|
+      t.references :transport_offer,
+                   null: false,
+                   index: { name: 'to_on_oi_indx' },
+                   foreign_key: { to_table: :cats_core_transport_offers }
+      t.references :transport_bid_item,
+                   null: false,
+                   index: { name: 'tbi_on_to_indx' },
+                   foreign_key: { to_table: :cats_core_transport_bid_items } 
+      t.float :price, null: false
+      t.boolean :winner, null: false, default: false
+      t.integer :rank
+
+      t.timestamps
+    end
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.2.28'.freeze
+    VERSION = '1.2.32'.freeze
   end
 end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :offer_item, class: 'Cats::Core::OfferItem' do
+    transport_offer
+    transport_bid_item
+    price { 150 }
+    rank { 2 }
+    winner { false }
+  end
+end

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

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

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

@@ -4,5 +4,8 @@ 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 }
   end
 end

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

@@ -1,9 +1,8 @@
 FactoryBot.define do
   factory :transport_offer, class: 'Cats::Core::TransportOffer' do
-    transport_bid_item
+    transport_bid
     transporter
-    price { 100 }
-    winner { false }
-    rank { nil }
+    bid_bond_amount { 100 }
+    offer_date { Date.today }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.2.28
+  version: 1.2.32
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2021-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -271,6 +271,7 @@ files:
 - app/models/cats/core/menu_item.rb
 - app/models/cats/core/notification.rb
 - app/models/cats/core/notification_rule.rb
+- app/models/cats/core/offer_item.rb
 - app/models/cats/core/operator.rb
 - app/models/cats/core/plan.rb
 - app/models/cats/core/plan_item.rb
@@ -368,7 +369,8 @@ files:
 - db/migrate/20211030133752_add_status_to_cats_core_commodities.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/20211229160125_create_cats_core_transport_offers.rb
+- db/migrate/20211229160126_create_cats_core_offer_items.rb
 - db/migrate/20211229160127_create_cats_core_transport_contracts.rb
 - db/migrate/20211229160128_create_cats_core_contract_items.rb
 - db/migrate/20211229160129_create_cats_core_commodity_substitutions.rb
@@ -397,6 +399,7 @@ files:
 - spec/factories/cats/core/menus.rb
 - spec/factories/cats/core/notification_rules.rb
 - spec/factories/cats/core/notifications.rb
+- spec/factories/cats/core/offer_items.rb
 - spec/factories/cats/core/operators.rb
 - spec/factories/cats/core/plan_item_details.rb
 - spec/factories/cats/core/plan_items.rb