cats_core 1.0.41 → 1.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a3d6fa190673652349c149ea87b314da07a74f00c600d774f2911ca4da24a35
-  data.tar.gz: 7c29148233b0fc4a2e9efc1c114cb02910967d679420cfa5f40aca7eb0a92083
+  metadata.gz: 296c1ea2692ccbfda9597044d6dd6f92a26dae42d008448d492a38b746906bc5
+  data.tar.gz: 37594e0dff5425a1f6e037cf427793b1ca6af54b6fe1b2a04e00b139a96b5417
 SHA512:
-  metadata.gz: f37e6d2c1f1ff4d5c75df983a259c739d65de04d8d6da3f853dbe8994133f9ec7779c7b0948130ec9081e7127de062287271aa69703f0c5aa790588af6110a58
-  data.tar.gz: 7b4f03e36d240e6ae05d04f46c9cef15f9ec86c0cf6f1bbc871eda27fa5f5d5cd9d0971f016a55ef97e8a7b71413d88ec9d1d156bb376506ad8e68e57be83d21
+  metadata.gz: af90696c4bfd02c65eb3b5d37a0be9a446d4a627e75c10ab2925d42038ff7113dfd2f56b8fd47403ffabeb106066e0644202f64cca49611956819eaf898989d3
+  data.tar.gz: '007480b8cb6ded9688d94736634593e3004e6a1dc874a9e34d05674b9580c937046922d6dffd9a1d812501d09c2a188f4929ad9f23371ac82d43664a14653c55'

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/dispatch.rb

@@ -1,11 +1,18 @@
 module Cats
   module Core
     class Dispatch < ApplicationRecord
+      DRAFT = 'Draft'.freeze
+      APPROVED = 'Approved'.freeze
+      STARTED = 'Started'.freeze
+
+      DISPATCH_STATUSES = [DRAFT, APPROVED, STARTED].freeze
+
       belongs_to :prepared_by, class_name: 'Cats::Core::User'
       belongs_to :transporter
       belongs_to :allocation_item
 
       validates :reference_no, :plate_no, :driver_name, :driver_phone, :quantity, :commodity_status, presence: true
+      validates :dispatch_status, presence: true, inclusion: { in: DISPATCH_STATUSES }
       validates :reference_no, uniqueness: true
       validates :quantity, numericality: { greater_than: 0 }
       validates :commodity_status, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }

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/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/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/db/migrate/20210718045516_create_cats_core_dispatches.rb

@@ -20,6 +20,7 @@ class CreateCatsCoreDispatches < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'pb_on_dispatches_indx' },
                    foreign_key: { to_table: :cats_core_users }
+      t.string :dispatch_status, null: false
 
       t.timestamps
     end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.41'.freeze
+    VERSION = '1.0.45'.freeze
   end
 end

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

@@ -9,5 +9,6 @@ FactoryBot.define do
     quantity { 50 }
     remark { FFaker::Name.name }
     prepared_by factory: :user
+    dispatch_status { Cats::Core::Dispatch::DRAFT }
   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/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.41
+  version: 1.0.45
 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