cats_core 1.0.44 → 1.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13bc9433b974cded9d6145d8bffc52e7669f3688b70ee861e5ad2c74110c3d2c
-  data.tar.gz: b8cdd5dae74d00d59ae9a75bf63aed63a8873dbd3a578b14c953ea2c52235a3a
+  metadata.gz: e0cb918631b3c8651aca92abc3209f968ce85fbb0e6408332ae5683b95130333
+  data.tar.gz: 3dca9a7897114e6bf7830951190ac504eaceb03e2f9bf1e3f7de1c5bd1158a5a
 SHA512:
-  metadata.gz: 2ae137b536163fbf766211a80ef278eebd5b4ab45023076b9c429594dd08cc5a976ad07bf3a063b11a3d601968112cd274385a54f1578cc10f9126589bfdb7a4
-  data.tar.gz: 1433945abdd51c8a3f367920cb7ebe63d291d71448f7d617324352c9bc958a16abfe3ae888f4237e42274db0dcc9f59e4fb4a626ebc13e0a6dc8a09373f9058f
+  metadata.gz: a8d658d04da98b1e5607be0843fdfde3663d7ea089b56b9fd7f073420ffa00715613426233c066ca1a92f503bfd8bbc8b9a91663f633ddb93b3e779d1546496a
+  data.tar.gz: 4aa0772c1ca60ec644476785dc96b3fe7639fcb77e2a97d76e6d757f0a44c6a8f8beb6738edd15361e4edeb41c6559f2ae9f6186bd20e601358fcf1cf1092ab9

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

@@ -3,6 +3,9 @@ module Cats
     class DispatchTransaction < Transaction
       belongs_to :source, class_name: 'Cats::Core::Stack'
       belongs_to :destination, class_name: 'Cats::Core::Dispatch'
+
+      delegate(:code, to: :source, prefix: true)
+      delegate(:reference_no, to: :destination, 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/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.44'.freeze
+    VERSION = '1.0.48'.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/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.44
+  version: 1.0.48
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers