cats_core 1.0.39 → 1.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbd96f5c771c2adceaa0d3c058ba5643b6e38189b4a5afdfbe666affab5a3c36
-  data.tar.gz: b55e4ab59388139d7c591194059f001af370df848077f446640ec3e1dc25f975
+  metadata.gz: bda6e203d5cc23b15dfdb7cf523a175b4a620b5bfb4e630e89c088bf220162f3
+  data.tar.gz: 2522727f3c712519f63681267b53405ce2b89a7dcdc599d1bc86810ce16b2bf5
 SHA512:
-  metadata.gz: '0812bb8e9484cc6dd7f375434c294e7f82320999a9a3ae7a5793c6ede1592fe9eefe50895892895cabe240d1c0fa12197dd9bf2479e1f816d8d31f3c98fe7575'
-  data.tar.gz: dc903f04dddb57c08c4c80c0a3c0135b85254a12bc634414a96eab76bdb39c85cf96e2f37abf47d4853b084651a843d45bd42b5cf2771d0667fdab152e260569
+  metadata.gz: eede7fe1153179c4f3349c0124cccfe6c97e49941ff0ab9a4465239bb5afd05ea40c6e6d156b2693c288d6a9de7ebbe049b05e98474f5d91c630808820fe74d7
+  data.tar.gz: 5c673873887a2cd373fc6c7fc586bd46477b9f377dfcab4b9328fc91cfb0ee515ac8c58ec3afd5139a7f99422019d68dbea709f24e6da8dfa312f2aecf23a33f

data/app/controllers/cats/core/locations_controller.rb

@@ -46,7 +46,7 @@ module Cats
       end
 
       def model_params
-        params.require(:payload).permit(:name, :location_type, :description, :parent_id)
+        params.require(:payload).permit(:code, :name, :location_type, :description, :parent_id)
       end
     end
   end

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/app/models/cats/core/hrp.rb

@@ -9,6 +9,7 @@ module Cats
       MEHER = 'Meher'.freeze
       SEASONS = [BELG, MEHER].freeze
 
+      belongs_to :program
       belongs_to :ration, optional: true
       has_many :hrp_items
 

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

@@ -5,6 +5,8 @@ module Cats
       belongs_to :woreda, -> { where(location_type: Cats::Core::Location::WOREDA) }, class_name: 'Cats::Core::Location'
       belongs_to :operator
 
+      has_many :hrp_item_details
+
       validates :beneficiaries, presence: true, numericality: { greater_than: 0 }
       validates :hrp_id, uniqueness: { scope: :woreda_id }
 

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

@@ -12,7 +12,8 @@ module Cats
 
       has_ancestry
 
-      validates :name, :location_type, presence: true
+      validates :code, :name, :location_type, presence: true
+      validates :code, uniqueness: true
       validates :location_type, inclusion: { in: LOCATION_TYPES }
       validate :validate_location_parent
 

data/db/migrate/20210716183620_create_cats_core_locations.rb

@@ -1,6 +1,7 @@
 class CreateCatsCoreLocations < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_locations do |t|
+      t.string :code, unique: true
       t.string :name, null: false
       t.string :location_type, null: false
       t.string :description

data/db/migrate/20210717031810_create_cats_core_hrps.rb

@@ -6,6 +6,10 @@ class CreateCatsCoreHrps < ActiveRecord::Migration[6.1]
       t.string :season, null: false
       t.string :status, null: false, default: 'Draft'
 
+      t.references :program,
+                   null: false,
+                   index: { name: 'program_on_hrp_indx' },
+                   foreign_key: { to_table: :cats_core_programs }
       t.references :ration,
                    null: true,
                    index: { name: 'ration_on_hrp_indx' },

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.39'.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

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

@@ -4,6 +4,7 @@ FactoryBot.define do
     year { 1 }
     season { Cats::Core::Hrp::BELG }
     status { Cats::Core::Hrp::DRAFT }
+    program
     ration
   end
 end

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

@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :location, class: 'Cats::Core::Location', aliases: [:parent] do
+    code { FFaker::Name.name }
     name { FFaker::Name.name }
     location_type { Cats::Core::Location::REGION }
     ancestry { nil }

metadata

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