cats_core 1.0.45 → 1.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 296c1ea2692ccbfda9597044d6dd6f92a26dae42d008448d492a38b746906bc5
-  data.tar.gz: 37594e0dff5425a1f6e037cf427793b1ca6af54b6fe1b2a04e00b139a96b5417
+  metadata.gz: 88f88c106a10c160703ee6898947a371aef510da88eea9aa514ff93e20c4e806
+  data.tar.gz: 2baa107b490e7372ed823c6d8fec83e91a19de41f77a48cd187e99eb2dc934bf
 SHA512:
-  metadata.gz: af90696c4bfd02c65eb3b5d37a0be9a446d4a627e75c10ab2925d42038ff7113dfd2f56b8fd47403ffabeb106066e0644202f64cca49611956819eaf898989d3
-  data.tar.gz: '007480b8cb6ded9688d94736634593e3004e6a1dc874a9e34d05674b9580c937046922d6dffd9a1d812501d09c2a188f4929ad9f23371ac82d43664a14653c55'
+  metadata.gz: f12a36ca3a10c537f09e6fd12b07e66d70b0bc69692badb2f9a0de6642d1b91f308ba53754456ecf35da935c7a380af3e7237bdda35690177ae0823acab8ef60
+  data.tar.gz: fdb2ed8c53e2d0c2e554017dce091be7056004b28a9dc3b0cbc6c4e343855957afcb64de644ccefc7649372c5c29584f98f9fc78ba9f0b0e6bb24bb96c434458

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

@@ -4,8 +4,11 @@ module Cats
       DRAFT = 'Draft'.freeze
       APPROVED = 'Approved'.freeze
       STARTED = 'Started'.freeze
+      ARRIVED = 'Arrived'.freeze
+      UNLOADED = 'Unloaded'.freeze
+      RECEIVED = 'Received'.freeze
 
-      DISPATCH_STATUSES = [DRAFT, APPROVED, STARTED].freeze
+      DISPATCH_STATUSES = [DRAFT, APPROVED, STARTED, ARRIVED, UNLOADED, RECEIVED].freeze
 
       belongs_to :prepared_by, class_name: 'Cats::Core::User'
       belongs_to :transporter
@@ -16,6 +19,20 @@ module Cats
       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/app/models/cats/core/transaction.rb

@@ -2,6 +2,7 @@ module Cats
   module Core
     class Transaction < ApplicationRecord
       self.abstract_class = true
+      after_initialize :set_status
 
       # Transaction statuses
       DRAFT = 'Draft'.freeze
@@ -25,8 +26,16 @@ module Cats
           destination.quantity += quantity
           source.save
           destination.save
+          self.status = COMMITTED
+          save
         end
       end
+
+      def set_status
+        return unless new_record?
+
+        self.status = DRAFT
+      end
     end
   end
 end

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/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.45'.freeze
+    VERSION = '1.0.49'.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/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.45
+  version: 1.0.49
 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