cats_core 1.2.6 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b102951859559bc96354a41e5dd05582209632d2394b86ba3916100374594706
-  data.tar.gz: b9f1ea8526f5bca4776f32e7c3a16f6dee1b32ce460e4975eebd693b00d941a9
+  metadata.gz: 5cd22f5d1828025591dc9c478cac117524de3bf179379ce32f8866d5b7765b50
+  data.tar.gz: d4aa1ad82b39cbe515bd06508abac047cdb28f0acb6b508a132bc5cf84e30ac5
 SHA512:
-  metadata.gz: 196b1372ef0c79666b491dfc63deedee8c624ae774ee12ef14894f94471be09a6b595ca1e0a483eea5ad01e9a6afb20652aa884adaf7bf383c82be0b270e3537
-  data.tar.gz: 8e3264080cc5cdfbab53447fc1eb59e7c6354433053d60484b0e056051aeeb35e0961f6dbc91d38a66b5cd5aa76895092cc343b1c8e37ff70c96b913e0ddb7ab
+  metadata.gz: f8210d5329e61312fc0150fe91e99330740e0a31d33078aa140c215b706ac329fb6fed6958d852942ab354fc4ffaee0200f313dc4f8c46d448ae0eb129ec2f5d
+  data.tar.gz: 830891e351410797b6b882905db148df50912bf3903dc29a8041c0f22563ce5c50970150c7cd743881abff66bfd80138e6feab34b181d4af0bcf4ddb1bc1526a

data/app/models/cats/core/{transport_service_offer.rb → transport_offer.rb}

@@ -1,10 +1,12 @@
 module Cats
   module Core
-    class TransportServiceOffer < ApplicationRecord
-      belongs_to :transport_service_request_item
+    class TransportOffer < ApplicationRecord
+      belongs_to :transport_request_item
       belongs_to :transporter
 
       validates :price, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:name, to: :transporter, prefix: true)
     end
   end
 end

data/app/models/cats/core/{transport_service_request.rb → transport_request.rb}

@@ -1,6 +1,6 @@
 module Cats
   module Core
-    class TransportServiceRequest < ApplicationRecord
+    class TransportRequest < ApplicationRecord
       DRAFT = 'Draft'.freeze
       APPROVED = 'Approved'.freeze
       STATUSES = [DRAFT, APPROVED].freeze
@@ -11,6 +11,9 @@ module Cats
       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)
     end
   end
 end

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

@@ -0,0 +1,14 @@
+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
+
+      delegate(:name, to: :source, prefix: true)
+      delegate(:name, to: :destination, prefix: true)
+      delegate(:name, to: :commodity, prefix: true)
+    end
+  end
+end

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

@@ -50,6 +50,10 @@ module Cats
 
         errors.add(:phone_number, 'must be 10 or 12 digits and should match with local phone pattern')
       end
+
+      def full_name
+        "#{first_name} #{last_name}"
+      end
     end
   end
 end

data/db/migrate/{20211209155113_create_cats_core_transport_service_requests.rb → 20211209155113_create_cats_core_transport_requests.rb}

@@ -1,6 +1,6 @@
-class CreateCatsCoreTransportServiceRequests < ActiveRecord::Migration[6.1]
+class CreateCatsCoreTransportRequests < ActiveRecord::Migration[6.1]
   def change
-    create_table :cats_core_transport_service_requests do |t|
+    create_table :cats_core_transport_requests do |t|
       t.string :reference_no, unique: true
       t.date :request_date, null: false
       t.string :status, null: false, default: 'Draft'

data/db/migrate/{20211209155915_create_cats_core_transport_service_request_items.rb → 20211209155915_create_cats_core_transport_request_items.rb}

@@ -1,21 +1,21 @@
-class CreateCatsCoreTransportServiceRequestItems < ActiveRecord::Migration[6.1]
+class CreateCatsCoreTransportRequestItems < ActiveRecord::Migration[6.1]
   def change
-    create_table :cats_core_transport_service_request_items do |t|
-      t.references :transport_service_request,
+    create_table :cats_core_transport_request_items do |t|
+      t.references :transport_request,
                    null: false,
-                   index: { name: 'tsri_on_tsr_indx' },
-                   foreign_key: { to_table: :cats_core_transport_service_requests }
+                   index: { name: 'tri_on_tr_indx' },
+                   foreign_key: { to_table: :cats_core_transport_requests }
       t.references :source,
                    null: false,
-                   index: { name: 'tsri_on_source_indx' },
+                   index: { name: 'tri_on_source_indx' },
                    foreign_key: { to_table: :cats_core_locations }
       t.references :destination,
                    null: false,
-                   index: { name: 'tsri_on_destination_indx'},
+                   index: { name: 'tri_on_destination_indx'},
                    foreign_key: { to_table: :cats_core_locations }
       t.references :commodity,
                    null: false,
