cats_core 1.3.23 → 1.3.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c3f37fca9f63d54dbce888d0beaeb5e3bbd96ac1e1052011433711c2d1b126a
-  data.tar.gz: b018b4b1903cb423c01a37eefc6ec109db0757294b5179f3eb1faba0b30dd6e4
+  metadata.gz: 1076d840160f1faee39901d7f1d9ccf7926c0413739ebed870a740c66f2e2f08
+  data.tar.gz: cfb54300abc22e4889a0cd75c83c47bf355f089cf84ca7645f743ee65ea4b69a
 SHA512:
-  metadata.gz: 047d73951d974a609d6caa7c1d76b1ce156d4c2d47e446fc16821732dfdcf0a017eff53dac8c7f64eae1cec0534e9e4cc651cf46f084fdb81892c64245c170d6
-  data.tar.gz: 6e515febfd96c18ab7876fa0ab92c511f34e96c31e3241419b2bd3a2bf5789f65894e958621a16b5a7ae1c35cd00a91640202aaf66213971ba9f0517c29f5b46
+  metadata.gz: 6e68a5e3f35ea31220701ca97df067eb03a16983ff8b32431b7a04c415d1ca1ea09b1943149cd098d52b3c704ca2a5ca0b9ca363e2bc3db5a92d1871e2202a11
+  data.tar.gz: 5d90ebf4ed67ee13e9a351e7feea4d90429f6299e40a7349d23faf033ec1a41bcf6aed6c7023bb965451378d28242675c6af099a0d67d331ca053466b624f1c7

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/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/serializers/cats/core/transporter_serializer.rb

@@ -1,3 +1,7 @@
-class TransporterSerializer < ActiveModel::Serializer
-  attributes :id, :code, :name, :address, :contact_phone
+module Cats
+  module Core
+    class TransporterSerializer < ActiveModel::Serializer
+      attributes :id, :code, :name, :address, :contact_phone
+    end
+  end
 end

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

@@ -5,6 +5,7 @@ class CreateCatsCoreDonations < ActiveRecord::Migration[6.1]
       t.string :description
       t.string :donation_type, null: false
       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/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.23'.freeze
+    VERSION = '1.3.27'.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

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

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.23
+  version: 1.3.27
 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