cats_core 1.0.40 → 1.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37b5451e19e51157d009365bb31175b4d944c3571fcb0d9b6ec3d3dcebb7289d
-  data.tar.gz: 8b98610327bb324b7804b837c446883eb2853faeb244686bababae44d71b02ff
+  metadata.gz: 13bc9433b974cded9d6145d8bffc52e7669f3688b70ee861e5ad2c74110c3d2c
+  data.tar.gz: b8cdd5dae74d00d59ae9a75bf63aed63a8873dbd3a578b14c953ea2c52235a3a
 SHA512:
-  metadata.gz: 132f9f7a5af86d83a87a8410490dcc0bd1a2134feb1da3fa8dd3eabe3508e9359369e0ec5aa15918e072fe5769f5645229f006c39c7fd070cbfb756b3ee3fad4
-  data.tar.gz: 218d19acc42b5508c85f9b4e1f3c5b4112bf85b120114038d4f30af3ed4631d92e5dccee8c1f26931b24122d93c62a95ec92bf438785166da69c240306b0cc69
+  metadata.gz: 2ae137b536163fbf766211a80ef278eebd5b4ab45023076b9c429594dd08cc5a976ad07bf3a063b11a3d601968112cd274385a54f1578cc10f9126589bfdb7a4
+  data.tar.gz: 1433945abdd51c8a3f367920cb7ebe63d291d71448f7d617324352c9bc958a16abfe3ae888f4237e42274db0dcc9f59e4fb4a626ebc13e0a6dc8a09373f9058f

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,14 +8,21 @@ 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, presence: true, if: -> { donation_type == KIND }
+      validates :unit_of_measure, presence: true, if: -> { donation_type == KIND }
 
       delegate(:name, to: :donor, prefix: true)
       delegate(:reference_no, to: :hrp, prefix: true)
+      delegate(:name, to: :commodity_category, prefix: true, allow_nil: true)
+      delegate(:code, to: :currency, prefix: true, allow_nil: true)
+      delegate(:abbreviation, to: :unit_of_measure, prefix: true, allow_nil: true)
     end
   end
 end

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

@@ -2,12 +2,9 @@ module Cats
   module Core
     class GiftCertificate < ApplicationRecord
       belongs_to :donation
-      belongs_to :commodity_category
 
       validates :reference_no, presence: true, uniqueness: true
       validates :gift_date, presence: true
-
-      delegate(:name, to: :commodity_category, prefix: true)
     end
   end
 end

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/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/db/migrate/20210717032602_create_cats_core_gift_certificates.rb

@@ -8,10 +8,6 @@ class CreateCatsCoreGiftCertificates < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'gc_on_donation_indx' },
                    foreign_key: { to_table: :cats_core_donations }
-      t.references :commodity_category,
-                   null: false,
-                   index: { name: 'gc_on_cc_indx' },
-                   foreign_key: { to_table: :cats_core_commodity_categories }
       
       t.string :vessel
       t.string :port

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.40'.freeze
+    VERSION = '1.0.44'.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/gift_certificates.rb

@@ -3,7 +3,6 @@ FactoryBot.define do
     reference_no { FFaker::Name.name }
     gift_date { Date.today - 1.month }
     donation
-    commodity_category
     vessel { FFaker::Name.name }
     port { FFaker::Name.name }
     customs_declaration_no { FFaker::Name.name }

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.40
+  version: 1.0.44
 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