cats_core 1.0.23 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdf3896b40c9ff598fa14a38d5f7a32b6dab30c3e72f7f3b16b480579df3a073
-  data.tar.gz: d60e1032a3b708fa85a8372e58e899f45ec41fee42ce909c4b3117278c44ee59
+  metadata.gz: 970aba78ce14d116f4047df8371d5ca03949f5a668bd2c613cdfb494e652e9e4
+  data.tar.gz: ca25ae5f908ba942045b39f91679a8e365cd171541d008e088e46ff3d8a166e9
 SHA512:
-  metadata.gz: 8364011f2d5dc631bcfa08396111bec092f85d37baba59fc327c993bf73b98a3d555432670be77d0933834be539c4c113df156df0d51378a44a881583d954400
-  data.tar.gz: '034875a3d26227194eca732e64a360635696d18141c285ff769f66bccdfc3e09508da840f01d0866a9b76939c8f54ca78be4dfedeb6f0ce5726cb3f2dbb06785'
+  metadata.gz: c353f8a17d427a846408ad27ea90c6d3114179ff4634e7b2e8410f058861bf70114be3d75c2992da2be24bf16649d5b4f3717a52b9e901db3945d51f5d08ddbc
+  data.tar.gz: 79f09a8add5e295b1fe5414137c4986e70f74e01613bb75291f5f802380fbbc5b3ed4b588fa4e79bb75863f885462e195b24a5ca25bd12d705e39e821bca5710

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

@@ -1,17 +1,38 @@
 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)
+      delegate(:reference_no, to: :source, prefix: true)
+
+      def set_approved
+        return unless new_record?
+
+        self.approved = false
+      end
     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.23'.freeze
+    VERSION = '1.0.27'.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.23
+  version: 1.0.27
 platform: ruby
 authors:
 - Henock L.