cats_core 1.0.46 → 1.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f434d12f124bafbd6d7e1800ccb5ef123afc5a41d496e1fbe3e8f241fc17cbb
-  data.tar.gz: d73d97c1d94a4bddb94b3f7a9608b16b1f3311d86ffafeb50008737a02f6a07a
+  metadata.gz: b13a3549ac212c8e869ce5aff6b3508787e75af7afaeadba4b0e99f5476b101e
+  data.tar.gz: d4993f0e36936fc4ed18ae9accca173189056c3cddae7fc2f16704f6509bac80
 SHA512:
-  metadata.gz: aaa5cc4c199c9d2aff261b684fa8036dbc6313dd66885adea3584efe667f3892fb21332fde6725361d30939fd3d837d389ed005021b93af97d35e40723129e28
-  data.tar.gz: f9d62619ee798259d384788386873b11279e3f30ac5e9ad18fcbe4713dae6e454190aaf816e3e4adf5eb06f7ddd5735c908329ccf89293c6ec79cf488f9628a4
+  metadata.gz: 91d4ba5e59ef7da90cf36d6073d20819496bae612eff73cdeccada481293a956311732201b049da61e84ba1c12b1a7464d636202b101f66a49bcf22146211440
+  data.tar.gz: afdceef95b3321eaea7ebad43bd622b814ef268f97b20c5815af07376fc710b338b74a25bc3e81d6c4b366f00e30e6553c2f2dcc38e84685bc670201ce4e4e13

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,9 +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/app/services/cats/core/space_service.rb

@@ -8,7 +8,9 @@ module Cats
       def available_space(id, level)
         case level
         when HUB
-          warehouse_ids = Cats::Core::Location.find(id).children.map(&:id)
+          hub = Cats::Core::Location.find(id)
+          warehouses = hub.children
+          warehouse_ids = warehouses.map(&:id)
           stores = Cats::Core::Store.joins(:warehouse)
                                     .where(
                                       cats_core_locations: {
@@ -19,19 +21,48 @@ module Cats
           wh_details = []
           stores.each do |key, value|
             total_space = value.inject(0) { |sum, val| sum + val.available_space }
-            details = value.map { |val| { store_id: val.id, total_space: val.available_space } }
-            wh_details << { warehouse_id: key, total_space: total_space, details: details }
+            details = value.map do |val|
+              { store_id: val.id, code: val.code, name: val.name, total_space: val.available_space }
+            end
+            warehouse = warehouses.find(key)
+            wh_details << {
+              warehouse_id: key,
+              code: warehouse.code,
+              name: warehouse.name,
+              total_space: total_space,
+              details: details
+            }
           end
           hub_space = wh_details.inject(0) { |sum, val| sum + val[:total_space] }
-          space = { hub_id: id, total_space: hub_space, details: wh_details }
+          space = {
+            hub_id: id,
+            code: hub.code,
+            name: hub.name,
+            total_space: hub_space,
+            details: wh_details
+          }
         when WAREHOUSE
+          warehouse = Cats::Core::Location.find(id)
           stores = Cats::Core::Store.where(warehouse_id: id)
-          details = stores.map { |store| { store_id: store.id, total_space: store.available_space } }
+          details = stores.map do |store|
+            { store_id: store.id, code: store.code, name: store.name, total_space: store.available_space }
+          end
           total_space = stores.inject(0) { |sum, val| sum + val.available_space }
-          space = { warehouse_id: id, total_space: total_space, details: details }
+          space = {
+            warehouse_id: id,
+            code: warehouse.code,
+            name: warehouse.name,
+            total_space: total_space,
+            details: details
+          }
         when STORE
           store = Cats::Core::Store.find(id)
-          space = { store_id: store.id, total_space: store.available_space }
+          space = {
+            store_id: store.id,
+            code: store.code,
+            name: store.name,
+            total_space: store.available_space
+          }
         end
         space
       end

data/config/routes.rb

@@ -33,11 +33,11 @@ Cats::Core::Engine.routes.draw do
       to: 'spaces#available_space',
       as: :hub_space, 
       defaults: { level: Cats::Core::SpaceService::HUB }
-  get '/warehousess/:id/space',
+  get '/warehouses/:id/space',
       to: 'spaces#available_space',
       as: :warehouse_space,
       defaults: { level: Cats::Core::SpaceService::WAREHOUSE }
-  get '/store/:id/space',
+  get '/stores/:id/space',
       to: 'spaces#available_space',
       as: :store_space,
       defaults: { level: Cats::Core::SpaceService::STORE }

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.46'.freeze
+    VERSION = '1.0.50'.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.46
+  version: 1.0.50
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers