@mojaloop/sdk-scheme-adapter 15.0.0 → 17.0.0

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

@@ -28,6 +28,8 @@ const getTransfersMojaloopResponse = require('./data/getTransfersMojaloopRespons
 const getBulkTransfersBackendResponse = require('./data/getBulkTransfersBackendResponse');
 const getBulkTransfersMojaloopResponse = require('./data/getBulkTransfersMojaloopResponse');
 const notificationToPayee = require('./data/notificationToPayee');
+const notificationAbortedToPayee = require('./data/notificationAbortedToPayee');
+const notificationReservedToPayee = require('./data/notificationReservedToPayee');
 
 describe('inboundModel', () => {
     let config;
@@ -63,8 +65,7 @@ describe('inboundModel', () => {
             }));
 
             cache = new Cache({
-                host: 'dummycachehost',
-                port: 1234,
+                cacheUrl: 'redis://dummy:1234',
                 logger,
             });
             await cache.connect();
@@ -132,8 +133,7 @@ describe('inboundModel', () => {
             BackendRequests.__postBulkQuotes = jest.fn().mockReturnValue(Promise.resolve(mockArgs.internalBulkQuoteResponse));
 
             cache = new Cache({
-                host: 'dummycachehost',
-                port: 1234,
+                cacheUrl: 'redis://dummy:1234',
                 logger,
             });
             await cache.connect();
@@ -189,8 +189,7 @@ describe('inboundModel', () => {
             BackendRequests.__postTransactionRequests = jest.fn().mockReturnValue(Promise.resolve(mockTxnReqArgs.internalTransactionRequestResponse));
 
             cache = new Cache({
-                host: 'dummycachehost',
-                port: 1234,
+                cacheUrl: 'redis://dummy:1234',
                 logger,
             });
             await cache.connect();
@@ -226,8 +225,7 @@ describe('inboundModel', () => {
             BackendRequests.__getOTP = jest.fn().mockReturnValue(Promise.resolve(mockArgs.internalGetOTPResponse));
 
             cache = new Cache({
-                host: 'dummycachehost',
-                port: 1234,
+                cacheUrl: 'redis://dummy:1234',
                 logger,
             });
             await cache.connect();
@@ -268,8 +266,7 @@ describe('inboundModel', () => {
             }));
 
             cache = new Cache({
-                host: 'dummycachehost',
-                port: 1234,
+                cacheUrl: 'redis://dummy:1234',
                 logger,
             });
             await cache.connect();
@@ -547,8 +544,7 @@ describe('inboundModel', () => {
             BackendRequests.__postBulkTransfers = jest.fn().mockReturnValue(Promise.resolve({}));
 
             cache = new Cache({
-                host: 'dummycachehost',
-                port: 1234,
+                cacheUrl: 'redis://dummy:1234',
                 logger,
             });
             await cache.connect();
@@ -727,8 +723,7 @@ describe('inboundModel', () => {
 
         beforeEach(async () => {
             cache = new Cache({
-                host: 'dummycachehost',
-                port: 1234,
+                cacheUrl: 'redis://dummy:1234',
                 logger,
             });
             await cache.connect();
@@ -759,14 +754,58 @@ describe('inboundModel', () => {
             expect(call[0]).toEqual(expectedRequest);
             expect(call[1]).toEqual(transferId);
         });
+
+        test('sends ABORTED notification to fsp backend', async () => {
+            BackendRequests.__putTransfersNotification = jest.fn().mockReturnValue(Promise.resolve({}));
+            const notif = JSON.parse(JSON.stringify(notificationAbortedToPayee));
+
+            const expectedRequest = {
+                currentState: 'ABORTED',
+                finalNotification: notif.data,
+            };
+
+            const model = new Model({
+                ...config,
+                cache,
+                logger,
+            });
+
+            await model.sendNotificationToPayee(notif.data, transferId);
+            expect(BackendRequests.__putTransfersNotification).toHaveBeenCalledTimes(1);
+            const call = BackendRequests.__putTransfersNotification.mock.calls[0];
+            expect(call[0]).toEqual(expectedRequest);
+            expect(call[1]).toEqual(transferId);
+        });
+
+        test('sends RESERVED notification to fsp backend', async () => {
+            BackendRequests.__putTransfersNotification = jest.fn().mockReturnValue(Promise.resolve({}));
+            const notif = JSON.parse(JSON.stringify(notificationReservedToPayee));
+
+            const expectedRequest = {
+                finalNotification: notif.data,
+                lastError: 'Final notification state not COMMITTED',
+            };
+
+            const model = new Model({
+                ...config,
+                cache,
+                logger,
+            });
+
+            await model.sendNotificationToPayee(notif.data, transferId);
+            expect(BackendRequests.__putTransfersNotification).toHaveBeenCalledTimes(1);
+            const call = BackendRequests.__putTransfersNotification.mock.calls[0];
+            expect(call[0]).toEqual(expectedRequest);
+            expect(call[1]).toEqual(transferId);
+        });
+
     });
 
     describe('error handling:', () => {
         let cache;
         beforeEach(async () => {
             cache = new Cache({
-                host: 'dummycachehost',
-                port: 1234,
+                cacheUrl: 'redis://dummy:1234',
                 logger,
             });
             await cache.connect();

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

@@ -91,10 +91,9 @@ describe('OutboundBulkQuotesModel', () => {
         MojaloopRequests.__putBulkQuotesError = jest.fn(() => Promise.resolve());
 
         cache = new Cache({
-            host: 'dummycachehost',
-            port: 1234,
-            logger,
-        });
+                cacheUrl: 'redis://dummy:1234',
+                logger,
+            });
         await cache.connect();
     });
 

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

@@ -83,8 +83,7 @@ describe('outboundBulkTransferModel', () => {
         MojaloopRequests.__postBulkTransfers = jest.fn(() => Promise.resolve());
 
         cache = new Cache({
-            host: 'dummycachehost',
-            port: 1234,
+            cacheUrl: 'redis://dummy:1234',
             logger,
         });
         await cache.connect();

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

@@ -71,10 +71,9 @@ describe('outboundModel', () => {
         MojaloopRequests.__postTransactionRequests = jest.fn(() => Promise.resolve());
 
         cache = new Cache({
-            host: 'dummycachehost',
-            port: 1234,
-            logger,
-        });
+                cacheUrl: 'redis://dummy:1234',
+                logger,
+            });
         await cache.connect();
     });
 

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

@@ -71,10 +71,9 @@ describe('outboundRequestToPayTransferModel', () => {
         MojaloopRequests.__postTransfers = jest.fn(() => Promise.resolve());
 
         cache = new Cache({
-            host: 'dummycachehost',
-            port: 1234,
-            logger,
-        });
+                cacheUrl: 'redis://dummy:1234',
+                logger,
+            });
         await cache.connect();
     });
 

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

@@ -163,8 +163,7 @@ describe('outboundModel', () => {
             }
         }));
         cache = new Cache({
-            host: 'dummycachehost',
-            port: 1234,
+            cacheUrl: 'redis://dummy:1234',
             logger,
         });
         await cache.connect();
@@ -1526,7 +1525,7 @@ describe('outboundModel', () => {
         testTlsServer(false));
 
     test('Outbound transfers model should record metrics', async () => {
-        const metrics = metricsClient._prometheusRegister.metrics();
+        const metrics = await metricsClient._prometheusRegister.metrics();
         expect(metrics).toBeTruthy();
 
         expect(metrics).toEqual(expect.stringContaining('mojaloop_connector_outbound_party_lookup_request_count'));

package/test/unit/lib/model/common/PersistentStateMachine.test.js

@@ -72,10 +72,9 @@ describe('PersistentStateMachine', () => {
         data = { the: 'data' };
 
         cache = new Cache({
-            host: 'dummycachehost',
-            port: 1234,
-            logger,
-        });
+                cacheUrl: 'redis://dummy:1234',
+                logger,
+            });
         // mock cache set & get
         cache.get = jest.fn(async () => data);
         cache.set = jest.fn(async () => 'cache set replies');

package/test/unit/lib/model/data/defaultConfig.json

@@ -38,10 +38,7 @@
   "jwsSignPutParties": false,
   "jwsSigningKey": "/jwsSigningKey.key",
   "jwsVerificationKeysDirectory": null,
-  "cacheConfig": {
-    "host": "localhost",
-    "port": 6379
-  },
+  "cacheUrl": "redis://localhost:6379",
   "enableTestFeatures": false,
   "oauthTestServer": {
     "enabled": false,

package/test/unit/lib/model/data/notificationAbortedToPayee.json

@@ -0,0 +1,10 @@
+{
+  "type": "notificationToPayee",
+  "headers": {
+    "fspiop-source": "SWITCH"
+  },
+  "data": {
+    "completedTimestamp": "2017-11-15T14:16:09.663+01:00",
+    "transferState": "ABORTED"
+  }
+}

package/test/unit/lib/model/data/notificationReservedToPayee.json

@@ -0,0 +1,10 @@
+{
+  "type": "notificationToPayee",
+  "headers": {
+    "fspiop-source": "SWITCH"
+  },
+  "data": {
+    "completedTimestamp": "2017-11-15T14:16:09.663+01:00",
+    "transferState": "RESERVED"
+  }
+}