cats_core 1.3.24 → 1.3.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2531c2f89fe44de09ddf14fd923e8d990a3e1926775eea0962b5a3d4787d7457
-  data.tar.gz: ec9cbed2a69e8f62884556108dbbc1ab448a360a7273fe2843f3fb754a3982c4
+  metadata.gz: 83f9bfdc22317ca433717055d41463cf8d70aed78994c62a9a924bcead85c561
+  data.tar.gz: ffcb5a3122bd29126aa6902388af57a8979b414fa8378f5bd9f4c364aea6029d
 SHA512:
-  metadata.gz: 52d97959257855990865164a5f63ff2b529b17c97995de5c30ee658ae169ec8a77c3b3ff52a459b658e6dd4f93757ff1db4b64e2c33fb5de004dcd5106b688b6
-  data.tar.gz: 64edb99aecf7615a963971661748cdef7d62faf0d7450dcdebf0b2ffb1100373ce60a8aa79f261ed884542812530c60f1b8cefcdb4e5f21a59e0c296dec07ed5
+  metadata.gz: 5b77e70633822f0dcc6db6caedd36c1f7baecd232b466a1bc975c02b29c32e7129fd6d767e800a5dd1c7b17ff9e2da9250f74d136797591a9c19043b07bddd8d
+  data.tar.gz: 2d29e1087a864c93d57a050f5fa6df3ff993abd63b060604f88bc7d2df282aa94ca5f48e1183b852a2974c1e5c0b36d5fd94082f3517181f1a2023363fb819bb

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

@@ -14,9 +14,19 @@ module Cats
 
       # Arrival Statuses
       AT_SOURCE = 'At Source'.freeze
-      IN_TRANSIT = 'In Transit'.freeze
+      AT_ORIGIN_PORT = 'At Origin Port'.freeze
+      IN_LOCAL_TRANSIT = 'In Local Transit'.freeze
+      IN_INTERNATIONAL_TRANSIT = 'In International Transit'.freeze
+      AT_DESTINATION_PORT = 'At Destination Port'.freeze
       ARRIVED = 'Arrived'.freeze
-      ARRIVAL_STATUSES = [AT_SOURCE, IN_TRANSIT, ARRIVED].freeze
+      ARRIVAL_STATUSES = [
+        AT_SOURCE,
+        AT_ORIGIN_PORT,
+        IN_LOCAL_TRANSIT,
+        IN_INTERNATIONAL_TRANSIT,
+        AT_DESTINATION_PORT,
+        ARRIVED
+      ].freeze
 
       belongs_to :unit_of_measure
       belongs_to :source, polymorphic: true

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

@@ -19,6 +19,10 @@ module Cats
       delegate(:request_reference, to: :dispatchable, allow_nil: true)
       delegate(:request_quantity, to: :dispatchable, allow_nil: true)
 
+      before_save do |plan|
+        plan.upstream = !plan.dispatchable.nil? && plan.dispatchable_type == RhnRequest.name
+      end
+
       def approve
         raise(StandardError, 'Dispatch plan already approved.') if status == APPROVED
 

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

@@ -11,7 +11,7 @@ module Cats
       belongs_to :commodity_category, optional: true
       belongs_to :unit_of_measure, optional: true
 
-      validates :reference_no, :amount, :donation_type, :donated_on, presence: true
+      validates :reference_no, :amount, :donation_type, :donated_on, :agency, presence: true
       validates :reference_no, uniqueness: true
       validates :donation_type, inclusion: { in: DONATION_TYPES }
       validates :currency, presence: true, if: -> { donation_type == CASH }

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

@@ -4,9 +4,10 @@ module Cats
       belongs_to :donation, optional: true
       belongs_to :commodity_category
       belongs_to :unit_of_measure
+      belongs_to :destination_warehouse, class_name: 'Cats::Core::Location'
 
       validates :reference_no, presence: true, uniqueness: true
-      validates :gift_date, :quantity, presence: true
+      validates :gift_date, :quantity, :requested_by, :request_reference, presence: true
       validates :quantity, numericality: { greater_than: 0 }
 
       delegate(:name, to: :commodity_category, prefix: true)

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

@@ -1,13 +1,21 @@
 module Cats
   module Core
     class PurchaseOrder < ApplicationRecord
+      LOCAL = 'Local'.freeze
+      FOREIGN = 'Foreign'.freeze
+      PURCHASE_TYPES = [LOCAL, FOREIGN].freeze
+
       belongs_to :donation
       belongs_to :commodity_category
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
 
