Fixes/updates of collection actions and reducer

birdofpreyru · birdofpreyru · commit b6c431b4a241 · 2018-05-09T02:05:49.000+02:00
diff --git a/src/shared/actions/collection.js b/src/shared/actions/collection.js
@@ -18,10 +18,11 @@ function addItems(index) {
 /**
  * Increments counters of item references.
  * @param {String|String[]} ids
+ * @param {Number} factor Optional.
  * @return {String[]}
  */
-function bookItems(ids) {
-  return _.isArray(ids) ? ids : [ids];
+function bookItems(ids, factor = 1) {
+  return { factor, ids: _.isArray(ids) ? ids : [ids] };
 }
 
 /**
@@ -35,10 +36,11 @@ function clean(timestamp) {
 /**
  * Decreases counters of item references.
  * @param {String|String[]} ids
+ * @param {Number} factor Optional.
  * @return {String[]}
  */
-function freeItems(ids) {
-  return _.isArray(ids) ? ids : [ids];
+function freeItems(ids, factor = 1) {
+  return { factor, ids: _.isArray(ids) ? ids : [ids] };
 }
 
 /**
diff --git a/src/shared/reducers/collection.js b/src/shared/reducers/collection.js
@@ -40,29 +40,29 @@ function onAddItems(state, action) {
   return result;
 }
 
-function onBookItems(state, { payload }) {
+function onBookItems(state, { payload: { factor, ids } }) {
   const result = _.clone(state);
-  payload.forEach((id) => {
-    prepare(result, id).numRefs += 1;
+  ids.forEach((id) => {
+    prepare(result, id).numRefs += factor;
   });
   return result;
 }
 
 function onClean(state, { payload }) {
   const result = _.clone(state);
   _.forOwn(state, (item, id) => {
-    const slot = state(id);
+    const slot = state[id];
     if (slot.numRefs || slot.loadingOperationId
       || slot.timestamp > payload) return;
     delete result[id];
   });
   return result;
 }
 
-function onFreeItems(state, { payload }) {
+function onFreeItems(state, { payload: { factor, ids } }) {
   const result = _.clone(state);
-  payload.forEach((id) => {
-    prepare(result, id).numRefs -= 1;
+  ids.forEach((id) => {
+    prepare(result, id).numRefs -= factor;
   });
   return result;
 }
