cats_core 1.2.27 → 1.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dd652b6eeefe39811487b8fa993471b4f61c3692a8a1400ff929612ae7a6138
-  data.tar.gz: 224e2b50ff72bf811c3a9a9acaf34f1bd24eeab09729e7ad0a04503e7d671785
+  metadata.gz: 6c2bd0f123f3f3c2ea21cd6987d61a19839bd8b60519ee8853ae00b163a2ff9c
+  data.tar.gz: e6825f6847ea16a205fbee1bcfe5d74bf546cbad91dd5ae2c0b42e38d33eb806
 SHA512:
-  metadata.gz: a6d3e915bb2150d9d6cbeb62e571b100970ac74b8517cf96cc94f2b9c3517d0a40328aca7c55cab359991f27b090ce28d732e062a74d2188112839c61cc13f47
-  data.tar.gz: c25d23f1eb76225dbb67bedcd439fc11ae1f2aaa6bd951f72af81bd00f6647a69861415f2c6da247a1f709da75fde33bb31e702f08228b6424018967996ea5d6
+  metadata.gz: d62649ef9300dbcac14b73ea849e1cda359b4e78a2d62ece62bb4df13d623c0e6f0ed435dabd48e35cae417baaaa5476975d8bdc5b6d9d7be05b4a972e4c9b7a
+  data.tar.gz: 535bc18ed18dd49dfeba9e8f58b966ee46690a7218293380658e9aa5ded0812ac20f47d9c474deaacc7f174ad3aae76d8da7e61f023f1bd376b4946ac5dc611a

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

@@ -4,7 +4,9 @@ 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
 
       delegate(:name, to: :region, prefix: true)

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' },

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.2.27'.freeze
+    VERSION = '1.2.31'.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.27
+  version: 1.2.31
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers