ml-testing-toolkit 18.17.0-snapshot.11 → 18.17.0-snapshot.12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ml-testing-toolkit",
   "description": "Testing Toolkit for Mojaloop implementations",
-  "version": "18.17.0-snapshot.11",
+  "version": "18.17.0-snapshot.12",
   "license": "Apache-2.0",
   "author": "Vijaya Kumar Guthi, ModusBox Inc. ",
   "contributors": [

package/src/lib/mocking/middleware-functions/ilpModel.js

@@ -166,11 +166,7 @@ const handleTransferIlp = (context, response) => {
         customLogger.logMessage('warn', 'No ILP packet or IlpV4PrepPacket found in stored transfer request', { additionalData: { transferId, storedTransfer } })
       }
       // Remove the stored transfer from objectStore
-      objectStore.get('storedTransfers', undefined) // Ensure init
-      objectStore.set('storedTransfers', {
-        ...objectStore.get('storedTransfers', undefined),
-        [transferId]: undefined
-      })
+      objectStore.deleteObject('storedTransfers', transferId)
     } else {
       delete response.body.fulfilment
     }

package/src/lib/objectStore.js

@@ -29,6 +29,7 @@
  ******/
 
 const _ = require('lodash')
+const { logger } = require('./logger')
 
 const storedObject = {
   data: {
@@ -77,13 +78,17 @@ const push = (key, item, value, user) => {
 }
 
 const clear = (object, interval) => {
-  for (const context in storedObject) {
-    for (const item in storedObject[context][object]) {
-      const timeDiff = Date.now() - storedObject[context][object][item].insertedDate
-      if (timeDiff > interval) {
-        delete storedObject[context][object][item]
+  try {
+    for (const context in storedObject) {
+      for (const item in storedObject[context][object]) {
+        const timeDiff = Date.now() - storedObject[context][object][item].insertedDate
+        if (timeDiff > interval) {
+          delete storedObject[context][object][item]
+        }
       }
     }
+  } catch (err) {
+    logger.error('Error clearing old objects', err)
   }
 }
 
@@ -97,6 +102,15 @@ const popObject = (key, item, user) => {
   return null
 }
 
+const deleteObject = (key, item, user) => {
+  const context = init(key, user)
+  if (Object.prototype.hasOwnProperty.call(storedObject[context][key], item)) {
+    delete storedObject[context][key][item]
+    return true
+  }
+  return false
+}
+
 const clearOldObjects = () => {
   const interval = 10 * 60 * 1000
   clear('transactions', interval)
@@ -120,5 +134,6 @@ module.exports = {
   initObjectStore,
   push,
   clear,
-  popObject
+  popObject,
+  deleteObject
 }