fix(csi-107): fixed QSh iso callback (#364)

docker-compose.yml

@@ -7,6 +7,7 @@ x-depends-on: &dependsOnMysqlAndKafka
     condition: service_completed_successfully
 
 x-quoting-service: &quotingServiceBase
+#  image: mojaloop/quoting-service:v15.9.0-iso.6
   image: mojaloop/quoting-service:local
   build:
     context: .

package.json

@@ -104,7 +104,7 @@
   },
   "dependencies": {
     "@hapi/good": "9.0.1",
-    "@hapi/hapi": "21.3.10",
+    "@hapi/hapi": "21.3.11",
     "@hapi/inert": "7.1.0",
     "@hapi/vision": "7.0.3",
     "@mojaloop/central-services-error-handling": "13.0.2",
@@ -116,7 +116,7 @@
     "@mojaloop/event-sdk": "14.1.1",
     "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.0",
     "@mojaloop/ml-number": "11.2.4",
-    "@mojaloop/ml-schema-transformer-lib": "1.1.5",
+    "@mojaloop/ml-schema-transformer-lib": "1.1.6",
     "@mojaloop/sdk-standard-components": "18.1.0",
     "ajv": "8.17.1",
     "ajv-keywords": "5.1.0",

src/lib/dto.js

@@ -78,7 +78,6 @@ const storeOriginalPayload = async ({ originalPayloadStorage, dataUri, requestId
 }
 
 const extractOriginalPayload = async (originalPayloadStorage, context, payloadCache) => {
-  logger.debug('extractOriginalPayload: ', { originalPayloadStorage })
   let payload
 
   if (originalPayloadStorage === PAYLOAD_STORAGES.kafka) {
@@ -88,7 +87,10 @@ const extractOriginalPayload = async (originalPayloadStorage, context, payloadCa
     payload = await payloadCache?.getPayload(context?.originalRequestId)
   }
 
-  return payload ? decodePayload(payload) : null
+  const result = payload ? decodePayload(payload) : null
+  logger.debug('extractOriginalPayload result: ', { originalPayloadStorage, result })
+
+  return result
 }
 
 // todo: move to domain folder

src/model/quotes.js

@@ -91,11 +91,15 @@ class QuotesModel {
     return events
   }
 
-  async handleRuleEvents (events, headers, quoteRequest) {
+  async handleRuleEvents (events, headers, originalPayload) {
     // At the time of writing, all events cause the "normal" flow of execution to be interrupted.
     // So we'll return false when there have been no events whatsoever.
     if (events.length === 0) {
-      return { terminate: false, quoteRequest, headers }
+      return {
+        terminate: false,
+        quoteRequest: originalPayload,
+        headers
+      }
     }
 
     const { INVALID_QUOTE_REQUEST, INTERCEPT_QUOTE } = RulesEngine.events
@@ -115,8 +119,12 @@ class QuotesModel {
       // once. But is a valid solution in the short-term.
       const { FSPIOPError: code, message } = invalidQuoteRequestEvents[0].params
       // Will throw an internal server error if property doesn't exist
-      throw ErrorHandler.CreateFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes[code],
-        message, null, headers['fspiop-source'])
+      throw ErrorHandler.CreateFSPIOPError(
+        ErrorHandler.Enums.FSPIOPErrorCodes[code],
+        message,
+        null,
+        headers['fspiop-source']
+      )
     }
 
     const interceptQuoteEvents = events.filter(ev => ev.type === INTERCEPT_QUOTE)
@@ -128,7 +136,7 @@ class QuotesModel {
       // send the quote request to the recipient in the event
       const result = {
         terminate: false,
-        quoteRequest,
+        quoteRequest: originalPayload,
         headers: {
           ...headers,
           'fspiop-destination': interceptQuoteEvents[0].params.rerouteToFsp
@@ -278,7 +286,7 @@ class QuotesModel {
       // supply a rules file containing an empty array.
       const events = await this.executeRules(headers, quoteRequest, payer, payee)
 
-      handledRuleEvents = await this.handleRuleEvents(events, headers, quoteRequest, originalPayload)
+      handledRuleEvents = await this.handleRuleEvents(events, headers, originalPayload)
       if (handledRuleEvents.terminate) {
         return
       }

test/integration/isoApi.test.js

@@ -46,7 +46,7 @@ describe.skip('ISO API Tests -->', () => {
       await sleep(3000)
 
       const { data } = await hubClient.getHistory()
-      expect(data.history.length).toBe(1)
+      expect(data.history.length).toBeGreaterThanOrEqual(1)
       const { PmtId, CdtrAgt, DbtrAgt } = data.history[0].body.CdtTrfTxInf
       expect(PmtId.TxId).toBe(quoteId)
       expect(PmtId.EndToEndId).toBe(transactionId)

test/integration/mockHttpServer/server.js

@@ -32,6 +32,7 @@ let history = []
 
 const server = createServer(async (req, res) => {
   const { url, method, headers } = req
+  console.log(`[==>] ${method.toUpperCase()} ${url}`)
 
   if (url === Routes.HISTORY && method === 'DELETE') {
     history = []