cats_core 1.0.49 → 1.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88f88c106a10c160703ee6898947a371aef510da88eea9aa514ff93e20c4e806
-  data.tar.gz: 2baa107b490e7372ed823c6d8fec83e91a19de41f77a48cd187e99eb2dc934bf
+  metadata.gz: b13a3549ac212c8e869ce5aff6b3508787e75af7afaeadba4b0e99f5476b101e
+  data.tar.gz: d4993f0e36936fc4ed18ae9accca173189056c3cddae7fc2f16704f6509bac80
 SHA512:
-  metadata.gz: f12a36ca3a10c537f09e6fd12b07e66d70b0bc69692badb2f9a0de6642d1b91f308ba53754456ecf35da935c7a380af3e7237bdda35690177ae0823acab8ef60
-  data.tar.gz: fdb2ed8c53e2d0c2e554017dce091be7056004b28a9dc3b0cbc6c4e343855957afcb64de644ccefc7649372c5c29584f98f9fc78ba9f0b0e6bb24bb96c434458
+  metadata.gz: 91d4ba5e59ef7da90cf36d6073d20819496bae612eff73cdeccada481293a956311732201b049da61e84ba1c12b1a7464d636202b101f66a49bcf22146211440
+  data.tar.gz: afdceef95b3321eaea7ebad43bd622b814ef268f97b20c5815af07376fc710b338b74a25bc3e81d6c4b366f00e30e6553c2f2dcc38e84685bc670201ce4e4e13

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

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.49'.freeze
+    VERSION = '1.0.50'.freeze
   end
 end

metadata

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