cats_core 1.0.43 → 1.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bda6e203d5cc23b15dfdb7cf523a175b4a620b5bfb4e630e89c088bf220162f3
-  data.tar.gz: 2522727f3c712519f63681267b53405ce2b89a7dcdc599d1bc86810ce16b2bf5
+  metadata.gz: efb65bb9da37fbd6070d5844cdcd48c9c7c7e6a5b264c41e2103593e309838bd
+  data.tar.gz: 512001fdb9ddb2fa71fac19683b105632926a4cf75857b44a1a267c8710d02d9
 SHA512:
-  metadata.gz: eede7fe1153179c4f3349c0124cccfe6c97e49941ff0ab9a4465239bb5afd05ea40c6e6d156b2693c288d6a9de7ebbe049b05e98474f5d91c630808820fe74d7
-  data.tar.gz: 5c673873887a2cd373fc6c7fc586bd46477b9f377dfcab4b9328fc91cfb0ee515ac8c58ec3afd5139a7f99422019d68dbea709f24e6da8dfa312f2aecf23a33f
+  metadata.gz: 9f5188e5b7fbd88a26db6ee14473b199994b07fe42e475fea3b49fcb3dd63efe8beb07ad285733c9a9fcd14d1ef63740454905b4bd505c1217a02d7c3bb851b2
+  data.tar.gz: '082ab5a2755af2ce386e8c8636d1ae022fa6c486cd83d7da7410d74b26653d03f1d21f8ff5c79b936546f92bfc65c013fe781f5613e3ac8ae0c2ba895fbb7da0'

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

@@ -1,14 +1,19 @@
 module Cats
   module Core
     class Allocation < ApplicationRecord
+      DRAFT = 'Draft'.freeze
+      APPROVED = 'Approved'.freeze
+      ALLOCATION_STATUSES = [DRAFT, APPROVED].freeze
+
       belongs_to :rhn_request, optional: true
       belongs_to :commodity
       belongs_to :source, class_name: 'Cats::Core::Location'
 
-      validates :commodity_status, presence: true
+      validates :commodity_status, :allocation_status, presence: true
       validates :reference_no, presence: true, uniqueness: true
       validates :quantity, presence: true, numericality: { greater_than: 0 }
       validates :commodity_status, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
+      validates :allocation_status, inclusion: { in: ALLOCATION_STATUSES }
 
       delegate(:reference_no, to: :rhn_request, prefix: :rhn, allow_nil: true)
       delegate(:batch_no, to: :commodity, prefix: true)

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

@@ -1,14 +1,38 @@
 module Cats
   module Core
     class Dispatch < ApplicationRecord
+      DRAFT = 'Draft'.freeze
+      APPROVED = 'Approved'.freeze
+      STARTED = 'Started'.freeze
+      ARRIVED = 'Arrived'.freeze
+      UNLOADED = 'Unloaded'.freeze
+      RECEIVED = 'Received'.freeze
+
+      DISPATCH_STATUSES = [DRAFT, APPROVED, STARTED, ARRIVED, UNLOADED, RECEIVED].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 }
+      validate :validate_quantity
+
+      delegate(:name, to: :transporter, prefix: true)
+      delegate(:email, to: :prepared_by, prefix: true)
+
+      def validate_quantity
+        return unless quantity && allocation_item
+
+        return unless quantity_changed?
+
+        dispatched = Dispatch.where(allocation_item: allocation_item).sum(:quantity)
+        remaining = allocation_item.quantity - dispatched
+        errors.add(:quantity, "exceeds allocated quantity. Maximum allowed is #{remaining}") if quantity > remaining
+      end
     end
   end
 end

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/app/models/cats/core/store.rb

@@ -5,7 +5,8 @@ module Cats
       belongs_to :store_keeper, class_name: 'Cats::Core::User'
       has_many :stacks
 
-      validates :name, :length, :width, :height, presence: true
+      validates :code, :name, :length, :width, :height, presence: true
+      validates :code, uniqueness: true
       validates :length, :width, :height, numericality: { greater_than: 0 }
       validates :gangway_length, :gangway_width, :gangway_corner_dist, presence: true, if: :has_gangway?
       validates :gangway_length,

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/20210717140855_create_cats_core_stores.rb

@@ -1,6 +1,7 @@
 class CreateCatsCoreStores < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_stores do |t|
+      t.string :code, unique: true
       t.string :name, null: false
       t.float :length, null: false
       t.float :width, null: false

data/db/migrate/20210718042823_create_cats_core_allocations.rb

@@ -16,6 +16,7 @@ class CreateCatsCoreAllocations < ActiveRecord::Migration[6.1]
                    foreign_key: { to_table: :cats_core_locations }
       t.float :quantity, null: false
       t.string :commodity_status, null: false, default: 'Good'
+      t.string :allocation_status, null: false, default: 'Draft'
       t.string :remark
 
       t.timestamps

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.43'.freeze
+    VERSION = '1.0.47'.freeze
   end
 end

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

@@ -6,6 +6,7 @@ FactoryBot.define do
     source factory: :location
     quantity { 50 }
     commodity_status { Cats::Core::Commodity::GOOD }
+    allocation_status { Cats::Core::Allocation::DRAFT }
     remark { FFaker::Name.name }
   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/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/stores.rb

@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :store, class: 'Cats::Core::Store' do
+    code { FFaker::Name.name }
     name { FFaker::Name.name }
     length { 50 }
     width { 40 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.43
+  version: 1.0.47
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers