feat(3666): encoded/decoded message payload

mojaloop · Dec 19, 2023 · 79fe024 · 79fe024
1 parent 97942e7
commit 79fe024
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/src/lib/dto.js b/src/lib/dto.js
@@ -1,15 +1,19 @@
-const { Headers } = require('@mojaloop/central-services-shared').Enum.Http
+const { Enum, Util } = require('@mojaloop/central-services-shared')
+
+const { Headers } = Enum.Http
+const { decodePayload, encodePayload } = Util.StreamingProtocol
 
 const messageFromRequestDto = (request, type, action) => {
   const { headers, payload, params } = request
   const { spanContext } = request.span || {}
   const id = params.id || payload.quoteId || payload.bulkQuoteId
+  const encodedJson = encodePayload(JSON.stringify(payload), headers[Headers.GENERAL.CONTENT_TYPE.value])
 
   return Object.freeze({
     content: {
       requestId: request.info?.id,
       headers,
-      payload, // todo: base64 encoded
+      payload: encodedJson,
       uriParams: params,
       spanContext,
       id,
@@ -30,7 +34,8 @@ const requestDataFromMessageDto = (message) => {
   return Object.freeze({
     topic,
     requestData: {
-      ...value.content
+      ...value.content,
+      payload: decodePayload(value.content?.payload)
       // see messageFromRequestDto for details of "content" field
     }
   })

diff --git a/test/unit/handlers/QuotingHandler.test.js b/test/unit/handlers/QuotingHandler.test.js
@@ -20,13 +20,17 @@ const createRequestData = ({
   action = 'action'
 } = {}) => {
   const httpRequest = mocks.mockHttpRequest({ payload })
-  const { content } = dto.messageFromRequestDto(httpRequest, type, action)
-  return content
+  const messageValue = dto.messageFromRequestDto(httpRequest, type, action)
+  const { requestData } = dto.requestDataFromMessageDto({ value: messageValue })
+
+  return requestData
 }
 
 const createKafkaMessage = (topic) => ({
   topic,
-  value: { content: {} }
+  value: {
+    content: { payload: '{}' }
+  }
 })
 
 describe('QuotingHandler Tests -->', () => {

diff --git a/test/unit/mocks.js b/test/unit/mocks.js
@@ -1,11 +1,13 @@
 const { randomUUID } = require('node:crypto')
-// const dto = require('../../src/lib/dto')
 
 const mockHttpRequest = ({
+  requestId = randomUUID(),
   payload = {},
   params = {},
-  headers = { 'fspiop-source': 'payerFsp' },
-  requestId = randomUUID()
+  headers = {
+    'fspiop-source': 'payerFsp',
+    'content-type': 'application/vnd.interoperability.quotes+json;version=1.0'
+  }
 } = {}) => ({
   payload,
   params,
@@ -25,14 +27,6 @@ const mockHttpRequest = ({
   }
 })
 
-// const toKafkaMessageFormat = ({
-//   topic = 'topic',
-//   messageData = {}
-// } = {}) => Object.freeze({
-//   topic,
-//   value: messageData
-// })
-
 const createMockHapiHandler = () => {
   const code = jest.fn()
   const handler = {
@@ -43,7 +37,6 @@ const createMockHapiHandler = () => {
 }
 
 module.exports = {
-  // toKafkaMessageFormat,
   mockHttpRequest,
   createMockHapiHandler
 }