cats_core 1.3.24 → 1.3.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2531c2f89fe44de09ddf14fd923e8d990a3e1926775eea0962b5a3d4787d7457
-  data.tar.gz: ec9cbed2a69e8f62884556108dbbc1ab448a360a7273fe2843f3fb754a3982c4
+  metadata.gz: 0b3911b5d99f63d3bf4e2f3b1f6a1a1cf64107affebb1eed6e33c69a51a38d28
+  data.tar.gz: 7be0d6a7f7dfe4e92541d44655a41d35450d9e782dc7b6436b52ecdca20f6647
 SHA512:
-  metadata.gz: 52d97959257855990865164a5f63ff2b529b17c97995de5c30ee658ae169ec8a77c3b3ff52a459b658e6dd4f93757ff1db4b64e2c33fb5de004dcd5106b688b6
-  data.tar.gz: 64edb99aecf7615a963971661748cdef7d62faf0d7450dcdebf0b2ffb1100373ce60a8aa79f261ed884542812530c60f1b8cefcdb4e5f21a59e0c296dec07ed5
+  metadata.gz: b828e8e63c64cd816007746b340ca942b875f702026e2d1949e3176f7235c7d373a8aedb782706a2921f1f918fef31ef3dc2df05ab4a80ef2072dd4e32c2d949
+  data.tar.gz: beac85a8bcfad3ab5278f99bcb91eab751ebfb82d7ac10feb00e67e753d4831ed8a8a9f8b49524c65e8f7dc4811bd3c0e0cc2451c65be220c4dea22bef21c511

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/purchase_order.rb

@@ -1,11 +1,18 @@
 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)
 

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/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.25'.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/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.25
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers