cats_core 1.2.4 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2026abe247e382b33bd737605c3aeeb4c4a26c431e557fc98a94234314170074
-  data.tar.gz: d154ca8293fdcf4cff3de77d33542838e759ba0b46df48e3572036f589e15486
+  metadata.gz: 410f6f43a8f38fee7dc6fa2b1bfa35d57e33f15e34f5a2449820fe969cd94afc
+  data.tar.gz: e9e309081d7c9e253bf5eb5e1d1bc0ae5d78aedbcfa51585d2cc2f897e3e8edb
 SHA512:
-  metadata.gz: d92b1ea622c407e0a418a469bf6ed429e76d035b77d3a20184108fc96d0b89241ef5d54bcff3f6d8a0fc0e2158d9a70adb2bdd4a2eaaf20298ae88b758cb7097
-  data.tar.gz: 486d2a372a236e91e17142859c90a5bbb0b80d577787ce4bc710f064176a26fafbc8caaf2030fc2d085112dc708ec89d763391d5ab9c48cea4509ab99c58447e
+  metadata.gz: e3945bba2c0198ca40dd78ffae146adebfa75a5404918e46e6c354098bbdd5b78e4febedc8557776f7713a660bd1bf1adb47d535b24e2697e751a1d4894054f9
+  data.tar.gz: 220b1eebc52a63d51bc9c3f21cdf603116ea9e74fa2adf4bd40b2732fdefb93276fcc8b64c964ba1912c3b232aa6a9d6ee1b84f2a7f7961b6623fde8d506b1a6

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

@@ -1,8 +1,19 @@
 module Cats
   module Core
     class TransportServiceRequest < ApplicationRecord
-      validates :reference_no, :request_date, presence: true
+      DRAFT = 'Draft'.freeze
+      APPROVED = 'Approved'.freeze
+      STATUSES = [DRAFT, APPROVED].freeze
+
+      belongs_to :requested_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/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

@@ -3,6 +3,15 @@ class CreateCatsCoreTransportServiceRequests < ActiveRecord::Migration[6.1]
     create_table :cats_core_transport_service_requests do |t|
       t.string :reference_no, unique: true
       t.date :request_date, null: false
+      t.string :status, null: false, default: 'Draft'
+      t.references :requested_by,
+                   null: false,
+                   index: { name: 'tsr_on_rb_indx' },
+                   foreign_key: { to_table: :cats_core_users }
+      t.references :approved_by,
+                   null: true,
+                   index: { name: 'tsr_on_ab_indx' },
+                   foreign_key: { to_table: :cats_core_users }
 
       t.timestamps
     end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.2.4'.freeze
+    VERSION = '1.2.8'.freeze
   end
 end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.8
 platform: ruby
 authors:
 - Henock L.