@mojaloop/sdk-scheme-adapter 13.0.1 → 13.0.4

package/CHANGELOG.md

@@ -1,4 +1,25 @@
 # Changelog: [mojaloop/thirdparty-api-svc](https://github.com/mojaloop/thirdparty-api-svc)
+### [13.0.4](https://github.com/mojaloop/sdk-scheme-adapter/compare/v13.0.3...v13.0.4) (2022-05-13)
+
+
+### Bug Fixes
+
+* reformat error information response ([#318](https://github.com/mojaloop/sdk-scheme-adapter/issues/318)) ([ed844b1](https://github.com/mojaloop/sdk-scheme-adapter/commit/ed844b1d2da6c58d3c61622c07c326bda3ca3b86))
+
+### [13.0.3](https://github.com/mojaloop/sdk-scheme-adapter/compare/v13.0.2...v13.0.3) (2022-05-12)
+
+
+### Bug Fixes
+
+* correct party outbound response ([#317](https://github.com/mojaloop/sdk-scheme-adapter/issues/317)) ([752e8b4](https://github.com/mojaloop/sdk-scheme-adapter/commit/752e8b4d315a6e9c3b8ad4ff1b65761c41e3d721))
+
+### [13.0.2](https://github.com/mojaloop/sdk-scheme-adapter/compare/v13.0.1...v13.0.2) (2022-05-12)
+
+
+### Bug Fixes
+
+* update outbound interface and response oa3 defs ([#316](https://github.com/mojaloop/sdk-scheme-adapter/issues/316)) ([50d23d8](https://github.com/mojaloop/sdk-scheme-adapter/commit/50d23d8562afdeeeef2203d6196473c7b0e484a5))
+
 ### [13.0.1](https://github.com/mojaloop/sdk-scheme-adapter/compare/v13.0.0...v13.0.1) (2022-05-11)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "13.0.1",
+  "version": "13.0.4",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/OutboundServer/api.yaml

@@ -2124,8 +2124,15 @@ components:
       description: 'GET /parties/{Type}/{ID} response object'
       properties:
         party:
-          $ref: '#/components/schemas/Party'
-          description: Information regarding the requested Party.
+          properties:
+            body:
+              $ref: '#/components/schemas/Party'
+              description: Information regarding the requested Party.
+            headers:
+              type: object
+          required:
+            - body
+            - headers
         currentState:
           $ref: '#/components/schemas/async2SyncCurrentState'
       required:
@@ -2235,33 +2242,41 @@ components:
           type: object
           description: 'The object sent in the PUT /quotes/{ID} callback.'
           properties:
-            transferAmount:
-              $ref: '#/components/schemas/Money'
-            payeeReceiveAmount:
-              $ref: '#/components/schemas/Money'
-            payeeFspFee:
-              $ref: '#/components/schemas/Money'
-            payeeFspCommission:
-              $ref: '#/components/schemas/Money'
-            expiration:
-              type: string
-              description: >-
-                Date and time until when the quotation is valid and can be
-                honored when used in the subsequent transaction.
-              example: '2016-05-24T08:38:08.699-04:00'
-            geoCode:
-              $ref: '#/components/schemas/GeoCode'
-            ilpPacket:
-              $ref: '#/components/schemas/IlpPacket'
-            condition:
-              $ref: '#/components/schemas/IlpCondition'
-            extensionList:
-              $ref: '#/components/schemas/ExtensionList'
+            body:
+              type: object
+              properties:
+                transferAmount:
+                  $ref: '#/components/schemas/Money'
+                payeeReceiveAmount:
+                  $ref: '#/components/schemas/Money'
+                payeeFspFee:
+                  $ref: '#/components/schemas/Money'
+                payeeFspCommission:
+                  $ref: '#/components/schemas/Money'
+                expiration:
+                  type: string
+                  description: >-
+                    Date and time until when the quotation is valid and can be
+                    honored when used in the subsequent transaction.
+                  example: '2016-05-24T08:38:08.699-04:00'
+                geoCode:
+                  $ref: '#/components/schemas/GeoCode'
+                ilpPacket:
+                  $ref: '#/components/schemas/IlpPacket'
+                condition:
+                  $ref: '#/components/schemas/IlpCondition'
+                extensionList:
+                  $ref: '#/components/schemas/ExtensionList'
+              required:
+                - transferAmount
+                - expiration
+                - ilpPacket
+                - condition
+            headers:
+              type: object
           required:
-            - transferAmount
-            - expiration
-            - ilpPacket
-            - condition
+            - body
+            - headers
         currentState:
           $ref: '#/components/schemas/async2SyncCurrentState'
       required:
@@ -2316,7 +2331,14 @@ components:
       type: object
       properties:
         transfer:
-          $ref: '#/components/schemas/TransfersIDPutResponse'
+          properties:
+            body:
+              $ref: '#/components/schemas/TransfersIDPutResponse'
+            headers:
+              type: object
+          required:
+            - body
+            - headers
         currentState:
           $ref: '#/components/schemas/async2SyncCurrentState'
       required:

package/src/OutboundServer/api_interfaces/openapi.d.ts

@@ -1070,8 +1070,11 @@ export interface components {
       | "ERROR_OCCURRED";
     /** GET /parties/{Type}/{ID} response object */
     partiesByIdResponse: {
-      /** Information regarding the requested Party. */
-      party: components["schemas"]["Party"];
+      party: {
+        /** Information regarding the requested Party. */
+        body: components["schemas"]["Party"];
+        headers: { [key: string]: unknown };
+      };
       currentState: components["schemas"]["async2SyncCurrentState"];
     };
     /** The object sent in the POST /quotes request. */
@@ -1110,16 +1113,19 @@ export interface components {
     quotesPostResponse: {
       /** The object sent in the PUT /quotes/{ID} callback. */
       quotes: {
-        transferAmount: components["schemas"]["Money"];
-        payeeReceiveAmount?: components["schemas"]["Money"];
-        payeeFspFee?: components["schemas"]["Money"];
-        payeeFspCommission?: components["schemas"]["Money"];
-        /** Date and time until when the quotation is valid and can be honored when used in the subsequent transaction. */
-        expiration: string;
-        geoCode?: components["schemas"]["GeoCode"];
-        ilpPacket: components["schemas"]["IlpPacket"];
-        condition: components["schemas"]["IlpCondition"];
-        extensionList?: components["schemas"]["ExtensionList"];
+        body: {
+          transferAmount: components["schemas"]["Money"];
+          payeeReceiveAmount?: components["schemas"]["Money"];
+          payeeFspFee?: components["schemas"]["Money"];
+          payeeFspCommission?: components["schemas"]["Money"];
+          /** Date and time until when the quotation is valid and can be honored when used in the subsequent transaction. */
+          expiration: string;
+          geoCode?: components["schemas"]["GeoCode"];
+          ilpPacket: components["schemas"]["IlpPacket"];
+          condition: components["schemas"]["IlpCondition"];
+          extensionList?: components["schemas"]["ExtensionList"];
+        };
+        headers: { [key: string]: unknown };
       };
       currentState: components["schemas"]["async2SyncCurrentState"];
     };
@@ -1142,7 +1148,10 @@ export interface components {
       transfersPostRequest: components["schemas"]["TransfersPostRequest"];
     };
     simpleTransfersPostResponse: {
-      transfer: components["schemas"]["TransfersIDPutResponse"];
+      transfer: {
+        body: components["schemas"]["TransfersIDPutResponse"];
+        headers: { [key: string]: unknown };
+      };
       currentState: components["schemas"]["async2SyncCurrentState"];
     };
     errorSimpleTransfersResponse: components["schemas"]["errorResponse"] & {

package/src/OutboundServer/api_template/components/schemas/partiesByIdResponse.yaml

@@ -3,9 +3,16 @@
   description: 'GET /parties/{Type}/{ID} response object'
   properties:
     party:
-      $ref: >-
-        ../../../../../node_modules/@mojaloop/api-snippets/thirdparty/v1_0/openapi3/components/schemas/Party.yaml
-      description: Information regarding the requested Party.
+      properties:
+        body:
+          $ref: >-
+            ../../../../../node_modules/@mojaloop/api-snippets/thirdparty/v1_0/openapi3/components/schemas/Party.yaml
+          description: Information regarding the requested Party.
+        headers:
+          type: object
+      required:
+        - body
+        - headers
     currentState:
       $ref: ../schemas/async2SyncCurrentState.yaml
   required:

package/src/OutboundServer/api_template/components/schemas/quotesPostResponse.yaml

@@ -6,41 +6,49 @@ properties:
     type: object
     description: 'The object sent in the PUT /quotes/{ID} callback.'
     properties:
-      transferAmount:
-        $ref: >-
-          ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/Money.yaml
-      payeeReceiveAmount:
-        $ref: >-
-          ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/Money.yaml
-      payeeFspFee:
-        $ref: >-
-          ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/Money.yaml
-      payeeFspCommission:
-        $ref: >-
-          ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/Money.yaml
-      expiration:
-        type: string
-        description: >-
-          Date and time until when the quotation is valid and can be honored when
-          used in the subsequent transaction.
-        example: '2016-05-24T08:38:08.699-04:00'
-      geoCode:
-        $ref: >-
-          ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/GeoCode.yaml
-      ilpPacket:
-        $ref: >-
-          ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/IlpPacket.yaml
-      condition:
-        $ref: >-
-          ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/IlpCondition.yaml
-      extensionList:
-        $ref: >-
-          ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/ExtensionList.yaml
+      body:
+        type: object
+        properties:
+          transferAmount:
+            $ref: >-
+              ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/Money.yaml
+          payeeReceiveAmount:
+            $ref: >-
+              ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/Money.yaml
+          payeeFspFee:
+            $ref: >-
+              ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/Money.yaml
+          payeeFspCommission:
+            $ref: >-
+              ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/Money.yaml
+          expiration:
+            type: string
+            description: >-
+              Date and time until when the quotation is valid and can be honored when
+              used in the subsequent transaction.
+            example: '2016-05-24T08:38:08.699-04:00'
+          geoCode:
+            $ref: >-
+              ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/GeoCode.yaml
+          ilpPacket:
+            $ref: >-
+              ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/IlpPacket.yaml
+          condition:
+            $ref: >-
+              ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/IlpCondition.yaml
+          extensionList:
+            $ref: >-
+              ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/ExtensionList.yaml
+        required:
+          - transferAmount
+          - expiration
+          - ilpPacket
+          - condition
+      headers:
+        type: object
     required:
-      - transferAmount
-      - expiration
-      - ilpPacket
-      - condition
+    - body
+    - headers
   currentState:
     $ref: ../schemas/async2SyncCurrentState.yaml
 required:

package/src/OutboundServer/api_template/components/schemas/simpleTransfersPostResponse.yaml

@@ -2,8 +2,15 @@ title: SimpleTransfersPostResponse
 type: object
 properties:
   transfer:
-    $ref: >-
-      ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/TransfersIDPutResponse.yaml
+    properties:
+      body:
+        $ref: >-
+          ../../../../../node_modules/@mojaloop/api-snippets/fspiop/v1_1/openapi3/components/schemas/TransfersIDPutResponse.yaml
+      headers:
+        type: object
+    required:
+      - body
+      - headers
   currentState:
     $ref: ../schemas/async2SyncCurrentState.yaml
 required:

package/src/lib/model/OutboundBulkQuotesModel.js

@@ -162,8 +162,8 @@ class OutboundBulkQuotesModel {
                             }
                         }
                     } else if (message.type === 'bulkQuoteResponseError') {
-                        error = new BackendError(`Got an error response requesting bulk quote: ${util.inspect(message.data, { depth: Infinity })}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response requesting bulk quote: ${util.inspect(message.data.body, { depth: Infinity })}`, 500);
+                        error.mojaloopError = message.data.body;
                     }
                     else {
                         this._logger.push({ message }).log(`Ignoring cache notification for bulk quote ${bulkQuoteKey}. Unknown message type ${message.type}.`);
@@ -297,8 +297,8 @@ class OutboundBulkQuotesModel {
                     let message = JSON.parse(msg);
 
                     if (message.type === 'bulkQuoteError') {
-                        error = new BackendError(`Got an error response retrieving bulk quote: ${util.inspect(message.data, { depth: Infinity })}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response retrieving bulk quote: ${util.inspect(message.data.body, { depth: Infinity })}`, 500);
+                        error.mojaloopError = message.data.body;
                     } else if (message.type !== 'bulkQuoteResponse') {
                         this._logger.push({ message }).log(`Ignoring cache notification for bulk quote ${bulkQuoteKey}. Uknokwn message type ${message.type}.`);
                         return;

package/src/lib/model/OutboundBulkTransfersModel.js

@@ -161,8 +161,8 @@ class OutboundBulkTransfersModel {
                             }
                         }
                     } else if (message.type === 'bulkTransferError') {
-                        error = new BackendError(`Got an error response preparing bulk transfer: ${util.inspect(message.data, { depth: Infinity })}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response preparing bulk transfer: ${util.inspect(message.data.body, { depth: Infinity })}`, 500);
+                        error.mojaloopError = message.data.body;
                     }
                     else {
                         this._logger.push({ message }).log(`Ignoring cache notification for bulk transfer ${bulkTransferKey}. Unknown message type ${message.type}.`);
@@ -289,8 +289,8 @@ class OutboundBulkTransfersModel {
                     let message = JSON.parse(msg);
 
                     if (message.type === 'bulkTransferError') {
-                        error = new BackendError(`Got an error response retrieving bulk transfer: ${util.inspect(message.data, { depth: Infinity })}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response retrieving bulk transfer: ${util.inspect(message.data.body, { depth: Infinity })}`, 500);
+                        error.mojaloopError = message.data.body;
                     } else if (message.type !== 'bulkTransferFulfil') {
                         this._logger.push({ message }).log(`Ignoring cache notification for bulk transfer ${bulkTransferKey}. Uknokwn message type ${message.type}.`);
                         return;

package/src/lib/model/OutboundRequestToPayTransferModel.js

@@ -267,11 +267,10 @@ class OutboundRequestToPayTransferModel {
             const subId = await this._cache.subscribe(payeeKey, (cn, msg, subId) => {
                 try {
                     let payee = JSON.parse(msg);
-
-                    if(payee.errorInformation) {
+                    if(payee.body && payee.body.errorInformation) {
                         // this is an error response to our GET /parties request
-                        const err = new BackendError(`Got an error response resolving party: ${util.inspect(payee)}`, 500);
-                        err.mojaloopError = payee;
+                        const err = new BackendError(`Got an error response resolving party: ${util.inspect(payee.body)}`, 500);
+                        err.mojaloopError = payee.body;
 
                         // cancel the timeout handler
                         clearTimeout(timeout);
@@ -405,8 +404,8 @@ class OutboundRequestToPayTransferModel {
                             }
                         }
                     } else if (message.type === 'quoteResponseError') {
-                        error = new BackendError(`Got an error response requesting quote: ${util.inspect(message.data)}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response requesting quote: ${util.inspect(message.data.body)}`, 500);
+                        error.mojaloopError = message.data.body;
                     }
                     else {
                         this._logger.push({ message }).log(`Ignoring cache notification for quote ${quoteKey}. Unknown message type ${message.type}.`);
@@ -620,8 +619,8 @@ class OutboundRequestToPayTransferModel {
                             }
                         }
                     } else if (message.type === 'transferError') {
-                        error = new BackendError(`Got an error response preparing transfer: ${util.inspect(message.data)}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response preparing transfer: ${util.inspect(message.data.body)}`, 500);
+                        error.mojaloopError = message.data.body;
                     } else {
                         this._logger.push({ message }).log(`Ignoring cache notification for transfer ${transferKey}. Uknokwn message type ${message.type}.`);
                         return;
@@ -701,8 +700,8 @@ class OutboundRequestToPayTransferModel {
                     let message = JSON.parse(msg);
 
                     if (message.type === 'transferError') {
-                        error = new BackendError(`Got an error response retrieving transfer: ${util.inspect(message.data)}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response retrieving transfer: ${util.inspect(message.data.body)}`, 500);
+                        error.mojaloopError = message.data.body;
                     } else if (message.type !== 'transferFulfil') {
                         this._logger.push({ message }).log(`Ignoring cache notification for transfer ${transferKey}. Uknokwn message type ${message.type}.`);
                         return;

package/src/lib/model/OutboundTransfersModel.js

@@ -497,8 +497,8 @@ class OutboundTransfersModel {
                             }
                         }
                     } else if (message.type === 'quoteResponseError') {
-                        error = new BackendError(`Got an error response requesting quote: ${util.inspect(message.data, { depth: Infinity })}`, 500);
-                        error.mojaloopError = message.data;
+                        error = new BackendError(`Got an error response requesting quote: ${util.inspect(message.data.body, { depth: Infinity })}`, 500);
+                        error.mojaloopError = message.data.body;
                     }
                     else {
                         this._logger.push({ message }).log(`Ignoring cache notification for quote ${quoteKey}. Unknown message type ${message.type}.`);

package/src/lib/model/PartiesModel.js

@@ -58,12 +58,28 @@ function argsValidation({ type, id, subId }) {
     }
 }
 
+/**
+ * @name reformatMessage
+ * @description reformats message received from PUB/SUB channel, it is optional method, if not specified identify function is used by default
+ * @param {object} message - message received
+ * @returns {object} - reformatted message
+ */
+function reformatMessage(message) {
+    return {
+        party: {
+            body: { ...message.body.party },
+            headers: { ...message.headers }
+        }
+    };
+}
+
 // generate model
 const PartiesModel = Async2SyncModel.generate({
     modelName: 'PartiesModel',
     channelNameMethod: channelName,
     requestActionMethod: requestAction,
-    argsValidationMethod: argsValidation
+    argsValidationMethod: argsValidation,
+    reformatMessageMethod: reformatMessage
 });
 
 module.exports = PartiesModel;

package/test/integration/lib/Outbound/parties.test.js

@@ -13,7 +13,9 @@ describe('/parties', () => {
 
         expect(res.status).toEqual(200);
         expect(res.data.currentState).toEqual('COMPLETED');
-        expect(typeof res.data.body.party).toEqual('object');
+        expect(typeof res.data.party).toEqual('object');
+        expect(typeof res.data.party.body).toEqual('object');
+        expect(typeof res.data.party.headers).toEqual('object');
     });
 
     test('get - timeout', (done) => {

package/test/integration/lib/Outbound/quotes.test.js

@@ -30,6 +30,8 @@ describe('/quotes', () => {
         expect(res.status).toEqual(200);
         expect(res.data.currentState).toEqual('COMPLETED');
         expect(typeof res.data.quotes).toEqual('object');
+        expect(typeof res.data.quotes.body).toEqual('object');
+        expect(typeof res.data.quotes.headers).toEqual('object');
     });
 
     test('post - timeout', (done) => {

package/test/integration/lib/Outbound/simpleTransfers.test.js

@@ -39,6 +39,8 @@ describe('/simpleTransfers', () => {
         expect(res.status).toEqual(200);
         expect(res.data.currentState).toEqual('COMPLETED');
         expect(typeof res.data.transfer).toEqual('object');
+        expect(typeof res.data.transfer.body).toEqual('object');
+        expect(typeof res.data.transfer.headers).toEqual('object');
     });
 
     test('post - timeout', async () => {

package/test/unit/api/transfers/utils.js

@@ -202,7 +202,7 @@ function createPostTransfersTester(
 
         const res = await reqOutbound.post('/transfers').send(postTransfersSimpleBody);
         const {body} = res;
-        console.log(body)
+
         expect(res.statusCode).toEqual(responseCode);
 
         // remove elements of the response we do not want/need to compare for correctness.

package/test/unit/lib/model/OutboundBulkQuotesModel.test.js

@@ -207,10 +207,13 @@ describe('OutboundBulkQuotesModel', () => {
         const expectError = {
             type: 'bulkQuoteResponseError',
             data: {
-                errorInformation: {
-                    errorCode: '3205',
-                    errorDescription: 'Bulk quote ID not found'
-                }
+                body: {
+                    errorInformation: {
+                        errorCode: '3205',
+                        errorDescription: 'Bulk quote ID not found'
+                    }
+                },
+                headers: {}
             }
         };
 
@@ -239,7 +242,7 @@ describe('OutboundBulkQuotesModel', () => {
             expect(err.message.replace(/[ \n]/g,'')).toEqual(errMsg.replace(/[ \n]/g,''));
             expect(err.bulkQuoteState).toBeTruthy();
             expect(err.bulkQuoteState.lastError).toBeTruthy();
-            expect(err.bulkQuoteState.lastError.mojaloopError).toEqual(expectError.data);
+            expect(err.bulkQuoteState.lastError.mojaloopError).toEqual(expectError.data.body);
             expect(err.bulkQuoteState.lastError.bulkQuoteState).toBe(undefined);
             return;
         }

package/test/unit/lib/model/OutboundBulkTransfersModel.test.js

@@ -202,10 +202,13 @@ describe('outboundBulkTransferModel', () => {
         const expectError = {
             type: 'bulkTransferError',
             data: {
-                errorInformation: {
-                    errorCode: '4001',
-                    errorDescription: 'Payer FSP insufficient liquidity'
-                }
+                body: {
+                    errorInformation: {
+                        errorCode: '4001',
+                        errorDescription: 'Payer FSP insufficient liquidity'
+                    }
+                },
+                headers: {}
             }
         };
 
@@ -234,7 +237,7 @@ describe('outboundBulkTransferModel', () => {
             expect(err.message.replace(/[ \n]/g,'')).toEqual(errMsg.replace(/[ \n]/g,''));
             expect(err.bulkTransferState).toBeTruthy();
             expect(err.bulkTransferState.lastError).toBeTruthy();
-            expect(err.bulkTransferState.lastError.mojaloopError).toEqual(expectError.data);
+            expect(err.bulkTransferState.lastError.mojaloopError).toEqual(expectError.data.body);
             expect(err.bulkTransferState.lastError.bulkTransferState).toBe(undefined);
             return;
         }

package/test/unit/lib/model/OutboundTransfersModel.test.js

@@ -1390,10 +1390,13 @@ describe('outboundModel', () => {
         const expectError = {
             type: 'quoteResponseError',
             data: {
-                errorInformation: {
-                    errorCode: '3205',
-                    errorDescription: 'Quote ID not found'
-                }
+                body: {
+                    errorInformation: {
+                        errorCode: '3205',
+                        errorDescription: 'Quote ID not found'
+                    }
+                },
+                headers: {}
             }
         };
 
@@ -1430,7 +1433,7 @@ describe('outboundModel', () => {
             expect(err.message.replace(/[ \n]/g,'')).toEqual(errMsg.replace(/[ \n]/g,''));
             expect(err.transferState).toBeTruthy();
             expect(err.transferState.lastError).toBeTruthy();
-            expect(err.transferState.lastError.mojaloopError).toEqual(expectError.data);
+            expect(err.transferState.lastError.mojaloopError).toEqual(expectError.data.body);
             expect(err.transferState.lastError.transferState).toBe(undefined);
             return;
         }

package/test/unit/lib/model/PartiesModel.test.js

@@ -155,9 +155,12 @@ describe('PartiesModel', () => {
             model.run = jest.fn(() => Promise.resolve());
 
             const message = {
-                party: {
-                    Iam: 'the-body'
-                }
+                body: {
+                    party: {
+                        Iam: 'the-body'
+                    }
+                },
+                headers: {}
             };
 
             const onRequestActionPromise = new Promise((resolve, reject) => {
@@ -175,7 +178,10 @@ describe('PartiesModel', () => {
 
                         // check that this.context.data is updated
                         expect(model.context.data).toEqual({
-                            ...message,
+                            party: {
+                                body: { ...message.body.party },
+                                headers: { ...message.headers }
+                            },
                             // current state will be updated by onAfterTransition which isn't called
                             // when manual invocation of transition handler happens
                             currentState: 'start'
@@ -216,9 +222,12 @@ describe('PartiesModel', () => {
             model.run = jest.fn(() => Promise.resolve());
 
             const message = {
-                party: {
-                    Iam: 'the-body'
-                }
+                body: {
+                    party: {
+                        Iam: 'the-body'
+                    }
+                },
+                headers: {}
             };
 
             const onRequestActionPromise = new Promise((resolve, reject) => {

package/test/unit/lib/model/QuotesModel.test.js

@@ -142,7 +142,10 @@ describe('QuotesModel', () => {
             // mock workflow execution which is tested in separate case
             model.run = jest.fn(() => Promise.resolve());
 
-            const message = { ...putQuotesResponse };
+            const message = {
+                body: { ...putQuotesResponse },
+                headers: {}
+            };
 
             const onRequestActionPromise = new Promise((resolve, reject) => {
                 // manually invoke transition handler
@@ -200,7 +203,10 @@ describe('QuotesModel', () => {
             // mock workflow execution which is tested in separate case
             model.run = jest.fn(() => Promise.resolve());
 
-            const message = { ...putQuotesResponse };
+            const message = {
+                body: { ...putQuotesResponse },
+                headers: {}
+            };
 
             const onRequestActionPromise = new Promise((resolve, reject) => {
                 // manually invoke transition handler

package/test/unit/lib/model/TransfersModel.test.js

@@ -142,7 +142,10 @@ describe('TransfersModel', () => {
             // mock workflow execution which is tested in separate case
             model.run = jest.fn(() => Promise.resolve());
 
-            const message = { ...putTransfersResponse };
+            const message = {
+                body: { ...putTransfersResponse },
+                headers: {}
+            };
 
             const onRequestActionPromise = new Promise((resolve, reject) => {
                 // manually invoke transition handler
@@ -200,7 +203,10 @@ describe('TransfersModel', () => {
             // mock workflow execution which is tested in separate case
             model.run = jest.fn(() => Promise.resolve());
 
-            const message = { ...putTransfersResponse };
+            const message = {
+                body: { ...putTransfersResponse },
+                headers: {}
+            };
 
             const onRequestActionPromise = new Promise((resolve, reject) => {
                 // manually invoke transition handler