-                   index: { name: 'tsri_on_commodity_indx' },
+                   index: { name: 'tri_on_commodity_indx' },
                    foreign_key: { to_table: :cats_core_commodities }
 
       t.timestamps

data/db/migrate/20211209160126_create_cats_core_transport_offers.rb

@@ -0,0 +1,17 @@
+class CreateCatsCoreTransportOffers < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_transport_offers do |t|
+      t.references :transport_request_item,
+                   null: false,
+                   index: { name: 'to_on_tri_indx' },
+                   foreign_key: { to_table: :cats_core_transport_request_items }
+      t.references :transporter,
+                   null: false,
+                   index: { name: 'to_on_transporter_indx' },
+                   foreign_key: { to_table: :cats_core_transporters }
+      t.float :price, null: false
+
+      t.timestamps
+    end
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.2.6'.freeze
+    VERSION = '1.2.10'.freeze
   end
 end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :transport_offer, class: 'Cats::Core::TransportOffer' do
+    transport_request_item
+    transporter
+    price { 100 }
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :transport_request_item, class: 'Cats::Core::TransportRequestItem' do
+    transport_request
+    source factory: :location
+    destination factory: :location
+    commodity
+  end
+end

data/spec/factories/cats/core/{transport_service_requests.rb → transport_requests.rb}

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :transport_service_request, class: 'Cats::Core::TransportServiceRequest' do
+  factory :transport_request, class: 'Cats::Core::TransportRequest' do
     reference_no { FFaker::Name.name }
     request_date { Date.today }
     requested_by factory: :user

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.10
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2021-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -287,9 +287,9 @@ files:
 - app/models/cats/core/store.rb
 - app/models/cats/core/supplier.rb
 - app/models/cats/core/transaction.rb
-- app/models/cats/core/transport_service_offer.rb
-- app/models/cats/core/transport_service_request.rb
-- app/models/cats/core/transport_service_request_item.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
@@ -359,9 +359,9 @@ files:
 - db/migrate/20211002050739_create_cats_core_notification_rules.rb
 - db/migrate/20211024063240_add_status_to_cats_core_rhn_requests.rb
 - db/migrate/20211030133752_add_status_to_cats_core_commodities.rb
-- db/migrate/20211209155113_create_cats_core_transport_service_requests.rb
-- db/migrate/20211209155915_create_cats_core_transport_service_request_items.rb
-- db/migrate/20211209160126_create_cats_core_transport_service_offers.rb
+- db/migrate/20211209155113_create_cats_core_transport_requests.rb
+- db/migrate/20211209155915_create_cats_core_transport_request_items.rb
+- db/migrate/20211209160126_create_cats_core_transport_offers.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -403,9 +403,9 @@ files:
 - spec/factories/cats/core/stacks.rb
 - spec/factories/cats/core/stores.rb
 - spec/factories/cats/core/suppliers.rb
-- spec/factories/cats/core/transport_service_offers.rb
-- spec/factories/cats/core/transport_service_request_items.rb
-- spec/factories/cats/core/transport_service_requests.rb
+- spec/factories/cats/core/transport_offers.rb
+- spec/factories/cats/core/transport_request_items.rb
+- spec/factories/cats/core/transport_requests.rb
 - spec/factories/cats/core/transporters.rb
 - spec/factories/cats/core/unit_of_measures.rb
 - spec/factories/cats/core/users.rb

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

@@ -1,10 +0,0 @@
-module Cats
-  module Core
-    class TransportServiceRequestItem < ApplicationRecord
-      belongs_to :transport_service_request
-      belongs_to :source, class_name: 'Cats::Core::Location'
-      belongs_to :destination, class_name: 'Cats::Core::Location'
-      belongs_to :commodity
-    end
-  end
-end

data/db/migrate/20211209160126_create_cats_core_transport_service_offers.rb

@@ -1,17 +0,0 @@
-class CreateCatsCoreTransportServiceOffers < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_transport_service_offers do |t|
-      t.references :transport_service_request_item,
-                   null: false,
-                   index: { name: 'tso_on_tsri_indx' },
-                   foreign_key: { to_table: :cats_core_transport_service_request_items }
-      t.references :transporter,
-                   null: false,
-                   index: { name: 'tso_on_transporter_indx' },
-                   foreign_key: { to_table: :cats_core_transporters }
-      t.float :price, null: false
-
-      t.timestamps
-    end
-  end
-end

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

@@ -1,7 +0,0 @@
-FactoryBot.define do
-  factory :transport_service_offer, class: 'Cats::Core::TransportServiceOffer' do
-    transport_service_request_item
-    transporter
-    price { 100 }
-  end
-end

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

@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :transport_service_request_item, class: 'Cats::Core::TransportServiceRequestItem' do
-    transport_service_request
-    source factory: :location
-    destination factory: :location
-    commodity
-  end
-end