cats_core 1.0.42 → 1.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 459a3f07d1fadf11fb8120f91ecf18b2df1b7719e05a2e8398e0af664af1b19b
-  data.tar.gz: 92645ac2384a08e79db744e98e8179bcea78112c538c1b6444bbc0a6fa26d34e
+  metadata.gz: bda6e203d5cc23b15dfdb7cf523a175b4a620b5bfb4e630e89c088bf220162f3
+  data.tar.gz: 2522727f3c712519f63681267b53405ce2b89a7dcdc599d1bc86810ce16b2bf5
 SHA512:
-  metadata.gz: 265613d922d768384446ca0e38e3dfcae4ae2bb9f07a7f8a278ebbc3f2ec87fd8c96f08ae08a5ecc605ee9903701bf8d90f45ba5583524717b65f97ad3264509
-  data.tar.gz: 3a8236f40c2f028c8a7cff2abcf2d08c02eb598f577e71bedf8723841301c70cf0f8c0834d36fc1eff6b6a06dca0c6383d5e06e8bdfbed6b82ee747176ca9792
+  metadata.gz: eede7fe1153179c4f3349c0124cccfe6c97e49941ff0ab9a4465239bb5afd05ea40c6e6d156b2693c288d6a9de7ebbe049b05e98474f5d91c630808820fe74d7
+  data.tar.gz: 5c673873887a2cd373fc6c7fc586bd46477b9f377dfcab4b9328fc91cfb0ee515ac8c58ec3afd5139a7f99422019d68dbea709f24e6da8dfa312f2aecf23a33f

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

@@ -8,11 +8,14 @@ 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, :unit_of_measure, presence: true, if: -> { donation_type == KIND }
 
       delegate(:name, to: :donor, prefix: true)
       delegate(:reference_no, to: :hrp, prefix: true)

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/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.42'.freeze
+    VERSION = '1.0.43'.freeze
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.42
+  version: 1.0.43
 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