cats_core 1.0.22 → 1.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7847bbf4c0a83ac387d2b9e7bc1f8f4b4ffe184d12f9611ee60c6f14d1fe3078
-  data.tar.gz: 319c387eeddbd6342b1b4fe14ea921e7c3e686243feded978cad60d96c9756ad
+  metadata.gz: 3f7140f7b94aaf47e0b5cfcb9ad89515a6884a6f59c685d7bf3b10978d2239e8
+  data.tar.gz: d10e11f6f3506f4513921bb85814d1303bea873558c8603241b87df4474aa777
 SHA512:
-  metadata.gz: 5ec1c786270a96caa0097f2cd8c95d4a14e88b255d2def862f246770c36fd6956fc6b9e401ea931c4a306c0444c1ca9487fd64439769810249730c407b1e2ecb
-  data.tar.gz: eafd2a9293936dab8f7130c9428598fdc88fffb4b7a294e3f381fb08f985d9b379e5d268aa340ab5cfce4952da6c6b10b8b4b829cce8309268f48fb26de3b7ba
+  metadata.gz: 6a63abe18b61954481d0e758aa4a714bc201d2270febe2b86c157806c8ba9a7dafc44399177079fe5bf5bfed3dc916634cfae1a711ab3030ee8c2a95cc9c514a
+  data.tar.gz: 0ec75ce43af82a2dd05e1b3d7836893e273741c7cbb2bc074e49582cf0231b9105d8e4d9b0f0d44a08760dd40cb9bdd83e8b1bbcb4dbbce47ae3711417de64d1

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

@@ -1,17 +1,37 @@
 module Cats
   module Core
     class Commodity < ApplicationRecord
+      after_initialize :set_approved
+
       # Commodity statuses
       GOOD = 'Good'.freeze
       DAMAGED = 'Damaged'.freeze
       COMMODITY_STATUSES = [GOOD, DAMAGED].freeze
 
+      # Arrival Statuses
+      AT_SOURCE = 'At Source'.freeze
+      IN_TRANSIT = 'In Transit'.freeze
+      ARRIVED = 'Arrived'.freeze
+      ARRIVAL_STATUSES = [AT_SOURCE, IN_TRANSIT, ARRIVED].freeze
+
       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
       validates :quantity, presence: true, numericality: { greater_than: 0 }
       validates :volume_per_metric_ton, numericality: { greater_than: 0, allow_nil: true }
+      validates :arrival_status, presence: true, inclusion: { in: ARRIVAL_STATUSES }
+
+      delegate(:abbreviation, to: :unit_of_measure, prefix: true)
+      delegate(:name, to: :commodity_category, prefix: true)
+
+      def set_approved
+        return unless new_record?
+
+        self.approved = false
+      end
     end
   end
 end

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

@@ -13,6 +13,9 @@ module Cats
       validates :reference_no, uniqueness: true
       validates :donation_type, inclusion: { in: DONATION_TYPES }
       validates :currency, :amount, presence: true, if: -> { donation_type == CASH }
+
+      delegate(:name, to: :donor, prefix: true)
+      delegate(:reference_no, to: :hrp, prefix: true)
     end
   end
 end

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

@@ -6,6 +6,8 @@ module Cats
 
       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/purchase_order.rb

@@ -6,6 +6,8 @@ module Cats
 
       validates :reference_no, :order_date, :supplier, presence: true
       validates :reference_no, uniqueness: true
+
+      delegate(:name, to: :commodity_category, prefix: true)
     end
   end
 end

data/db/migrate/20210717033223_create_cats_core_commodities.rb

@@ -1,15 +1,22 @@
 class CreateCatsCoreCommodities < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_commodities do |t|
+      t.string :batch_no, unique: true
       t.references :unit_of_measure,
                    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
       t.date :best_use_before, null: false
       t.float :volume_per_metric_ton
+      t.string :arrival_status, null: false, default: 'At Source'
+      t.boolean :approved, null: false, default: false
 
       t.timestamps
     end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.22'.freeze
+    VERSION = '1.0.26'.freeze
   end
 end

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

@@ -1,10 +1,14 @@
 FactoryBot.define do
   factory :commodity, class: 'Cats::Core::Commodity' 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 }
     volume_per_metric_ton { 10 }
+    arrival_status { Cats::Core::Commodity::AT_SOURCE }
+    approved { false }
   end
 end

metadata

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