ml-testing-toolkit 18.17.0-snapshot.4 → 18.17.0-snapshot.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ml-testing-toolkit",
   "description": "Testing Toolkit for Mojaloop implementations",
-  "version": "18.17.0-snapshot.4",
+  "version": "18.17.0-snapshot.7",
   "license": "Apache-2.0",
   "author": "Vijaya Kumar Guthi, ModusBox Inc. ",
   "contributors": [
@@ -88,7 +88,7 @@
     "adm-zip": "0.5.16",
     "ajv-formats": "3.0.1",
     "atob": "2.1.2",
-    "axios": "1.13.2",
+    "axios": "1.13.3",
     "chai": "4.4.1",
     "connection-string": "^5.0.0",
     "cookie-parser": "1.4.7",

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

@@ -141,19 +141,27 @@ const handleTransferIlp = (context, response) => {
     }
   }
 
-  customLogger.logMessage('debug', 'Generated callback body', { additionalData: { context, response }, request: context.request })
+  customLogger.logMessage('debug', 'Generated callback body', { additionalData: { context, response } })
   if (context.request.method === 'get' && response.method === 'put' && pathMatch.test(response.path)) {
+    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 } })
     const storedTransfer = context.storedTransfers?.[transferId]
-
+    customLogger.logMessage('debug', 'Stored transfer fetched for fulfilment', { additionalData: { storedTransfer } })
     // 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 } })
       }
       delete context.storedTransfers[transferId]
     } else {

package/src/lib/mocking/openApiMockHandler.js

@@ -319,15 +319,15 @@ const generateAsyncCallback = async (item, context, req) => {
     }
   } else {
     // Store transfers early - right after validation
-    const transferPathMatch = /\/transfers\/([^/]+)$/
-    const fxTransferPathMatch = /\/fxTransfers\/([^/]+)$/
+    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))) {
       if (!context.storedTransfers) {
         context.storedTransfers = {}
       }
       const isFxTransfer = fxTransferPathMatch.test(req.path)
-      const transferId = req.path.match(isFxTransfer ? fxTransferPathMatch : transferPathMatch)[1]
+      const transferId = (req.payload && req.payload.transferId) || (req.payload && req.payload.commitRequestId)
       customLogger.logMessage('debug', 'Storing transfer for validation', { additionalData: { transferId }, request: req })
 
       context.storedTransfers[transferId] = {