cats_core 1.0.32 → 1.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b481d401018e6fdfdf93be24ee465d117e45b4a888e4e4a0e079f3aa4654009a
-  data.tar.gz: dae45a28258a5125762192e4bd2579ed2b5c486ea74271dac1437ee4bea5c2b1
+  metadata.gz: c909272a932180976b058fc2514d349d48677862c5bee425d97e1ebb1d92f30e
+  data.tar.gz: 57060b872361ba7f38b5bffe9522241ccb147bb3fac27b7e593288937a771672
 SHA512:
-  metadata.gz: 2404e609083ccfe957927a8a7fbc9355eaa564f2aa2620af2eac779a10457b11661d1db34a8b6bdb27ad3b60ff2ba717dce8e35627688f2590bd2c292d17079f
-  data.tar.gz: d2748d191c6ac70a5977acf13b3647a0387dcd80dfeaa4dfb03c88244a845b353aeffd25cd6856ba5d1a3c2934ed5a8a85b71ab82e2cdde2f1ddc56afd14ae66
+  metadata.gz: af510c6f846701bea55bd995f6ccf3d34500c11c8a23cdac2df2f89f258170c4f93fb31c9242eaf927ed3a24a5e499fdd2c995ca1d2c178d9e39c60364e6d072
+  data.tar.gz: 19dff931a8a64a71870263e2193709f541ea530110ac852ef0c751bca2e8739d996c8da2ad53c3465d720ad2167a34ead9c9cca36cd42956db7abecf6b1b37fa

data/app/controllers/cats/core/spaces_controller.rb

@@ -0,0 +1,11 @@
+module Cats
+  module Core
+    class SpacesController < ApplicationController
+      def available_space
+        service = SpaceService.new
+        space = service.available_space(params[:id], params[:level])
+        render json: { success: true, data: space }
+      end
+    end
+  end
+end

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

@@ -13,6 +13,7 @@ module Cats
       delegate(:reference_no, to: :rhn_request, prefix: :rhn, allow_nil: true)
       delegate(:batch_no, to: :commodity, prefix: true)
       delegate(:name, to: :source, prefix: true)
+      delegate(:location_type, to: :source, prefix: true)
     end
   end
 end

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

@@ -16,6 +16,7 @@ module Cats
 
       delegate(:name, to: :destination, prefix: true)
       delegate(:reference_no, to: :allocation, prefix: true)
+      delegate(:location_type, to: :destination, prefix: true)
     end
   end
 end

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

@@ -2,11 +2,8 @@ module Cats
   module Core
     class Ration < ApplicationRecord
       belongs_to :program
-      belongs_to :commodity_category
 
-      validates :reference_no, :amount, presence: true
-      validates :reference_no, uniqueness: true
-      validates :amount, numericality: { greater_than: 0 }
+      validates :reference_no, presence: true, uniqueness: true
     end
   end
 end

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

@@ -0,0 +1,11 @@
+module Cats
+  module Core
+    class RationItem < ApplicationRecord
+      belongs_to :commodity_category
+      belongs_to :ration
+      belongs_to :unit_of_measure
+
+      validates :amount, presence: true, numericality: { greater_than: 0 }
+    end
+  end
+end

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

@@ -22,6 +22,8 @@ module Cats
       validate :validate_coordinates, :validate_dimensions, :validate_distance_from_wall, :validate_overlap,
                :validate_space_between_stack
 
+      after_save :update_store_space
+
       def validate_coordinates
         return unless store.present? && length.present? && width.present? && start_x.present? && start_y.present?
 
@@ -99,6 +101,21 @@ module Cats
 
         true
       end
+
+      def update_store_space
+        return unless length_previously_changed? || width_previously_changed? || stack_status_previously_changed?
+
+        old_area = if length_previously_was.nil? && width_previously_was.nil?
+                     0
+                   else
+                     length_previously_was * width_previously_was
+                   end
+
+        store.available_space += old_area
+        store.available_space -= length * width unless stack_status == DESTROYED
+
+        store.save
+      end
     end
   end
 end

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

@@ -15,6 +15,7 @@ module Cats
                 allow_nil: true
       validate :validate_location
 
+      before_create :update_usable_space
       after_save :update_store_keeper
 
       def validate_location
@@ -27,6 +28,12 @@ module Cats
         "#{store_keeper.first_name} #{store_keeper.last_name}"
       end
 
+      def update_usable_space
+        self.usable_space = (length - 2) * (width - 2)
+        self.usable_space -= (gangway_length * gangway_width) if has_gangway
+        self.available_space = self.usable_space
+      end
+
       def update_store_keeper
         return unless store_keeper_id_previously_changed?
 

data/app/services/cats/core/space_service.rb

@@ -0,0 +1,40 @@
+module Cats
+  module Core
+    class SpaceService
+      HUB = 'Hub'.freeze
+      WAREHOUSE = 'Warehouse'.freeze
+      STORE = 'Store'.freeze
+
+      def available_space(id, level)
+        case level
+        when HUB
+          warehouse_ids = Cats::Core::Location.find(id).children.map(&:id)
+          stores = Cats::Core::Store.joins(:warehouse)
+                                    .where(
+                                      cats_core_locations: {
+                                        location_type: Cats::Core::Location::WAREHOUSE,
+                                        id: warehouse_ids
+                                      }
+                                    ).group_by(&:warehouse_id)
+          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 }
+          end
+          hub_space = wh_details.inject(0) { |sum, val| sum + val[:total_space] }
+          space = { hub_id: id, total_space: hub_space, details: wh_details }
+        when WAREHOUSE
+          stores = Cats::Core::Store.where(warehouse_id: id)
+          details = stores.map { |store| { store_id: store.id, total_space: store.available_space } }
+          total_space = stores.inject(0) { |sum, val| sum + val.available_space }
+          space = { warehouse_id: id, total_space: total_space, details: details }
+        when STORE
+          store = Cats::Core::Store.find(id)
+          space = { store_id: store.id, total_space: store.available_space }
+        end
+        space
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -28,6 +28,20 @@ Cats::Core::Engine.routes.draw do
       get 'children'
     end
   end
