@mojaloop/sdk-scheme-adapter 12.0.1 → 12.2.0

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

@@ -14,8 +14,8 @@
 jest.mock('@mojaloop/sdk-standard-components');
 jest.mock('redis');
 
-const Cache = require('../../../../lib/cache');
-const Model = require('../../../../lib/model').OutboundRequestToPayTransferModel;
+const Cache = require('~/lib/cache');
+const Model = require('~/lib/model').OutboundRequestToPayTransferModel;
 
 const { MojaloopRequests, Logger } = require('@mojaloop/sdk-standard-components');
 const StateMachine = require('javascript-state-machine');

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

@@ -14,9 +14,9 @@
 jest.mock('@mojaloop/sdk-standard-components');
 jest.mock('redis');
 
-const Cache = require('../../../../lib/cache');
-const Model = require('../../../../lib/model').OutboundTransfersModel;
-const PartiesModel = require('../../../../lib/model').PartiesModel;
+const Cache = require('~/lib/cache');
+const Model = require('~/lib/model').OutboundTransfersModel;
+const PartiesModel = require('~/lib/model').PartiesModel;
 
 const { MojaloopRequests, Logger } = require('@mojaloop/sdk-standard-components');
 const StateMachine = require('javascript-state-machine');
@@ -354,6 +354,39 @@ describe('outboundModel', () => {
         expect(StateMachine.__instance.state).toBe('payeeResolved');
     });
 
+    test('uses payee party fspid as source header when supplied - resolving payee', async () => {
+        config.autoAcceptParty = false;
+
+        const model = new Model({
+            cache,
+            logger,
+            ...config,
+        });
+
+        let req = JSON.parse(JSON.stringify(transferRequest));
+        const testFspId = 'TESTDESTFSPID';
+        req.to.fspId = testFspId;
+
+        await model.initialize(req);
+
+        expect(StateMachine.__instance.state).toBe('start');
+
+        // start the model running
+        const resultPromise = model.run();
+
+        // now we started the model running we simulate a callback with the resolved party
+        emitPartyCacheMessage(cache, payeeParty);
+
+        // wait for the model to reach a terminal state
+        const result = await resultPromise;
+
+        // check we stopped at payeeResolved state
+        expect(result.currentState).toBe('WAITING_FOR_PARTY_ACCEPTANCE');
+        expect(StateMachine.__instance.state).toBe('payeeResolved');
+
+        // check getParties mojaloop requests method was called with the correct arguments
+        expect(MojaloopRequests.__getParties).toHaveBeenCalledWith(req.to.idType, req.to.idValue, req.to.idSubValue, testFspId);
+    });
 
     test('halts after resolving payee, resumes and then halts after receiving quote response when AUTO_ACCEPT_PARTY is false and AUTO_ACCEPT_QUOTES is false', async () => {
         config.autoAcceptParty = false;

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

@@ -14,19 +14,19 @@
 jest.mock('@mojaloop/sdk-standard-components');
 
 const { uuid } = require('uuidv4');
-const Model = require('../../../../lib/model').PartiesModel;
-const PSM = require('../../../../lib/model/common').PersistentStateMachine;
+const Model = require('~/lib/model').PartiesModel;
+const PSM = require('~/lib/model/common').PersistentStateMachine;
 const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
 const defaultConfig = require('./data/defaultConfig');
 const mockLogger = require('../../mockLogger');
-const deferredJob = require('../../../../lib/model/lib').deferredJob;
+const deferredJob = require('~/lib/model/lib').deferredJob;
 const pt = require('promise-timeout');
 
 describe('PartiesModel', () => {
     let cacheKey;
     let data;
     let modelConfig;
-  
+
     const subId = 123;
     let handler = null;
     beforeEach(async () => {
@@ -44,7 +44,7 @@ describe('PartiesModel', () => {
                     handler = jest.fn(h);
                     return subId;
                 }),
-            
+
                 // mock publish and call stored handler
                 publish: jest.fn(async (channel, message) => await handler(channel, message, subId)),
 
@@ -53,7 +53,7 @@ describe('PartiesModel', () => {
             ...defaultConfig
         };
         data = { the: 'mocked data' };
-        
+
         cacheKey = 'cache-key';
     });
 
@@ -62,7 +62,7 @@ describe('PartiesModel', () => {
             const model = await Model.create(data, cacheKey, modelConfig);
 
             expect(model.state).toBe('start');
-            
+
             // model's methods layout
             const methods = [
                 'run',
@@ -75,7 +75,7 @@ describe('PartiesModel', () => {
     });
 
     describe('getResponse', () => {
-        
+
         it('should remap currentState', async () => {
             const model = await Model.create(data, cacheKey, modelConfig);
             const states = model.allStates();
@@ -85,12 +85,12 @@ describe('PartiesModel', () => {
                 const result = model.getResponse();
                 expect(result.currentState).toEqual(Model.mapCurrentState[state]);
             });
-            
+
         });
 
         it('should handle unexpected state', async() => {
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             // simulate lack of state by undefined property
             delete model.context.data.currentState;
 
@@ -176,9 +176,9 @@ describe('PartiesModel', () => {
                         // check that this.context.data is updated
                         expect(model.context.data).toEqual({
                             ...message,
-                            // current state will be updated by onAfterTransition which isn't called 
+                            // current state will be updated by onAfterTransition which isn't called
                             // when manual invocation of transition handler happens
-                            currentState: 'start'   
+                            currentState: 'start'
                         });
                         // handler should be called only once
                         expect(handler).toBeCalledTimes(1);
@@ -195,7 +195,7 @@ describe('PartiesModel', () => {
 
             // ensure that cache.unsubscribe does not happened before fire the message
             expect(cache.unsubscribe).not.toBeCalled();
-           
+
             // fire publication with given message
             const df = deferredJob(cache, channel);
             setImmediate(() => df.trigger(message));
@@ -250,10 +250,10 @@ describe('PartiesModel', () => {
 
             // ensure that cache.unsubscribe does not happened before fire the message
             expect(cache.unsubscribe).not.toBeCalled();
-           
+
             // fire publication with given message
             const df = deferredJob(cache, channel);
-            
+
             setTimeout(
                 () => { df.trigger(message); },
                 // ensure that publication will be far long after timeout should be auto triggered
@@ -285,7 +285,7 @@ describe('PartiesModel', () => {
                     });
             });
 
-            // fire publication to channel with invalid message 
+            // fire publication to channel with invalid message
             // should throw the exception from JSON.parse
             const df = deferredJob(cache, channel);
             setImmediate(() => df.trigger(undefined));
@@ -328,7 +328,7 @@ describe('PartiesModel', () => {
             const subIdValue = uuid();
 
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             model.requestAction = jest.fn();
             model.getResponse = jest.fn(() => Promise.resolve({the: 'response'}));
 
@@ -349,12 +349,12 @@ describe('PartiesModel', () => {
             const subIdValue = uuid();
 
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             model.getResponse = jest.fn(() => Promise.resolve({the: 'response'}));
-            
+
             model.context.data.currentState = 'succeeded';
             const result = await model.run({ type, id, subId: subIdValue });
-            
+
             expect(result).toEqual({the: 'response'});
             expect(model.getResponse).toBeCalledTimes(1);
             expect(model.context.logger.log).toBeCalledWith('Action called successfully');
@@ -366,12 +366,12 @@ describe('PartiesModel', () => {
             const subIdValue = uuid();
 
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             model.getResponse = jest.fn(() => Promise.resolve({the: 'response'}));
-            
+
             model.context.data.currentState = 'errored';
             const result = await model.run({ type, id, subId: subIdValue });
-            
+
             expect(result).toBeFalsy();
             expect(model.getResponse).not.toBeCalled();
             expect(model.context.logger.log).toBeCalledWith('State machine in errored state');
@@ -383,7 +383,7 @@ describe('PartiesModel', () => {
             const subIdValue = uuid();
 
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             model.requestAction = jest.fn(() => { throw new Error('mocked error'); });
 
             model.context.data.currentState = 'start';
@@ -405,7 +405,7 @@ describe('PartiesModel', () => {
             const subIdValue = uuid();
 
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             model.requestAction = jest.fn(() => {
                 const err = new Error('requestAction failed');
                 err.requestActionState = 'some';
@@ -413,7 +413,7 @@ describe('PartiesModel', () => {
             });
             model.error = jest.fn();
             model.context.data.currentState = 'start';
-            
+
             let theError = null;
             try {
                 await model.run({ type, id, subId: subIdValue });
@@ -431,7 +431,7 @@ describe('PartiesModel', () => {
         it('should handle input validation for id/subId params', async () => {
             const type = uuid();
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             expect(() => model.run(type))
                 .rejects.toEqual(
                     new Error('PartiesModel args required at least two string arguments: \'type\' and \'id\'')
@@ -465,4 +465,4 @@ describe('PartiesModel', () => {
             );
         });
     });
-});
+});

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

@@ -14,12 +14,12 @@
 jest.mock('@mojaloop/sdk-standard-components');
 
 const { uuid } = require('uuidv4');
-const Model = require('../../../../lib/model').QuotesModel;
-const PSM = require('../../../../lib/model/common').PersistentStateMachine;
+const Model = require('~/lib/model').QuotesModel;
+const PSM = require('~/lib/model/common').PersistentStateMachine;
 const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
 const defaultConfig = require('./data/defaultConfig');
 const mockLogger = require('../../mockLogger');
-const deferredJob = require('../../../../lib/model/lib').deferredJob;
+const deferredJob = require('~/lib/model/lib').deferredJob;
 const pt = require('promise-timeout');
 const putQuotesResponse = require('./data/putQuotesResponse.json');
 
@@ -27,7 +27,7 @@ describe('QuotesModel', () => {
     let cacheKey;
     let data;
     let modelConfig;
-  
+
     const subId = uuid();
     let handler = null;
     beforeEach(async () => {
@@ -45,7 +45,7 @@ describe('QuotesModel', () => {
                     handler = jest.fn(h);
                     return subId;
                 }),
-            
+
                 // mock publish and call stored handler
                 publish: jest.fn(async (channel, message) => await handler(channel, message, subId)),
 
@@ -56,7 +56,7 @@ describe('QuotesModel', () => {
         data = {
             the: 'mocked data'
         };
-        
+
         cacheKey = `key-quotes-${uuid()}`;
     });
 
@@ -65,7 +65,7 @@ describe('QuotesModel', () => {
             const model = await Model.create(data, cacheKey, modelConfig);
 
             expect(model.state).toBe('start');
-            
+
             // model's methods layout
             const methods = [
                 'run',
@@ -78,7 +78,7 @@ describe('QuotesModel', () => {
     });
 
     describe('getResponse', () => {
-        
+
         it('should remap currentState', async () => {
             const model = await Model.create(data, cacheKey, modelConfig);
             const states = model.allStates();
@@ -88,12 +88,12 @@ describe('QuotesModel', () => {
                 const result = model.getResponse();
                 expect(result.currentState).toEqual(Model.mapCurrentState[state]);
             });
-            
+
         });
 
         it('should handle unexpected state', async() => {
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             // simulate lack of state by undefined property
             delete model.context.data.currentState;
 
@@ -160,9 +160,9 @@ describe('QuotesModel', () => {
                         // check that this.context.data is updated
                         expect(model.context.data).toEqual({
                             quotes: { ...message },
-                            // current state will be updated by onAfterTransition which isn't called 
+                            // current state will be updated by onAfterTransition which isn't called
                             // when manual invocation of transition handler happens
-                            currentState: 'start'   
+                            currentState: 'start'
                         });
                         // handler should be called only once
                         expect(handler).toBeCalledTimes(1);
@@ -179,7 +179,7 @@ describe('QuotesModel', () => {
 
             // ensure that cache.unsubscribe does not happened before fire the message
             expect(cache.unsubscribe).not.toBeCalled();
-           
+
             // fire publication with given message
             const df = deferredJob(cache, channel);
             setImmediate(() => df.trigger(message));
@@ -205,7 +205,7 @@ describe('QuotesModel', () => {
             const onRequestActionPromise = new Promise((resolve, reject) => {
                 // manually invoke transition handler
                 model.onRequestAction(model.fsm, { quoteId, fspId, quote })
-                    .then(() => reject())    
+                    .then(() => reject())
                     .catch((err) => {
                         // subscribe should be called only once
                         expect(err instanceof pt.TimeoutError).toBeTruthy();
@@ -231,10 +231,10 @@ describe('QuotesModel', () => {
 
             // ensure that cache.unsubscribe does not happened before fire the message
             expect(cache.unsubscribe).not.toBeCalled();
-           
+
             // fire publication with given message
             const df = deferredJob(cache, channel);
-            
+
             setTimeout(
                 () => { df.trigger(message); },
                 // ensure that publication will be far long after timeout should be auto triggered
@@ -254,7 +254,7 @@ describe('QuotesModel', () => {
             const model = await Model.create(data, cacheKey, modelConfig);
             const { cache } = model.context;
 
-            // fire publication to channel with invalid message 
+            // fire publication to channel with invalid message
             // should throw the exception from JSON.parse
             const df = deferredJob(cache, channel);
             setImmediate(() => df.trigger(undefined));
@@ -305,7 +305,7 @@ describe('QuotesModel', () => {
             const quote = { quoteId };
 
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             model.requestAction = jest.fn();
             model.getResponse = jest.fn(() => Promise.resolve({the: 'response'}));
 
@@ -327,12 +327,12 @@ describe('QuotesModel', () => {
             const quote = { quoteId };
 
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             model.getResponse = jest.fn(() => Promise.resolve({the: 'response'}));
-            
+
             model.context.data.currentState = 'succeeded';
             const result = await model.run({ quoteId, fspId, quote });
-            
+
             expect(result).toEqual({the: 'response'});
             expect(model.getResponse).toBeCalledTimes(1);
             expect(model.context.logger.log).toBeCalledWith('Action called successfully');
@@ -345,12 +345,12 @@ describe('QuotesModel', () => {
             const quote = { quoteId };
 
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             model.getResponse = jest.fn(() => Promise.resolve({the: 'response'}));
-            
+
             model.context.data.currentState = 'errored';
             const result = await model.run({ quoteId, fspId, quote});
-            
+
             expect(result).toBeFalsy();
             expect(model.getResponse).not.toBeCalled();
             expect(model.context.logger.log).toBeCalledWith('State machine in errored state');
@@ -363,7 +363,7 @@ describe('QuotesModel', () => {
             const quote = { quoteId };
 
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             model.requestAction = jest.fn(() => { throw new Error('mocked error'); });
 
             model.context.data.currentState = 'start';
@@ -387,7 +387,7 @@ describe('QuotesModel', () => {
             const quote = { quoteId };
 
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             model.requestAction = jest.fn(() => {
                 const err = new Error('requestAction failed');
                 err.requestActionState = 'some';
@@ -395,7 +395,7 @@ describe('QuotesModel', () => {
             });
             model.error = jest.fn();
             model.context.data.currentState = 'start';
-            
+
             let theError = null;
             try {
                 await model.run({ quoteId, fspId, quote });
@@ -412,7 +412,7 @@ describe('QuotesModel', () => {
 
         it('should handle input validation for lack of quoteId param', async () => {
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             expect(() => model.run({}))
                 .rejects.toEqual(
                     new Error('QuotesModel args requires \'quoteId\' is nonempty string and mandatory property')
@@ -422,7 +422,7 @@ describe('QuotesModel', () => {
         it('should handle input validation for not quoteId & quote.quoteId be in sync', async () => {
             const quoteId = uuid();
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             expect(() => model.run({quoteId, quote: { quoteId: uuid()}}))
                 .rejects.toEqual(
                     new Error('QuotesModel args requires properties \'quote.quoteId\' and \'quoteId\' to be the equal in value')
@@ -432,7 +432,7 @@ describe('QuotesModel', () => {
         it('should handle input validation for fspId param', async () => {
             const quoteId = uuid();
             const model = await Model.create(data, cacheKey, modelConfig);
-            
+
             expect(() => model.run({quoteId, fspId:'' }))
                 .rejects.toEqual(
                     new Error('QuotesModel args requires \'fspId\' to be nonempty string')
@@ -467,4 +467,4 @@ describe('QuotesModel', () => {
             );
         });
     });
-});
+});

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

@@ -14,12 +14,12 @@
 jest.mock('@mojaloop/sdk-standard-components');
 
 const { uuid } = require('uuidv4');
-const Model = require('../../../../lib/model').TransfersModel;
-const PSM = require('../../../../lib/model/common').PersistentStateMachine;
+const Model = require('~/lib/model').TransfersModel;
+const PSM = require('~/lib/model/common').PersistentStateMachine;
 const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
 const defaultConfig = require('./data/defaultConfig');
 const mockLogger = require('../../mockLogger');
-const deferredJob = require('../../../../lib/model/lib').deferredJob;
+const deferredJob = require('~/lib/model/lib').deferredJob;
 const pt = require('promise-timeout');
 const putTransfersResponse = require('./data/putTransfersResponse.json');
 

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

@@ -10,21 +10,21 @@
 
 'use strict';
 
-const Cache = jest.createMockFromModule('../../../../../lib/cache');
+const Cache = jest.createMockFromModule('~/lib/cache');
 
-const PSM = require('../../../../../lib/model').PersistentStateMachine;
+const PSM = require('~/lib/model').PersistentStateMachine;
 const mockLogger = require('../../../mockLogger');
 describe('PersistentStateMachine', () => {
     let cache;
     let data;
     let smSpec;
     const key = 'cache-key';
-    
+
     const logger = mockLogger({app: 'persistent-state-machine-test'});
 
     function checkPSMLayout(psm, optData) {
         expect(psm).toBeTruthy();
-        
+
         expect(psm.state).toEqual((optData && optData.currentState) || smSpec.init || 'none');
 
         expect(psm.context).toEqual({
@@ -54,7 +54,7 @@ describe('PersistentStateMachine', () => {
                 { name: 'init', from: 'none', to: 'start'},
                 { name: 'gogo', from: 'start', to: 'end' },
                 { name: 'error', from: '*', to: 'errored' }
-            ], 
+            ],
             methods: {
                 onGogo: async () => {
                     return new Promise( (resolved) => {
@@ -70,7 +70,7 @@ describe('PersistentStateMachine', () => {
 
         // test data
         data = { the: 'data' };
-        
+
         cache = new Cache({
             host: 'dummycachehost',
             port: 1234,
@@ -100,20 +100,20 @@ describe('PersistentStateMachine', () => {
         expect(psm.state).toEqual('start');
     });
 
-    describe('onPendingTransition', () => {        
+    describe('onPendingTransition', () => {
         it('should throw error if not `error` transition', async () => {
             const psm = await PSM.create(data, cache, key, logger, smSpec);
             checkPSMLayout(psm);
 
             psm.init();
             expect(() => psm.gogo()).toThrowError('Transition \'gogo\' requested while another transition is in progress');
-            
+
         });
 
         it('should not throw error if `error` transition called when `gogo` is pending', (done) => {
             PSM.create(data, cache, key, logger, smSpec).then((psm) => {
                 checkPSMLayout(psm);
-    
+
                 psm.init()
                     .then(() => {
                         expect(psm.state).toEqual('start');
@@ -125,7 +125,7 @@ describe('PersistentStateMachine', () => {
                     .then(done)
                     .catch(shouldNotBeExecuted);
             });
-        }); 
+        });
     });
 
     describe('loadFromCache', () => {
@@ -163,10 +163,10 @@ describe('PersistentStateMachine', () => {
     describe('saveToCache', () => {
 
         it('should rethrow error from cache.set', async () => {
-            
+
             // mock to simulate throwing error
             cache.set = jest.fn(() => { throw new Error('error from cache.set'); });
-            
+
             const psm = await PSM.create(data, cache, key, logger, smSpec);
             checkPSMLayout(psm);
             await psm.init();
@@ -176,4 +176,4 @@ describe('PersistentStateMachine', () => {
         });
     });
 
-});
+});

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

@@ -11,7 +11,7 @@
 'use strict';
 
 const util = require('util');
-const { BackendRequests } = jest.requireActual('../../../../lib/model/lib/requests');
+const { BackendRequests } = jest.requireActual('~/lib/model/lib/requests');
 
 const respErrSym = Symbol('ResponseErrorDataSym');
 

package/test/unit/outboundApi/handlers.test.js

@@ -24,9 +24,9 @@ const requestToPayTransferRequest = require('./data/requestToPayTransferRequest'
 const mockLogger = require('../mockLogger');
 const { uuid } = require('uuidv4');
 
-jest.mock('../../../lib/model');
+jest.mock('~/lib/model');
 
-const handlers = require('../../../OutboundServer/handlers');
+const handlers = require('~/OutboundServer/handlers');
 const {
     OutboundTransfersModel,
     OutboundBulkTransfersModel,
@@ -36,7 +36,7 @@ const {
     PartiesModel,
     QuotesModel,
     TransfersModel
-} = require('../../../lib/model');
+} = require('~/lib/model');
 
 /**
  * Mock the outbound transfer model to simulate throwing errors

package/.eslintignore

@@ -1,2 +0,0 @@
-coverage
-templates