inventory view lib refactor

inventaire · Aug 31, 2020 · 73f258d · 73f258d
1 parent cffb9a6
commit 73f258d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/server/controllers/items/inventory_view.js b/server/controllers/items/inventory_view.js
@@ -4,7 +4,7 @@ const responses_ = __.require('lib', 'responses')
 const error_ = __.require('lib', 'error/error')
 const sanitize = __.require('lib', 'sanitize/sanitize')
 const getAuthorizationLevel = require('./lib/get_authorization_level')
-const getInventoryView = require('./lib/view/get_inventory_view')
+const { getInventoryViews } = require('./lib/view/inventory_view')
 const { getItemsByDate } = require('./lib/view/items_by_date')
 
 const sanitization = {
@@ -36,10 +36,6 @@ const getInventoryViewsParams = params => {
   else return getAuthorizationLevel.byGroup(group, reqUserId)
 }
 
-const getInventoryViews = ({ authorizationLevel, usersIds }) => {
-  return Promise.all(usersIds.map(userId => getInventoryView(userId, authorizationLevel)))
-}
-
 const mergeInventoryViews = inventoryViews => {
   if (inventoryViews.length === 1) return inventoryViews[0]
   const mergedInventoryViews = _.mergeWith(...inventoryViews, concatArraysCustomizer)

diff --git a/...lers/items/lib/view/get_inventory_view.js → ...trollers/items/lib/view/inventory_view.js b/...lers/items/lib/view/get_inventory_view.js → ...trollers/items/lib/view/inventory_view.js
@@ -6,14 +6,23 @@ const bundleViewData = require('./bundle_view_data')
 const replaceEditionsByTheirWork = require('./replace_editions_by_their_work')
 const getEntitiesByUris = __.require('controllers', 'entities/lib/get_entities_by_uris')
 
-module.exports = (userId, authorizationLevel) => {
+const inventoryView_ = module.exports = {
+  getInventoryViews: ({ usersIds, authorizationLevel, refresh }) => {
+    return Promise.all(usersIds.map(userId => {
+      return getInventoryView({ userId, authorizationLevel, refresh })
+    }))
+  }
+}
+
+const getInventoryView = ({ userId, authorizationLevel, refresh }) => {
   return cache_.get({
     key: `invview:${userId}:${authorizationLevel}`,
-    fn: getInventoryView.bind(null, userId, authorizationLevel)
+    fn: getInventoryViewFn.bind(null, userId, authorizationLevel),
+    refresh
   })
 }
 
-const getInventoryView = (userId, authorizationLevel) => {
+const getInventoryViewFn = (userId, authorizationLevel) => {
   return getByAuthorizationLevel[authorizationLevel](userId)
   .then(items => {
     return getItemsEntitiesData(items)
@@ -24,6 +33,6 @@ const getInventoryView = (userId, authorizationLevel) => {
 const getItemsEntitiesData = items => {
   const uris = _.uniq(_.map(items, 'entity'))
   return getEntitiesByUris({ uris })
-  .get('entities')
+  .then(({ entities }) => entities)
   .then(replaceEditionsByTheirWork)
 }