cats_core 1.0.42 → 1.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 459a3f07d1fadf11fb8120f91ecf18b2df1b7719e05a2e8398e0af664af1b19b
-  data.tar.gz: 92645ac2384a08e79db744e98e8179bcea78112c538c1b6444bbc0a6fa26d34e
+  metadata.gz: 2f434d12f124bafbd6d7e1800ccb5ef123afc5a41d496e1fbe3e8f241fc17cbb
+  data.tar.gz: d73d97c1d94a4bddb94b3f7a9608b16b1f3311d86ffafeb50008737a02f6a07a
 SHA512:
-  metadata.gz: 265613d922d768384446ca0e38e3dfcae4ae2bb9f07a7f8a278ebbc3f2ec87fd8c96f08ae08a5ecc605ee9903701bf8d90f45ba5583524717b65f97ad3264509
-  data.tar.gz: 3a8236f40c2f028c8a7cff2abcf2d08c02eb598f577e71bedf8723841301c70cf0f8c0834d36fc1eff6b6a06dca0c6383d5e06e8bdfbed6b82ee747176ca9792
+  metadata.gz: aaa5cc4c199c9d2aff261b684fa8036dbc6313dd66885adea3584efe667f3892fb21332fde6725361d30939fd3d837d389ed005021b93af97d35e40723129e28
+  data.tar.gz: f9d62619ee798259d384788386873b11279e3f30ac5e9ad18fcbe4713dae6e454190aaf816e3e4adf5eb06f7ddd5735c908329ccf89293c6ec79cf488f9628a4

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

@@ -1,14 +1,24 @@
 module Cats
   module Core
     class Dispatch < ApplicationRecord
+      DRAFT = 'Draft'.freeze
+      APPROVED = 'Approved'.freeze
+      STARTED = 'Started'.freeze
+
+      DISPATCH_STATUSES = [DRAFT, APPROVED, STARTED].freeze
+
       belongs_to :prepared_by, class_name: 'Cats::Core::User'
       belongs_to :transporter
       belongs_to :allocation_item
 
       validates :reference_no, :plate_no, :driver_name, :driver_phone, :quantity, :commodity_status, presence: true
+      validates :dispatch_status, presence: true, inclusion: { in: DISPATCH_STATUSES }
       validates :reference_no, uniqueness: true
       validates :quantity, numericality: { greater_than: 0 }
       validates :commodity_status, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
+
+      delegate(:name, to: :transporter, prefix: true)
+      delegate(:email, to: :prepared_by, prefix: true)
     end
   end
 end

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

@@ -8,14 +8,21 @@ module Cats
       belongs_to :donor
       belongs_to :hrp
       belongs_to :currency, optional: true
+      belongs_to :commodity_category, optional: true
+      belongs_to :unit_of_measure, optional: true
 
-      validates :reference_no, :donation_type, :donated_on, presence: true
+      validates :reference_no, :amount, :donation_type, :donated_on, presence: true
       validates :reference_no, uniqueness: true
       validates :donation_type, inclusion: { in: DONATION_TYPES }
-      validates :currency, :amount, presence: true, if: -> { donation_type == CASH }
+      validates :currency, presence: true, if: -> { donation_type == CASH }
+      validates :commodity_category, presence: true, if: -> { donation_type == KIND }
+      validates :unit_of_measure, presence: true, if: -> { donation_type == KIND }
 
       delegate(:name, to: :donor, prefix: true)
       delegate(:reference_no, to: :hrp, prefix: true)
+      delegate(:name, to: :commodity_category, prefix: true, allow_nil: true)
+      delegate(:code, to: :currency, prefix: true, allow_nil: true)
+      delegate(:abbreviation, to: :unit_of_measure, prefix: true, allow_nil: true)
     end
   end
 end

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

@@ -2,12 +2,9 @@ module Cats
   module Core
     class GiftCertificate < ApplicationRecord
       belongs_to :donation
-      belongs_to :commodity_category
 
       validates :reference_no, presence: true, uniqueness: true
       validates :gift_date, presence: true
-
-      delegate(:name, to: :commodity_category, prefix: true)
     end
   end
 end

data/db/migrate/20210717032330_create_cats_core_donations.rb

@@ -12,11 +12,19 @@ class CreateCatsCoreDonations < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'hrp_on_donation_indx' },
                    foreign_key: { to_table: :cats_core_hrps }
-      t.float :amount
+      t.float :amount, null: false
       t.references :currency,
                    null: true,
                    index: { name: 'currency_on_donation_indx' },
                    foreign_key: { to_table: :cats_core_currencies }
+      t.references :commodity_category,
+                   null: true,
+                   index: { name: 'cc_on_donation_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.references :unit_of_measure,
+                   null: true,
+                   index: { name: 'uom_on_donation_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
 
       t.timestamps
     end

data/db/migrate/20210717032602_create_cats_core_gift_certificates.rb

@@ -8,10 +8,6 @@ class CreateCatsCoreGiftCertificates < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'gc_on_donation_indx' },
                    foreign_key: { to_table: :cats_core_donations }
-      t.references :commodity_category,
-                   null: false,
-                   index: { name: 'gc_on_cc_indx' },
-                   foreign_key: { to_table: :cats_core_commodity_categories }
       
       t.string :vessel
       t.string :port

data/db/migrate/20210718045516_create_cats_core_dispatches.rb

@@ -20,6 +20,7 @@ class CreateCatsCoreDispatches < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'pb_on_dispatches_indx' },
                    foreign_key: { to_table: :cats_core_users }
+      t.string :dispatch_status, null: false
 
       t.timestamps
     end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.42'.freeze
+    VERSION = '1.0.46'.freeze
   end
 end

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

@@ -9,5 +9,6 @@ FactoryBot.define do
     quantity { 50 }
     remark { FFaker::Name.name }
     prepared_by factory: :user
+    dispatch_status { Cats::Core::Dispatch::DRAFT }
   end
 end

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

@@ -5,7 +5,9 @@ FactoryBot.define do
     donated_on { Date.today }
     donor
     hrp
-    amount { nil }
+    amount { 100 }
     currency { nil }
+    commodity_category
+    unit_of_measure
   end
 end

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

@@ -3,7 +3,6 @@ FactoryBot.define do
     reference_no { FFaker::Name.name }
     gift_date { Date.today - 1.month }
     donation
-    commodity_category
     vessel { FFaker::Name.name }
     port { FFaker::Name.name }
     customs_declaration_no { FFaker::Name.name }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.42
+  version: 1.0.46
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-19 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers