cats_core 1.2.20 → 1.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17f638d1558c70663410c90630da5764199dba7c9475162e40ba51ff4eb4e6ab
-  data.tar.gz: ecdb4518988dd53281e19c942edb3295bc410e1f10bf6ac765b07e5c05b85c99
+  metadata.gz: 8c1981cb078f54862e1d8a5a0189f5c30af4a39e27c0640743b516467929e19d
+  data.tar.gz: cc7bd6720e152ff653970291073fc3e597b1387052dde5b8fcc33f886eff2eba
 SHA512:
-  metadata.gz: d618acb0e39c3ee0932b25a8e5b2f41dded24cad7867b35a86d1062f70f3d4de857865c1e38f8da3c903b3c26e9d3b19264a717cdc29eecdbf3e34acda967566
-  data.tar.gz: 3730419db5c67164ad6a7809e10bbce30a1b4f9a83f8639371f5e5f6758f628d346291a1072e613e43d3ace9838aed73a96eec441ded96ad5b29a7216b9f8544
+  metadata.gz: c001644ba4030047ff818acc88225a7b374fdf4a3fb098e645698dae0c5f54e7723aef86ea7ffa98109d4fc596dfc76fa9e6c0d67a1c69e6e7f72392793a7ac8
+  data.tar.gz: cb482c5b61c5d7dbe7f2d692d547dc7ae5c4e2a0443d979f66b0e0db486e0aa041df9e1c798546e6729080fddb4dc6dede4eccf2ea7c72090399bb831f9c20c8

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

@@ -0,0 +1,23 @@
+module Cats
+  module Core
+    class CommoditySubstitution < ApplicationRecord
+      belongs_to :program
+      belongs_to :commodity, class_name: 'Cats::Core::CommodityCategory'
+      belongs_to :replaced_by, class_name: 'Cats::Core::CommodityCategory'
+
+      validates :ratio, presence: true
+      validates :program_id, uniqueness: { scope: %i[commodity_id replaced_by_id] }
+      validate :validate_ratio
+
+      def validate_ratio
+        return unless ratio
+
+        left, right = ratio.split(':')
+        left_correct = Integer(left).is_a?(Integer) rescue false
+        right_correct = Integer(right).is_a?(Integer) rescue false
+
+        errors.add(:ratio, 'is not in correct format.') unless left_correct && right_correct
+      end
+    end
+  end
+end

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

@@ -4,7 +4,9 @@ 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
 

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/db/migrate/20211229160129_create_cats_core_commodity_substitutions.rb

@@ -0,0 +1,23 @@
+class CreateCatsCoreCommoditySubstitutions < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_commodity_substitutions do |t|
+      t.references :program,
+                   null: false,
+                   index: { name: 'program_on_cs_indx' },
+                   foreign_key: { to_table: :cats_core_programs }
+      t.references :commodity,
+                   null: false,
+                   index: { name: 'commodity_on_cs_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.references :replaced_by,
+                   null: false,
+                   index: { name: 'rb_on_cs_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.string :ratio, null: false
+
+      t.timestamps
+
+      t.index [:program_id, :commodity_id, :replaced_by_id], unique: true, name: 'pcr_on_cs_indx'
+    end
+  end
+end

data/lib/cats/core/version.rb

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

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :commodity_substitution, class: 'Cats::Core::CommoditySubstitution' do
+    program
+    commodity factory: :commodity_category
+    replaced_by factory: :commodity_category
+    ratio { '1:2' }
+  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.20
+  version: 1.2.24
 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
@@ -256,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/commodity_substitution.rb
 - app/models/cats/core/contract_item.rb
 - app/models/cats/core/currency.rb
 - app/models/cats/core/dispatch.rb
@@ -294,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
@@ -372,6 +371,7 @@ files:
 - 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
+- db/migrate/20211229160129_create_cats_core_commodity_substitutions.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -382,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/commodity_substitutions.rb
 - spec/factories/cats/core/contract_items.rb
 - spec/factories/cats/core/currencies.rb
 - spec/factories/cats/core/dispatch_plan_items.rb

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