ml-testing-toolkit 18.16.5 → 18.17.0-snapshot.10

package/src/lib/db/adapters/dbAdapter.js

@@ -48,10 +48,7 @@ const getConnection = async () => {
     }
 
     // TLS/SSL support
-    const mongoOptions = {
-      useNewUrlParser: true,
-      useUnifiedTopology: true
-    }
+    const mongoOptions = {}
 
     if (systemConfig.DB.SSL_ENABLED) {
       mongoOptions.tls = true

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

@@ -30,6 +30,7 @@
 const { ilpFactory, ILP_VERSIONS } = require('@mojaloop/sdk-standard-components').Ilp
 const customLogger = require('../../requestLogger')
 const { logger } = require('../../logger')
+const objectStore = require('../../objectStore')
 
 let ilpObj = null
 let ilpV4Obj = null
@@ -140,8 +141,39 @@ const handleTransferIlp = (context, response) => {
       response.body.TxInfAndSts.ExctnConf = generatedFulfilment
     }
   }
+
+  customLogger.logMessage('debug', 'Generated callback body', { additionalData: { context, response } })
   if (context.request.method === 'get' && response.method === 'put' && pathMatch.test(response.path)) {
-    delete response.body.fulfilment
+    customLogger.logMessage('debug', 'Returning stored fulfilment if exists for transfer GET')
+    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)
+    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('"', '')
+        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('"', '')
+        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)
+    } else {
+      delete response.body.fulfilment
+    }
   }
 }
 

package/src/lib/mocking/openApiMockHandler.js

@@ -318,6 +318,25 @@ const generateAsyncCallback = async (item, context, req) => {
       return
     }
   } else {
+    // Store transfers early - right after validation
+    const transferPathMatch = /\/transfers(?:\/([^/]+))?$/
+    const fxTransferPathMatch = /\/fxTransfers(?:\/([^/]+))?$/
+    customLogger.logMessage('debug', 'Processing transfer request', { additionalData: { method: req.method, path: req.path }, request: req })
+    if (req.method === 'post' && (transferPathMatch.test(req.path) || fxTransferPathMatch.test(req.path))) {
+      const isFxTransfer = fxTransferPathMatch.test(req.path)
+      let transferId = (req.payload && req.payload.transferId) || (req.payload && req.payload.commitRequestId)
+      if (!transferId && req.payload && req.payload.CdtTrfTxInf && req.payload.CdtTrfTxInf.PmtId && req.payload.CdtTrfTxInf.PmtId.TxId) {
+        transferId = req.payload.CdtTrfTxInf.PmtId.TxId
+      }
+      customLogger.logMessage('debug', 'Storing transfer for validation', { additionalData: { transferId }, request: req })
+
+      // Use objectStore to store the transfer
+      objectStore.push('storedTransfers', transferId, {
+        request: req.payload,
+        type: isFxTransfer ? 'fxTransfer' : 'transfer'
+      }, req.customInfo.user)
+    }
+
     // Getting callback info from callback map file
     try {
       const cbMapRawdata = await utils.readFileAsync(item.callbackMapFile)
@@ -426,7 +445,7 @@ const generateAsyncCallback = async (item, context, req) => {
       return
     }
   }
-
+  customLogger.logMessage('debug', 'Generated callback body', { additionalData: { body: generatedCallback.body }, request: req })
   if (generatedCallback.body) {
     // Append ILP properties to callback
     const fulfilment = IlpModel.handleQuoteIlp(context, generatedCallback)

package/src/lib/objectStore.js

@@ -35,7 +35,8 @@ const storedObject = {
     transactions: {},
     inboundEnvironment: {},
     requests: {},
-    callbacks: {}
+    callbacks: {},
+    storedTransfers: {}
   }
 }
 
@@ -103,6 +104,7 @@ const clearOldObjects = () => {
   clear('callbacks', interval)
   clear('requestsHistory', interval)
   clear('callbacksHistory', interval)
+  clear('storedTransfers', interval)
 }
 
 const initObjectStore = (initConfig = null) => {