ml-testing-toolkit 18.17.0-snapshot.10 → 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.10",
+  "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

@@ -148,29 +148,25 @@ const handleTransferIlp = (context, response) => {
     const transferId = response.path.match(pathMatch)[1]
     customLogger.logMessage('debug', 'Fetching stored transfer for fulfilment', { additionalData: { transferId } })
     // Use objectStore to get the stored transfer
-    const storedTransfer = objectStore.get('storedTransfers', transferId, context.request.customInfo?.user)
+    const storedTransfer = objectStore.get('storedTransfers', transferId)
     customLogger.logMessage('debug', 'Stored transfer fetched for fulfilment', { additionalData: { storedTransfer, context } })
     // Check if stored request exists and is within 30 seconds
     if (storedTransfer) {
-      if (storedTransfer.request?.ilpPacket) {
-        customLogger.logMessage('debug', 'Stored transfer has ilpPacket. Generating fulfilment.', { additionalData: { transferId, ilpPacket: storedTransfer.request.ilpPacket } })
-        const generatedFulfilment = ilpObj.calculateFulfil(storedTransfer.request.ilpPacket).replace('"', '')
+      if (storedTransfer.data?.request?.ilpPacket) {
+        customLogger.logMessage('debug', 'Stored transfer has ilpPacket. Generating fulfilment.', { additionalData: { transferId, ilpPacket: storedTransfer.data.request.ilpPacket } })
+        const generatedFulfilment = ilpObj.calculateFulfil(storedTransfer.data.request.ilpPacket).replace('"', '')
         response.body.fulfilment = generatedFulfilment
         customLogger.logMessage('debug', 'Fulfilment set in response body', { additionalData: { transferId, fulfilment: generatedFulfilment } })
-      } else if (storedTransfer.request?.CdtTrfTxInf?.VrfctnOfTerms?.IlpV4PrepPacket) {
-        customLogger.logMessage('debug', 'Stored transfer has IlpV4PrepPacket. Generating fulfilment.', { additionalData: { transferId, IlpV4PrepPacket: storedTransfer.request.CdtTrfTxInf.VrfctnOfTerms.IlpV4PrepPacket } })
-        const generatedFulfilment = ilpV4Obj.calculateFulfil(storedTransfer.request.CdtTrfTxInf.VrfctnOfTerms.IlpV4PrepPacket).replace('"', '')
+      } else if (storedTransfer.data?.request?.CdtTrfTxInf?.VrfctnOfTerms?.IlpV4PrepPacket) {
+        customLogger.logMessage('debug', 'Stored transfer has IlpV4PrepPacket. Generating fulfilment.', { additionalData: { transferId, IlpV4PrepPacket: storedTransfer.data.request.CdtTrfTxInf.VrfctnOfTerms.IlpV4PrepPacket } })
+        const generatedFulfilment = ilpV4Obj.calculateFulfil(storedTransfer.data.request.CdtTrfTxInf.VrfctnOfTerms.IlpV4PrepPacket).replace('"', '')
         response.body.TxInfAndSts.ExctnConf = generatedFulfilment
         customLogger.logMessage('debug', 'ExctnConf set in response body', { additionalData: { transferId, ExctnConf: generatedFulfilment } })
       } else {
         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, context.request.customInfo?.user) // Ensure init
-      objectStore.set('storedTransfers', {
-        ...objectStore.get('storedTransfers', undefined, context.request.customInfo?.user),
-        [transferId]: undefined
-      }, context.request.customInfo?.user)
+      objectStore.deleteObject('storedTransfers', transferId)
     } else {
       delete response.body.fulfilment
     }

package/src/lib/mocking/openApiMockHandler.js

@@ -334,7 +334,7 @@ const generateAsyncCallback = async (item, context, req) => {
       objectStore.push('storedTransfers', transferId, {
         request: req.payload,
         type: isFxTransfer ? 'fxTransfer' : 'transfer'
-      }, req.customInfo.user)
+      })
     }
 
     // Getting callback info from callback map file

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
 }