+
+  get '/hubs/:id/space',
+      to: 'spaces#available_space',
+      as: :hub_space, 
+      defaults: { level: Cats::Core::SpaceService::HUB }
+  get '/warehousess/:id/space',
+      to: 'spaces#available_space',
+      as: :warehouse_space,
+      defaults: { level: Cats::Core::SpaceService::WAREHOUSE }
+  get '/store/:id/space',
+      to: 'spaces#available_space',
+      as: :store_space,
+      defaults: { level: Cats::Core::SpaceService::STORE }
+
   resources :commodity_categories, except: %i[destroy] do
     member do
       get 'children'

data/db/migrate/20210717031216_create_cats_core_rations.rb

@@ -6,11 +6,6 @@ class CreateCatsCoreRations < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'program_on_ration_indx' },
                    foreign_key: { to_table: :cats_core_programs }
-      t.references :commodity_category,
-                   null: false,
-                   index: { name: 'cc_on_ration_indx' },
-                   foreign_key: { to_table: :cats_core_commodity_categories }
-      t.float :amount, null: false
       t.boolean :current, null: false, default: true
 
       t.timestamps

data/db/migrate/20210717031343_create_cats_core_ration_items.rb

@@ -0,0 +1,21 @@
+class CreateCatsCoreRationItems < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_ration_items do |t|
+      t.references :commodity_category,
+                   null: false,
+                   index: { name: 'cc_on_ration_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.references :ration,
+                   null: false,
+                   index: { name: 'ri_on_ration_indx' },
+                   foreign_key: { to_table: :cats_core_rations }
+      t.references :unit_of_measure,
+                   null: false,
+                   index: { name: 'uom_on_ration_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.float :amount, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210717140855_create_cats_core_stores.rb

@@ -5,6 +5,8 @@ class CreateCatsCoreStores < ActiveRecord::Migration[6.1]
       t.float :length, null: false
       t.float :width, null: false
       t.float :height, null: false
+      t.float :usable_space, null: false
+      t.float :available_space, null: false
       t.boolean :temporary, null: false, default: false
       t.boolean :has_gangway, null: false, default: false
       t.float :gangway_length

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.32'.freeze
+    VERSION = '1.0.36'.freeze
   end
 end

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

@@ -5,6 +5,11 @@ FactoryBot.define do
     ancestry { nil }
   end
 
+  factory :hub, parent: :location, class: 'Cats::Core::Location' do
+    location_type { Cats::Core::Location::HUB }
+    parent
+  end
+
   factory :warehouse, parent: :location, class: 'Cats::Core::Location' do
     location_type { Cats::Core::Location::WAREHOUSE }
     parent

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :ration_item, class: 'Cats::Core::RationItem' do
+    commodity_category
+    ration
+    amount { 150 }
+    unit_of_measure
+  end
+end

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

@@ -2,8 +2,6 @@ FactoryBot.define do
   factory :ration, class: 'Cats::Core::Ration' do
     reference_no { FFaker::Name.name }
     program
-    commodity_category
-    amount { 1.5 }
     current { false }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.32
+  version: 1.0.36
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -224,6 +224,7 @@ files:
 - app/controllers/cats/core/menus_controller.rb
 - app/controllers/cats/core/notifications_controller.rb
 - app/controllers/cats/core/roles_controller.rb
+- app/controllers/cats/core/spaces_controller.rb
 - app/controllers/cats/core/unit_of_measures_controller.rb
 - app/controllers/cats/core/users_controller.rb
 - app/jobs/cats/core/application_job.rb
@@ -249,6 +250,7 @@ files:
 - app/models/cats/core/program.rb
 - app/models/cats/core/purchase_order.rb
 - app/models/cats/core/ration.rb
+- app/models/cats/core/ration_item.rb
 - app/models/cats/core/receipt.rb
 - app/models/cats/core/receipt_transaction.rb
 - app/models/cats/core/rhn_request.rb
@@ -271,6 +273,7 @@ files:
 - app/serializers/cats/core/unit_of_measure_serializer.rb
 - app/services/cats/core/menu_service.rb
 - app/services/cats/core/notification_service.rb
+- app/services/cats/core/space_service.rb
 - app/services/cats/core/token_auth_service.rb
 - config/routes.rb
 - db/migrate/20210715114238_create_cats_core_application_modules.rb
@@ -288,6 +291,7 @@ files:
 - db/migrate/20210716210905_create_cats_core_suppliers.rb
 - db/migrate/20210717031108_create_cats_core_donors.rb
 - db/migrate/20210717031216_create_cats_core_rations.rb
+- db/migrate/20210717031343_create_cats_core_ration_items.rb
 - db/migrate/20210717031810_create_cats_core_hrps.rb
 - db/migrate/20210717032024_create_cats_core_hrp_items.rb
 - db/migrate/20210717032330_create_cats_core_donations.rb
@@ -332,6 +336,7 @@ files:
 - spec/factories/cats/core/operators.rb
 - spec/factories/cats/core/programs.rb
 - spec/factories/cats/core/purchase_orders.rb
+- spec/factories/cats/core/ration_items.rb
 - spec/factories/cats/core/rations.rb
 - spec/factories/cats/core/receipt_transactions.rb
 - spec/factories/cats/core/receipts.rb