cats_core 1.1.14 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 849c78b04184a39a42337994d2cf68e4be874dff4e0420e34a890ce0584658cd
-  data.tar.gz: 85b1a1ff55a91d353329eaebb38e5ff19bb2590bfa8ab2942dd5feb31a7b11c6
+  metadata.gz: 9c73eb407823b6e404e576cd94dd8ac14228db71edce2fab923be1fc4a76752a
+  data.tar.gz: 43743939e2a9b6f3aaa3f27c5898e52619d7c00ec36896cd2d4c587a90ead623
 SHA512:
-  metadata.gz: 18cb896b37d1c7449e8955e7209bcf663e02b0e43d42fe0c7137f9f8a0e4be5ed1f664d8bc2b2f4e777e15b6f8b6c8efb57114cdb283cdffbc8f51dff6c75d7a
-  data.tar.gz: e477156c701bee3b6dfb5c337fb344bcb1e86d16978e0208e8a9616a7721af364ff63862045f85db2ac825dd8fc876b0198ec87f857a4844064cdf7336a8a315
+  metadata.gz: 224e70bc25588e883cdc642db7e85dfb18c2389a9f147ada262a3891feedaf595f827fe28fb8c092449ef2ec7f3c70c8dff4a7f20891fb4d5756ec61e363a2f8
+  data.tar.gz: 9eaf7c258dcf29107a7ec15c6db97c088dfa5569a3ceabcccd4c179f82c6edecc7e231139c403abe52577cea6153795ea0723eaab91d821c9b4726ccfe1c3399

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

@@ -16,7 +16,6 @@ module Cats
 
       belongs_to :unit_of_measure
       belongs_to :source, polymorphic: true
-      belongs_to :commodity_category
 
       validates :best_use_before, presence: true
       validates :batch_no, presence: true, uniqueness: true
@@ -25,7 +24,6 @@ module Cats
       validates :arrival_status, presence: true, inclusion: { in: ARRIVAL_STATUSES }
 
       delegate(:abbreviation, to: :unit_of_measure, prefix: true)
-      delegate(:name, to: :commodity_category, prefix: true)
       delegate(:reference_no, to: :source, prefix: true)
 
       def set_approved
@@ -33,6 +31,10 @@ module Cats
 
         self.approved = false
       end
+
+      def name
+        source.commodity_category.name
+      end
     end
   end
 end

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

@@ -2,10 +2,14 @@ module Cats
   module Core
     class GiftCertificate < ApplicationRecord
       belongs_to :donation
+      belongs_to :commodity_category
+      belongs_to :unit_of_measure
 
       validates :reference_no, presence: true, uniqueness: true
-      validates :gift_date, presence: true
+      validates :gift_date, :quantity, presence: true
+      validates :quantity, numericality: { greater_than: 0 }
 
+      before_save :set_commodity_category
       after_create :update_donation
 
       def update_donation
@@ -15,6 +19,14 @@ module Cats
         donation.active = true
         donation.save!
       end
+
+      def set_commodity_category
+        return unless donation
+
+        return if commodity_category == donation.commodity_category
+
+        self.commodity_category = donation.commodity_category
+      end
     end
   end
 end

data/app/serializers/cats/core/commodity_serializer.rb

@@ -1,9 +1,9 @@
 module Cats
   module Core
     class CommoditySerializer < ActiveModel::Serializer
-      attributes :id, :batch_no, :description, :unit_of_measure_id, :unit_of_measure_abbreviation, :source_id,
+      attributes :id, :name, :batch_no, :description, :unit_of_measure_id, :unit_of_measure_abbreviation, :source_id,
                  :source_type, :source_reference_no, :quantity, :best_use_before, :volume_per_metric_ton,
-                 :commodity_category_id, :commodity_category_name, :arrival_status, :approved
+                 :arrival_status, :approved
     end
   end
 end

data/db/migrate/20210717032602_create_cats_core_gift_certificates.rb

@@ -15,7 +15,15 @@ class CreateCatsCoreGiftCertificates < ActiveRecord::Migration[6.1]
       t.integer :purchase_year
       t.date :expiry_date
       t.string :bill_of_lading_no
-      t.float :amount, null: false
+      t.float :quantity, null: false
+      t.references :commodity_category,
+                   null: false,
+                   index: { name: 'gc_on_cc_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.references :unit_of_measure,
+                   null: false,
+                   index: { name: 'uom_on_gc_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
       t.float :estimated_price
       t.float :estimated_tax
 

data/db/migrate/20210717033223_create_cats_core_commodities.rb

@@ -6,10 +6,6 @@ class CreateCatsCoreCommodities < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'uom_on_commodities_indx' },
                    foreign_key: { to_table: :cats_core_unit_of_measures }
-      t.references :commodity_category,
-                   null: false,
-                   index: { name: 'cc_on_commodities_indx' },
-                   foreign_key: { to_table: :cats_core_commodity_categories }
       t.references :source, polymorphic: true
       t.float :quantity, null: false
       t.string :description

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.14'.freeze
+    VERSION = '1.1.15'.freeze
   end
 end

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

@@ -3,7 +3,6 @@ FactoryBot.define do
     batch_no { FFaker::Name.name }
     description { FFaker::Name.name }
     unit_of_measure
-    commodity_category
     source factory: :gift_certificate
     quantity { 100 }
     best_use_before { Date.today + 2.month }

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

@@ -3,13 +3,15 @@ FactoryBot.define do
     reference_no { FFaker::Name.name }
     gift_date { Date.today - 1.month }
     donation
+    commodity_category { donation.commodity_category }
+    unit_of_measure
     vessel { FFaker::Name.name }
     port { FFaker::Name.name }
     customs_declaration_no { FFaker::Name.name }
     purchase_year { 1 }
     expiry_date { Date.today + 6.month }
     bill_of_lading_no { FFaker::Name.name }
-    amount { 1.5 }
+    quantity { 1.5 }
     estimated_price { 1.5 }
     estimated_tax { 1.5 }
   end

metadata

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