-      validates :reference_no, :order_date, :supplier, presence: true
+      validates :reference_no, :order_date, :supplier, :quantity, :purchase_type, presence: true
       validates :reference_no, uniqueness: true
+      validates :purchase_type, inclusion: { in: PURCHASE_TYPES }
+      validates :quantity, numericality: { greater_than: 0 }
 
       delegate(:name, to: :commodity_category, prefix: true)
+      delegate(:name, to: :unit, prefix: true)
 
       after_create :update_donation
 

data/app/services/cats/core/dispatch_plan_service.rb

@@ -4,7 +4,7 @@ module Cats
       def approve(plan)
         plan.approve
 
-        plan.dispatchable.allocate if plan.dispatchable_type == Cats::Core::RhnRequest.name
+        plan.dispatchable.allocate if plan.dispatchable_type == RhnRequest.name
         # send_notification(plan)
         plan
       end

data/db/migrate/20210717032330_create_cats_core_donations.rb

@@ -4,7 +4,9 @@ class CreateCatsCoreDonations < ActiveRecord::Migration[6.1]
       t.string :reference_no, unique: true
       t.string :description
       t.string :donation_type, null: false
+      t.string :shipping_reference
       t.date :donated_on, null: false
+      t.string :agency, null: false
       t.references :donor,
                    null: false,
                    index: { name: 'donor_on_donation_indx' },

data/db/migrate/20210717032602_create_cats_core_gift_certificates.rb

@@ -24,8 +24,15 @@ class CreateCatsCoreGiftCertificates < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'uom_on_gc_indx' },
                    foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.references :destination_warehouse,
+                   null: false,
+                   index: { name: 'dw_on_gc_indx' },
+                   foreign_key: { to_table: :cats_core_locations }
       t.float :estimated_price
       t.float :estimated_tax
+      t.string :registration_no
+      t.string :requested_by, null: false
+      t.string :request_reference, null: false
 
       t.timestamps
     end

data/db/migrate/20210717032855_create_cats_core_purchase_orders.rb

@@ -5,6 +5,8 @@ class CreateCatsCorePurchaseOrders < ActiveRecord::Migration[6.1]
       t.date :order_date, null: false
       t.string :requisition_no
       t.string :supplier, null: false
+      t.float :quantity, null: false
+      t.string :purchase_type, null: false
 
       t.references :donation,
                    null: false,
@@ -14,6 +16,10 @@ class CreateCatsCorePurchaseOrders < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'po_on_cc_indx' },
                    foreign_key: { to_table: :cats_core_commodity_categories }
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_po_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
 
       t.timestamps
     end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.3.24'.freeze
+    VERSION = '1.3.28'.freeze
   end
 end

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

@@ -7,5 +7,9 @@ FactoryBot.define do
     commodity
     prepared_by factory: :user
     approved_by { nil }
+
+    trait :with_rhn do
+      dispatchable { create(:rhn_request) }
+    end
   end
 end

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

@@ -3,7 +3,9 @@ FactoryBot.define do
     reference_no { FFaker::Name.name }
     description { FFaker::Name.name }
     donation_type { Cats::Core::Donation::KIND }
+    shipping_reference { FFaker::Name.name }
     donated_on { Date.today }
+    agency { 'WFP' }
     donor
     plan
     amount { 100 }

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

@@ -5,6 +5,7 @@ FactoryBot.define do
     donation
     commodity_category { donation.commodity_category }
     unit_of_measure
+    destination_warehouse factory: :warehouse
     vessel { FFaker::Name.name }
     port { FFaker::Name.name }
     customs_declaration_no { FFaker::Name.name }
@@ -14,5 +15,8 @@ FactoryBot.define do
     quantity { 1.5 }
     estimated_price { 1.5 }
     estimated_tax { 1.5 }
+    registration_no { FFaker::Name.name }
+    requested_by { FFaker::Name.name }
+    request_reference { FFaker::Name.name }
   end
 end

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

@@ -4,7 +4,10 @@ FactoryBot.define do
     order_date { Date.today }
     requisition_no { FFaker::Name.name }
     supplier { FFaker::Name.name }
+    quantity { 100 }
+    purchase_type { Cats::Core::PurchaseOrder::LOCAL }
     donation
     commodity_category
+    unit factory: :unit_of_measure
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.24
+  version: 1.3.28
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers