cats_core 1.0.43 → 1.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bda6e203d5cc23b15dfdb7cf523a175b4a620b5bfb4e630e89c088bf220162f3
-  data.tar.gz: 2522727f3c712519f63681267b53405ce2b89a7dcdc599d1bc86810ce16b2bf5
+  metadata.gz: 13bc9433b974cded9d6145d8bffc52e7669f3688b70ee861e5ad2c74110c3d2c
+  data.tar.gz: b8cdd5dae74d00d59ae9a75bf63aed63a8873dbd3a578b14c953ea2c52235a3a
 SHA512:
-  metadata.gz: eede7fe1153179c4f3349c0124cccfe6c97e49941ff0ab9a4465239bb5afd05ea40c6e6d156b2693c288d6a9de7ebbe049b05e98474f5d91c630808820fe74d7
-  data.tar.gz: 5c673873887a2cd373fc6c7fc586bd46477b9f377dfcab4b9328fc91cfb0ee515ac8c58ec3afd5139a7f99422019d68dbea709f24e6da8dfa312f2aecf23a33f
+  metadata.gz: 2ae137b536163fbf766211a80ef278eebd5b4ab45023076b9c429594dd08cc5a976ad07bf3a063b11a3d601968112cd274385a54f1578cc10f9126589bfdb7a4
+  data.tar.gz: 1433945abdd51c8a3f367920cb7ebe63d291d71448f7d617324352c9bc958a16abfe3ae888f4237e42274db0dcc9f59e4fb4a626ebc13e0a6dc8a09373f9058f

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

@@ -15,10 +15,14 @@ module Cats
       validates :reference_no, uniqueness: true
       validates :donation_type, inclusion: { in: DONATION_TYPES }
       validates :currency, presence: true, if: -> { donation_type == CASH }
-      validates :commodity_category, :unit_of_measure, presence: true, if: -> { donation_type == KIND }
+      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/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.43'.freeze
+    VERSION = '1.0.44'.freeze
   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 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.43
+  version: 1.0.44
 platform: ruby
 authors:
 - Henock L.