cats_core 1.2.22 → 1.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5139b115f1503157e1d5f53a0a013b72d1296a0cd1fe808c1fd117a4a813830
-  data.tar.gz: eaf56d0ba167f6360144a4d7e6152eba2e0375b7c272ea271cfc9805178e781b
+  metadata.gz: f0b78245442c046287e1a2ddf16e27d33031ebe242b38e6363eaae738e792d92
+  data.tar.gz: 83613611f8a6a31cab227fbc540afbacc35585c87df76a30ea6eb2bcbd8beb5d
 SHA512:
-  metadata.gz: bad07930acac569a78aee9152527d95c390f48eb3a69070894c888a3ff8de74f07f0904730aa59446b17a9b1979a0cdbd8e898b23eeb231b1693f449f664be7b
-  data.tar.gz: ab180af55c2610e87a0f1f7f7f1031a8730f9cccbae2ea1c0f5bc58cc6cf219dfac657e3078624e2624f38230b950dd49d708d44691f8ed47db55652262852d3
+  metadata.gz: ef654680cb95d92056bfc92ff73e1c8cc56cddc5f4749428e66a94a4e3fdc7522198091f52009f364b57cd0a03f25049c1fdbe09c2c87e7565b9a520359871a0
+  data.tar.gz: 33ff4b09f447fcc0a3554b310594ea497de2160b3ff5588118332386b9ad352b126b92dcbc670aa485157c050572b4965d47dc6531193e21e6ea6cab0c7012c9

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

@@ -4,9 +4,12 @@ module Cats
       NEW = 'New'.freeze
       OPEN = 'Open'.freeze
       CLOSED = 'Closed'.freeze
-      STATUSES = [NEW, OPEN, CLOSED].freeze
+      RANKED = 'Ranked'.freeze
+      WINNERS_DECLARED = 'Winner Declared'.freeze
+      STATUSES = [NEW, OPEN, CLOSED, RANKED, WINNERS_DECLARED].freeze
 
       has_many :transport_bid_items
+      has_many :transport_offers, through: :transport_bid_items
 
       validates :reference_no, presence: true, uniqueness: true
       validates :start_date, :end_date, :status, presence: true

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

@@ -11,6 +11,7 @@ module Cats
 
       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
 end

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

@@ -3,6 +3,7 @@ module Cats
     class TransportContract < ApplicationRecord
       belongs_to :region, class_name: 'Cats::Core::Location'
       belongs_to :transporter
+      belongs_to :transport_bid
 
       validates :contract_date, :expires_on, presence: true
     end

data/db/migrate/20211229160127_create_cats_core_transport_contracts.rb

@@ -9,6 +9,10 @@ class CreateCatsCoreTransportContracts < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'transporter_on_tc_indx' },
                    foreign_key: { to_table: :cats_core_transporters }
+      t.references :transport_bid,
+                   null: false,
+                   index: { name: 'tb_on_tc_indx' },
+                   foreign_key: { to_table: :cats_core_transport_bids }
       t.date :contract_date, null: false
       t.date :expires_on, null: false
       t.string :payment_term

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.2.22'.freeze
+    VERSION = '1.2.26'.freeze
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.2.22
+  version: 1.2.26
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-18 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -295,8 +295,6 @@ 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_request.rb
-- app/models/cats/core/transport_request_item.rb
 - app/models/cats/core/transporter.rb
 - app/models/cats/core/unit_of_measure.rb
 - app/models/cats/core/user.rb
@@ -441,7 +439,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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

@@ -1,46 +0,0 @@
-module Cats
-  module Core
-    class TransportRequest < ApplicationRecord
-      DRAFT = 'Draft'.freeze
-      APPROVED = 'Approved'.freeze
-      OPEN = 'Open'.freeze
-      CLOSED = 'Closed'.freeze
-      STATUSES = [DRAFT, APPROVED, OPEN, CLOSED].freeze
-
-      belongs_to :requested_by, class_name: 'Cats::Core::User'
-      belongs_to :approved_by, class_name: 'Cats::Core::User', optional: true
-      has_many :transport_request_items
-
-      validates :reference_no, :request_date, :status, presence: true
-      validates :reference_no, uniqueness: true
-      validates :status, inclusion: { in: STATUSES }
-
-      delegate(:full_name, to: :requested_by, prefix: true, allow_nil: true)
-      delegate(:full_name, to: :approved_by, prefix: true, allow_nil: true)
-
-      def approve(approver)
-        raise(StandardError, 'Request is not open for approval.') unless status == DRAFT
-
-        raise(StandardError, 'Request is empty.') if transport_request_items.count.zero?
-
-        self.approved_by = approver
-        self.status = APPROVED
-        save!
-      end
-
-      def open
-        raise(StandardError, 'Request is not approved for opening.') unless status == APPROVED
-
-        self.status = OPEN
-        save!
-      end
-
-      def close
-        raise(StandardError, 'Request is not open.') unless status == OPEN
-
-        self.status = CLOSED
-        save!
-      end
-    end
-  end
-end

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

@@ -1,16 +0,0 @@
-module Cats
-  module Core
-    class TransportRequestItem < ApplicationRecord
-      belongs_to :transport_request
-      belongs_to :source, class_name: 'Cats::Core::Location'
-      belongs_to :destination, class_name: 'Cats::Core::Location'
-      belongs_to :commodity
-
-      has_many :transport_offers
-
-      delegate(:name, to: :source, prefix: true)
-      delegate(:name, to: :destination, prefix: true)
-      delegate(:name, to: :commodity, prefix: true)
-    end
-  end
-end