cats_core 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2026abe247e382b33bd737605c3aeeb4c4a26c431e557fc98a94234314170074
-  data.tar.gz: d154ca8293fdcf4cff3de77d33542838e759ba0b46df48e3572036f589e15486
+  metadata.gz: 57bd0cce4510afb100e277538b46b5d090b3a5a9c48cacd4da24d9865a3a3cdd
+  data.tar.gz: 93e64f75bf5fb2a953d4f1dbc01667746ed5454b67857a27f27c5a3bed6bc86a
 SHA512:
-  metadata.gz: d92b1ea622c407e0a418a469bf6ed429e76d035b77d3a20184108fc96d0b89241ef5d54bcff3f6d8a0fc0e2158d9a70adb2bdd4a2eaaf20298ae88b758cb7097
-  data.tar.gz: 486d2a372a236e91e17142859c90a5bbb0b80d577787ce4bc710f064176a26fafbc8caaf2030fc2d085112dc708ec89d763391d5ab9c48cea4509ab99c58447e
+  metadata.gz: 97092e8a99a11f22d5ad044ce913f75b5a5dc39ceb55c733ef248994a5e0686b32b6af564838127510296d8b1b3cb3bd0cae0f7f743dd3b262b9c78aa9efa2fa
+  data.tar.gz: abcfc0f293575c891c961da89f8a038a7d83cffbe7c0c0eebb8e1cb996bc855c38f359b868db4eefaacf630f58456ae4beeb1a75d1f4e4cb80e57ab436dbc0d3

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

@@ -1,8 +1,16 @@
 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'
+
+      validates :reference_no, :request_date, :status, presence: true
       validates :reference_no, uniqueness: true
+      validates :status, inclusion: { in: STATUSES }
     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: false,
+                   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.5'.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.5
 platform: ruby
 authors:
 - Henock L.