@mojaloop/sdk-scheme-adapter 24.10.9-snapshot.0 → 24.10.9-snapshot.2

package/docker/k666/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "k6-tests",
+  "version": "1.0.0",
+  "description": "```bash docker run --rm -i grafana/k6 run --vus 1 --duration 10s - <./src/test.js ```",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Eugen Klymniuk",
+  "license": "MIT",
+  "dependencies": {
+    "k6": "0.0.0"
+  },
+  "devDependencies": {
+    "@types/k6": "1.1.1"
+  }
+}

package/modules/api-svc/package.json

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

package/modules/api-svc/src/InboundServer/handlers.js

@@ -1071,19 +1071,19 @@ const postFxTransfers = async (ctx) => {
 };
 
 const patchFxTransfersById = async (ctx) => {
-    const req = {
-        headers: { ...ctx.request.headers },
-        data: { ...ctx.request.body }
-    };
+    if (ctx.state.conf.isIsoApi) {
+        ctx.state.logger.push(ctx.request.body).debug('Transforming incoming ISO20022 patch fxTransfers body to FSPIOP');
+        const target = await TransformFacades.FSPIOPISO20022.fxTransfers.patch({ body: ctx.request.body }, { rollUpUnmappedAsExtensions: true });
+        ctx.request.body = target.body;
+    }
+
+    const data = { ...ctx.request.body };
     const idValue = ctx.state.path.params.ID;
 
     const model = createInboundTransfersModel(ctx);
+    const response = await model.sendFxPutNotificationToBackend(data, idValue);
 
-    const response = await model.sendFxPutNotificationToBackend(req.data, idValue);
-
-    // log the result
-    ctx.state.logger.isDebugEnabled && ctx.state.logger.push({response}).
-        debug('Inbound Transfers model handled PATCH /fxTransfers/{ID} request');
+    ctx.state.logger.push({ response }).debug('Inbound Transfers model handled PATCH /fxTransfers/{ID} request');
 };
 
 /**

package/modules/api-svc/src/lib/model/InboundTransfersModel.js

@@ -956,7 +956,7 @@ class InboundTransfersModel {
     async sendFxPutNotificationToBackend(body, conversionId) {
         const log = this._logger.child({ conversionId });
         try {
-            log.verbose('sendFxPutNotificationToBackend payload: ', { body });
+            log.verbose('sendFxPutNotificationToBackend incoming payload: ', { body });
             this.data = await this.loadFxState(conversionId);
 
             if(!this.data) {
@@ -976,7 +976,14 @@ class InboundTransfersModel {
 
             await this.saveFxState();
 
-            const res = await this._backendRequests.putFxTransfersNotification(body, conversionId);
+            const responseBody = {
+                conversionState: body.conversionState, // one of ABORTED, COMMITTED, RESERVED
+                completedTimestamp: new Date().toISOString(), // todo: get from body
+            };
+            log.verbose('sendFxPutNotificationToBackend sent body: ', { responseBody });
+
+
+            const res = await this._backendRequests.putFxTransfersNotification(responseBody, conversionId);
             return res;
         } catch (err) {
             log.error('error in sendFxPutNotificationToBackend: ', err);
@@ -996,7 +1003,11 @@ class InboundTransfersModel {
             }
 
             // tag the final notification body on to the state
-            this.data.finalNotification = body;
+            // According to the backend api it expects extensionList to be an array (see CSI-1680)
+            this.data.finalNotification = {
+                ...body,
+                ...(body.extensionList && { extensionList: body.extensionList.extension })
+            };
 
             if(body.transferState === FSPIOPTransferStateEnum.COMMITTED) {
                 // if the transfer was successful in the switch, set the overall transfer state to COMPLETED

package/modules/api-svc/test/unit/lib/model/InboundTransfersModel.test.js

@@ -873,7 +873,8 @@ describe('inboundModel', () => {
             await model.sendFxPutNotificationToBackend(notif.data, conversionId);
             expect(BackendRequests.__putFxTransfersNotification).toHaveBeenCalledTimes(1);
             const call = BackendRequests.__putFxTransfersNotification.mock.calls[0];
-            expect(call[0]).toEqual(fxNotificationToBackend.data);
+            expect(call[0].conversionState).toEqual(fxNotificationToBackend.data.conversionState);
+            expect(typeof call[0].completedTimestamp).toBe('string');
             expect(call[1]).toEqual(conversionId);
         });
 
@@ -891,7 +892,7 @@ describe('inboundModel', () => {
             await model.sendFxPutNotificationToBackend(notif.data, conversionId);
             expect(BackendRequests.__putFxTransfersNotification).toHaveBeenCalledTimes(1);
             const call = BackendRequests.__putFxTransfersNotification.mock.calls[0];
-            expect(call[0]).toEqual(fxNotificationAbortedToBackend.data);
+            expect(call[0].conversionState).toEqual(fxNotificationAbortedToBackend.data.conversionState);
             expect(call[1]).toEqual(conversionId);
         });
 
@@ -909,7 +910,7 @@ describe('inboundModel', () => {
             await model.sendFxPutNotificationToBackend(notif.data, conversionId);
             expect(BackendRequests.__putFxTransfersNotification).toHaveBeenCalledTimes(1);
             const call = BackendRequests.__putFxTransfersNotification.mock.calls[0];
-            expect(call[0]).toEqual(fxNotificationReservedToBackend.data);
+            expect(call[0].conversionState).toEqual(fxNotificationReservedToBackend.data.conversionState);
             expect(call[1]).toEqual(conversionId);
         });
 

package/modules/outbound-command-event-handler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-outbound-command-event-handler",
-  "version": "0.3.0-snapshot.48",
+  "version": "0.3.0-snapshot.50",
   "description": "Mojaloop sdk scheme adapter command event handler",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",

package/modules/outbound-domain-event-handler/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mojaloop/sdk-scheme-adapter-outbound-domain-event-handler",
-    "version": "0.3.0-snapshot.48",
+    "version": "0.3.0-snapshot.50",
     "description": "mojaloop sdk scheme adapter outbound domain event handler",
     "license": "Apache-2.0",
     "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",

package/modules/private-shared-lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-  "version": "0.4.0-snapshot.48",
+  "version": "0.4.0-snapshot.50",
   "description": "SDK Scheme Adapter private shared library.",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/accounts-and-balances-bc/tree/main/modules/private-types",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "24.10.9-snapshot.0",
+  "version": "24.10.9-snapshot.2",
   "description": "mojaloop sdk-scheme-adapter",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter",

package/docker/k6/src/test.js

@@ -1,43 +0,0 @@
-import http from 'k6/http';
-import { sleep } from 'k6';
-// import { Options } from 'k6/options';
-
-export const options = {
-  vus: 3,
-  iterations: 10,
-  duration: '3s'
-};
-
-// // The default exported function is gonna be picked up by k6 as the entry point for the test script. It will be executed repeatedly in "iterations" for the whole duration of the test.
-// export default function () {
-//   // Make a GET request to the target URL
-//   http.get('https://quickpizza.grafana.com');
-//
-//   // Sleep for 1 second to simulate real-world usage
-//   sleep(1);
-// }
-
-
-// const url = 'http://localhost:4000/parties/MSISDN/1233641534556178';
-const url = 'https://quickpizza.grafana.com/api/put';
-
-export default function () {
-  // const headers = {
-  //   'Content-Type': 'application/json',
-  //   Accept: 'application/vnd.interoperability.iso20022.parties+json;version=2.0'
-  // };
-  // const data = {};
-  const headers = { 'Content-Type': 'application/json' };
-  const data = { name: 'Bert' };
-
-  const res = http.put(url, JSON.stringify(data), { headers });
-
-  let body = {};
-  try {
-    body = JSON.parse(res.body)
-  } catch {}
-
-  console.log(body);
-
-  sleep(0.5)
-}