cats_core 1.2.5 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57bd0cce4510afb100e277538b46b5d090b3a5a9c48cacd4da24d9865a3a3cdd
-  data.tar.gz: 93e64f75bf5fb2a953d4f1dbc01667746ed5454b67857a27f27c5a3bed6bc86a
+  metadata.gz: 5663c0eaa392c4615048690c71928842718010535c337326074509dcdfeb8330
+  data.tar.gz: ed4d00ce0638ff2cb9db16213fef37e5a50b6633fc8aa7e2c18faabab2d0a993
 SHA512:
-  metadata.gz: 97092e8a99a11f22d5ad044ce913f75b5a5dc39ceb55c733ef248994a5e0686b32b6af564838127510296d8b1b3cb3bd0cae0f7f743dd3b262b9c78aa9efa2fa
-  data.tar.gz: abcfc0f293575c891c961da89f8a038a7d83cffbe7c0c0eebb8e1cb996bc855c38f359b868db4eefaacf630f58456ae4beeb1a75d1f4e4cb80e57ab436dbc0d3
+  metadata.gz: 75ee5893657e7509a0644856177ef2dcab134f53b15c126e14315ed6ebd150bfb9ddff553d0fc35b6cafbad9d2e79df0387f099428a8226e973bd184f3591b3a
+  data.tar.gz: ae1a10d375b6c38dd0aeb9221ed46eaa0065a8295c35ef5a3ac17ec6251bb61ed873a4e67541494a6911b2623f5e82e3b455f7f7b114f65cae9fc636ef6e8e2e

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

@@ -5,6 +5,8 @@ module Cats
       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

@@ -6,11 +6,14 @@ module Cats
       STATUSES = [DRAFT, APPROVED].freeze
 
       belongs_to :requested_by, class_name: 'Cats::Core::User'
-      belongs_to :approved_by, class_name: 'Cats::Core::User'
+      belongs_to :approved_by, class_name: 'Cats::Core::User', optional: true
 
       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_service_request_item.rb

@@ -5,6 +5,10 @@ module Cats
       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

@@ -9,7 +9,7 @@ class CreateCatsCoreTransportServiceRequests < ActiveRecord::Migration[6.1]
                    index: { name: 'tsr_on_rb_indx' },
                    foreign_key: { to_table: :cats_core_users }
       t.references :approved_by,
-                   null: false,
+                   null: true,
                    index: { name: 'tsr_on_ab_indx' },
                    foreign_key: { to_table: :cats_core_users }
 

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.2.5'.freeze
+    VERSION = '1.2.9'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.9
 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