cats_core 1.2.26 → 1.2.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0b78245442c046287e1a2ddf16e27d33031ebe242b38e6363eaae738e792d92
-  data.tar.gz: 83613611f8a6a31cab227fbc540afbacc35585c87df76a30ea6eb2bcbd8beb5d
+  metadata.gz: 7d71e458593e0bfa2d57ddcba1e5ea4f1392df4223cff0c2b7ef5d1150859463
+  data.tar.gz: 4d2798fd1957265c3493ee8dca89b759d674d2e029489dc7382e7a6d5f62b0c4
 SHA512:
-  metadata.gz: ef654680cb95d92056bfc92ff73e1c8cc56cddc5f4749428e66a94a4e3fdc7522198091f52009f364b57cd0a03f25049c1fdbe09c2c87e7565b9a520359871a0
-  data.tar.gz: 33ff4b09f447fcc0a3554b310594ea497de2160b3ff5588118332386b9ad352b126b92dcbc670aa485157c050572b4965d47dc6531193e21e6ea6cab0c7012c9
+  metadata.gz: 739d0d54055f96059cfb2818f86026ac46518e3c64eaa81762e984ea803e95650c56f28f11ee738fe29254deeb9b5e76a668b037c0454c40c3e4a308db6001d0
+  data.tar.gz: e64a2e770bd662c26218e6d67a1c76d32ddf881deae9e77faecf3aa52628b1f19ac84f71fad4b202dcb200f8cc23aed3c2274f03aa8ff4513fba24b36ee7b254

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/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_contract.rb

@@ -5,7 +5,12 @@ module Cats
       belongs_to :transporter
       belongs_to :transport_bid
 
+      validates :contract_no, presence: true, uniqueness: true
       validates :contract_date, :expires_on, presence: true
+
+      delegate(:name, to: :region, prefix: true)
+      delegate(:name, to: :transporter, prefix: true)
+      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/20211229160127_create_cats_core_transport_contracts.rb

@@ -1,6 +1,7 @@
 class CreateCatsCoreTransportContracts < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_transport_contracts do |t|
+      t.string :contract_no, unique: true
       t.references :region,
                    null: false,
                    index: { name: 'region_on_tc_indx' },
@@ -16,6 +17,7 @@ class CreateCatsCoreTransportContracts < ActiveRecord::Migration[6.1]
       t.date :contract_date, null: false
       t.date :expires_on, null: false
       t.string :payment_term
+      t.boolean :signed, null: false, default: false
 
       t.timestamps
     end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.2.26'.freeze
+    VERSION = '1.2.30'.freeze
   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_contracts.rb

@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :transport_contract, class: 'Cats::Core::TransportContract' do
+    contract_no { FFaker::Name.name }
     region factory: :location
     transporter
     transport_bid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.2.26
+  version: 1.2.30
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers