@mojaloop/sdk-scheme-adapter 24.2.0 → 24.2.1-snapshot.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.yarn/cache/@hapi-hapi-npm-21.4.0-2644a983d1-4e6ccd65ba.zip +0 -0
- package/.yarn/cache/@hapi-statehood-npm-8.2.0-5844e85740-0ebe5fa44e.zip +0 -0
- package/.yarn/cache/@mojaloop-central-services-shared-npm-18.22.1-afa19f2925-27182cd5be.zip +0 -0
- package/.yarn/cache/{@mojaloop-event-sdk-npm-14.1.5-97dbf6c0e3-9d5836df5a.zip → @mojaloop-event-sdk-npm-14.3.0-2aa8149477-6173c7d96f.zip} +0 -0
- package/.yarn/cache/@mojaloop-inter-scheme-proxy-cache-lib-npm-2.3.7-87034262d3-37fe9b388c.zip +0 -0
- package/.yarn/cache/@mojaloop-sdk-standard-components-npm-19.10.0-snapshot.1-e9bbd7866c-90ec21d0f6.zip +0 -0
- package/.yarn/cache/{@types-node-npm-22.13.9-565bb4cd14-d36ae841fa.zip → @types-node-npm-22.13.10-af5336e62b-1cd6b899df.zip} +0 -0
- package/.yarn/cache/axios-npm-1.8.2-55671cda10-c47a43b79a.zip +0 -0
- package/.yarn/cache/ioredis-npm-5.6.0-2140ad9baf-b085cec251.zip +0 -0
- package/.yarn/install-state.gz +0 -0
- package/modules/api-svc/package.json +5 -5
- package/modules/api-svc/src/config.js +2 -2
- package/modules/api-svc/src/index.js +2 -1
- package/modules/api-svc/src/lib/logger.js +47 -0
- package/modules/api-svc/src/lib/utils.js +1 -19
- package/modules/api-svc/test/integration/lib/cache.test.js +2 -7
- package/modules/api-svc/test/integration-pm4ml/mockServers/managementService/config.js +3 -2
- package/modules/api-svc/test/integration-pm4ml/mockServers/managementService/index.js +25 -24
- package/modules/api-svc/test/integration-pm4ml/mockServers/managementService/server.js +0 -1
- package/modules/api-svc/test/unit/BackendEventHandler.test.js +2 -2
- package/modules/api-svc/test/unit/ControlClient.test.js +5 -4
- package/modules/api-svc/test/unit/FSPIOPEventHandler.test.js +6 -5
- package/modules/api-svc/test/unit/InboundServer-iso20022.test.js +3 -3
- package/modules/api-svc/test/unit/InboundServer.test.js +3 -2
- package/modules/api-svc/test/unit/TestServer.test.js +10 -11
- package/modules/api-svc/test/unit/api/transfers/utils.js +2 -2
- package/modules/api-svc/test/unit/api/utils.js +4 -3
- package/modules/api-svc/test/unit/ilp.test.js +3 -2
- package/modules/api-svc/test/unit/inboundApi/handlers-iso20022.test.js +5 -5
- package/modules/api-svc/test/unit/inboundApi/handlers.test.js +28 -27
- package/modules/api-svc/test/unit/index.test.js +9 -13
- package/modules/api-svc/test/unit/lib/cache.test.js +2 -2
- package/modules/api-svc/test/unit/lib/model/AccountsModel.test.js +3 -2
- package/modules/api-svc/test/unit/lib/model/InboundTransfersModel.test.js +10 -8
- package/modules/api-svc/test/unit/lib/model/OutboundBulkQuotesModel.test.js +4 -4
- package/modules/api-svc/test/unit/lib/model/OutboundBulkTransfersModel.test.js +3 -2
- package/modules/api-svc/test/unit/lib/model/OutboundRequestToPayModel.test.js +5 -4
- package/modules/api-svc/test/unit/lib/model/OutboundRequestToPayTransferModel.test.js +4 -4
- package/modules/api-svc/test/unit/lib/model/OutboundTransfersISO20022.test.js +5 -6
- package/modules/api-svc/test/unit/lib/model/OutboundTransfersModel.test.js +4 -3
- package/modules/api-svc/test/unit/lib/model/lib/requests/backendRequests.test.js +3 -2
- package/modules/api-svc/test/unit/mockLogger.js +10 -7
- package/modules/outbound-command-event-handler/package.json +3 -3
- package/modules/outbound-domain-event-handler/package.json +2 -2
- package/modules/private-shared-lib/package.json +3 -3
- package/package.json +2 -2
|
@@ -18,17 +18,18 @@ process.env.SUPPORTED_CURRENCIES='USD';
|
|
|
18
18
|
|
|
19
19
|
jest.mock('~/lib/model');
|
|
20
20
|
|
|
21
|
+
const FSPIOPTransferStateEnum = require('@mojaloop/central-services-shared').Enum.Transfers.TransferState;
|
|
21
22
|
const handlers = require('~/InboundServer/handlers');
|
|
22
23
|
const Model = require('~/lib/model').InboundTransfersModel;
|
|
23
24
|
const QuotesModel = require('~/lib/model').QuotesModel;
|
|
24
25
|
const PartiesModel = require('~/lib/model').PartiesModel;
|
|
25
26
|
const TransfersModel = require('~/lib/model').TransfersModel;
|
|
27
|
+
const { createLogger } = require('~/lib/logger');
|
|
26
28
|
|
|
27
29
|
const mockArguments = require('./data/mockArguments');
|
|
28
30
|
const mockTransactionRequestData = require('./data/mockTransactionRequest');
|
|
29
|
-
const { Logger } = require('@mojaloop/sdk-standard-components');
|
|
30
31
|
|
|
31
|
-
const
|
|
32
|
+
const logger = createLogger({ context: { app: 'inbound-handlers-unit-test' }, stringify: () => '' });
|
|
32
33
|
|
|
33
34
|
describe('Inbound API handlers:', () => {
|
|
34
35
|
let mockArgs;
|
|
@@ -54,7 +55,7 @@ describe('Inbound API handlers:', () => {
|
|
|
54
55
|
response: {},
|
|
55
56
|
state: {
|
|
56
57
|
conf: {},
|
|
57
|
-
logger
|
|
58
|
+
logger
|
|
58
59
|
}
|
|
59
60
|
};
|
|
60
61
|
|
|
@@ -92,7 +93,7 @@ describe('Inbound API handlers:', () => {
|
|
|
92
93
|
'ID': '1234567890'
|
|
93
94
|
}
|
|
94
95
|
},
|
|
95
|
-
logger
|
|
96
|
+
logger,
|
|
96
97
|
}
|
|
97
98
|
};
|
|
98
99
|
|
|
@@ -129,7 +130,7 @@ describe('Inbound API handlers:', () => {
|
|
|
129
130
|
'ID': '1234567890'
|
|
130
131
|
}
|
|
131
132
|
},
|
|
132
|
-
logger
|
|
133
|
+
logger,
|
|
133
134
|
cache: {
|
|
134
135
|
publish: jest.fn(() => Promise.resolve(true))
|
|
135
136
|
}
|
|
@@ -173,7 +174,7 @@ describe('Inbound API handlers:', () => {
|
|
|
173
174
|
response: {},
|
|
174
175
|
state: {
|
|
175
176
|
conf: {},
|
|
176
|
-
logger
|
|
177
|
+
logger,
|
|
177
178
|
}
|
|
178
179
|
};
|
|
179
180
|
|
|
@@ -211,7 +212,7 @@ describe('Inbound API handlers:', () => {
|
|
|
211
212
|
'ID': '1234567890'
|
|
212
213
|
}
|
|
213
214
|
},
|
|
214
|
-
logger
|
|
215
|
+
logger,
|
|
215
216
|
cache: {
|
|
216
217
|
publish: async () => Promise.resolve(true)
|
|
217
218
|
}
|
|
@@ -261,7 +262,7 @@ describe('Inbound API handlers:', () => {
|
|
|
261
262
|
'ID': '1234567890'
|
|
262
263
|
}
|
|
263
264
|
},
|
|
264
|
-
logger
|
|
265
|
+
logger,
|
|
265
266
|
cache: {
|
|
266
267
|
publish: async () => Promise.resolve(true)
|
|
267
268
|
}
|
|
@@ -305,7 +306,7 @@ describe('Inbound API handlers:', () => {
|
|
|
305
306
|
'ID': '1234567890'
|
|
306
307
|
}
|
|
307
308
|
},
|
|
308
|
-
logger
|
|
309
|
+
logger,
|
|
309
310
|
}
|
|
310
311
|
};
|
|
311
312
|
});
|
|
@@ -335,7 +336,7 @@ describe('Inbound API handlers:', () => {
|
|
|
335
336
|
response: {},
|
|
336
337
|
state: {
|
|
337
338
|
conf: {},
|
|
338
|
-
logger
|
|
339
|
+
logger,
|
|
339
340
|
}
|
|
340
341
|
};
|
|
341
342
|
|
|
@@ -373,7 +374,7 @@ describe('Inbound API handlers:', () => {
|
|
|
373
374
|
'ID': '1234567890'
|
|
374
375
|
}
|
|
375
376
|
},
|
|
376
|
-
logger
|
|
377
|
+
logger,
|
|
377
378
|
cache: {
|
|
378
379
|
publish: async () => Promise.resolve(true)
|
|
379
380
|
}
|
|
@@ -423,7 +424,7 @@ describe('Inbound API handlers:', () => {
|
|
|
423
424
|
'ID': '1234567890'
|
|
424
425
|
}
|
|
425
426
|
},
|
|
426
|
-
logger
|
|
427
|
+
logger,
|
|
427
428
|
cache: {
|
|
428
429
|
publish: async () => Promise.resolve(true)
|
|
429
430
|
}
|
|
@@ -473,7 +474,7 @@ describe('Inbound API handlers:', () => {
|
|
|
473
474
|
'ID': '4d99aeb4-e198-4398-b644-eb4ba42530cd'
|
|
474
475
|
}
|
|
475
476
|
},
|
|
476
|
-
logger
|
|
477
|
+
logger,
|
|
477
478
|
cache: {
|
|
478
479
|
publish: async () => Promise.resolve(true)
|
|
479
480
|
}
|
|
@@ -517,7 +518,7 @@ describe('Inbound API handlers:', () => {
|
|
|
517
518
|
'ID': '1234567890'
|
|
518
519
|
}
|
|
519
520
|
},
|
|
520
|
-
logger
|
|
521
|
+
logger,
|
|
521
522
|
}
|
|
522
523
|
};
|
|
523
524
|
});
|
|
@@ -547,7 +548,7 @@ describe('Inbound API handlers:', () => {
|
|
|
547
548
|
response: {},
|
|
548
549
|
state: {
|
|
549
550
|
conf: {},
|
|
550
|
-
logger
|
|
551
|
+
logger,
|
|
551
552
|
}
|
|
552
553
|
};
|
|
553
554
|
});
|
|
@@ -583,7 +584,7 @@ describe('Inbound API handlers:', () => {
|
|
|
583
584
|
'ID': '1234'
|
|
584
585
|
}
|
|
585
586
|
},
|
|
586
|
-
logger
|
|
587
|
+
logger,
|
|
587
588
|
}
|
|
588
589
|
};
|
|
589
590
|
});
|
|
@@ -620,7 +621,7 @@ describe('Inbound API handlers:', () => {
|
|
|
620
621
|
'ID': '1234'
|
|
621
622
|
}
|
|
622
623
|
},
|
|
623
|
-
logger
|
|
624
|
+
logger,
|
|
624
625
|
}
|
|
625
626
|
};
|
|
626
627
|
});
|
|
@@ -656,7 +657,7 @@ describe('Inbound API handlers:', () => {
|
|
|
656
657
|
'ID': '1234567890'
|
|
657
658
|
}
|
|
658
659
|
},
|
|
659
|
-
logger
|
|
660
|
+
logger,
|
|
660
661
|
cache: {
|
|
661
662
|
publish: jest.fn(() => Promise.resolve(true))
|
|
662
663
|
}
|
|
@@ -728,7 +729,7 @@ describe('Inbound API handlers:', () => {
|
|
|
728
729
|
'ID': '1234567890'
|
|
729
730
|
}
|
|
730
731
|
},
|
|
731
|
-
logger
|
|
732
|
+
logger,
|
|
732
733
|
cache: {
|
|
733
734
|
publish: jest.fn(() => Promise.resolve(true))
|
|
734
735
|
}
|
|
@@ -795,7 +796,7 @@ describe('Inbound API handlers:', () => {
|
|
|
795
796
|
'ID': '1234567890'
|
|
796
797
|
}
|
|
797
798
|
},
|
|
798
|
-
logger
|
|
799
|
+
logger,
|
|
799
800
|
cache: {
|
|
800
801
|
publish: jest.fn(() => Promise.resolve(true))
|
|
801
802
|
}
|
|
@@ -856,7 +857,7 @@ describe('Inbound API handlers:', () => {
|
|
|
856
857
|
response: {},
|
|
857
858
|
state: {
|
|
858
859
|
conf: {},
|
|
859
|
-
logger
|
|
860
|
+
logger,
|
|
860
861
|
}
|
|
861
862
|
};
|
|
862
863
|
|
|
@@ -895,7 +896,7 @@ describe('Inbound API handlers:', () => {
|
|
|
895
896
|
'ID': '1234567890'
|
|
896
897
|
}
|
|
897
898
|
},
|
|
898
|
-
logger
|
|
899
|
+
logger,
|
|
899
900
|
cache: {
|
|
900
901
|
publish: jest.fn(() => Promise.resolve(true))
|
|
901
902
|
}
|
|
@@ -946,7 +947,7 @@ describe('Inbound API handlers:', () => {
|
|
|
946
947
|
'ID': '1234567890'
|
|
947
948
|
}
|
|
948
949
|
},
|
|
949
|
-
logger
|
|
950
|
+
logger,
|
|
950
951
|
cache: {
|
|
951
952
|
publish: async () => Promise.resolve(true)
|
|
952
953
|
}
|
|
@@ -985,7 +986,7 @@ describe('Inbound API handlers:', () => {
|
|
|
985
986
|
response: {},
|
|
986
987
|
state: {
|
|
987
988
|
conf: {},
|
|
988
|
-
logger
|
|
989
|
+
logger,
|
|
989
990
|
}
|
|
990
991
|
};
|
|
991
992
|
|
|
@@ -1024,7 +1025,7 @@ describe('Inbound API handlers:', () => {
|
|
|
1024
1025
|
'ID': '1234567890'
|
|
1025
1026
|
}
|
|
1026
1027
|
},
|
|
1027
|
-
logger
|
|
1028
|
+
logger,
|
|
1028
1029
|
cache: {
|
|
1029
1030
|
publish: jest.fn(() => Promise.resolve(true))
|
|
1030
1031
|
}
|
|
@@ -1071,7 +1072,7 @@ describe('Inbound API handlers:', () => {
|
|
|
1071
1072
|
'ID': '1234'
|
|
1072
1073
|
}
|
|
1073
1074
|
},
|
|
1074
|
-
logger
|
|
1075
|
+
logger,
|
|
1075
1076
|
}
|
|
1076
1077
|
};
|
|
1077
1078
|
});
|
|
@@ -1112,7 +1113,7 @@ describe('Inbound API handlers:', () => {
|
|
|
1112
1113
|
'ID': '1234567890'
|
|
1113
1114
|
}
|
|
1114
1115
|
},
|
|
1115
|
-
logger
|
|
1116
|
+
logger,
|
|
1116
1117
|
cache: {
|
|
1117
1118
|
publish: async () => Promise.resolve(true)
|
|
1118
1119
|
}
|
|
@@ -25,27 +25,23 @@
|
|
|
25
25
|
--------------
|
|
26
26
|
******/
|
|
27
27
|
|
|
28
|
-
|
|
28
|
+
process.env.PEER_ENDPOINT = '172.17.0.3:4000';
|
|
29
|
+
process.env.BACKEND_ENDPOINT = '172.17.0.5:4000';
|
|
30
|
+
process.env.CACHE_URL = 'redis://172.17.0.2:6379';
|
|
31
|
+
process.env.MGMT_API_WS_URL = '0.0.0.0';
|
|
32
|
+
process.env.SUPPORTED_CURRENCIES='USD';
|
|
29
33
|
|
|
30
34
|
jest.mock('dotenv', () => ({
|
|
31
35
|
config: jest.fn()
|
|
32
36
|
}));
|
|
33
37
|
|
|
34
38
|
const promClient = require('prom-client');
|
|
35
|
-
const
|
|
36
|
-
const {
|
|
39
|
+
const index = require('~/index');
|
|
40
|
+
const { createLogger } = require('~/lib/logger');
|
|
37
41
|
|
|
42
|
+
const defaultConfig = require('./data/defaultConfig.json');
|
|
38
43
|
const TestControlServer = require('./ControlServer');
|
|
39
44
|
|
|
40
|
-
|
|
41
|
-
process.env.PEER_ENDPOINT = '172.17.0.3:4000';
|
|
42
|
-
process.env.BACKEND_ENDPOINT = '172.17.0.5:4000';
|
|
43
|
-
process.env.CACHE_URL = 'redis://172.17.0.2:6379';
|
|
44
|
-
process.env.MGMT_API_WS_URL = '0.0.0.0';
|
|
45
|
-
process.env.SUPPORTED_CURRENCIES='USD';
|
|
46
|
-
|
|
47
|
-
const index = require('~/index.js');
|
|
48
|
-
|
|
49
45
|
describe('index.js', () => {
|
|
50
46
|
beforeEach(() => {
|
|
51
47
|
promClient.register.clear();
|
|
@@ -66,7 +62,7 @@ describe('Server', () => {
|
|
|
66
62
|
|
|
67
63
|
beforeEach(async () => {
|
|
68
64
|
promClient.register.clear();
|
|
69
|
-
logger =
|
|
65
|
+
logger = createLogger({ stringify: () => '' });
|
|
70
66
|
conf = JSON.parse(JSON.stringify(defaultConfig));
|
|
71
67
|
conf.enableTestFeatures = true;
|
|
72
68
|
conf.pm4mlEnabled = true;
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
jest.mock('redis');
|
|
31
31
|
|
|
32
32
|
const randomUUID = require('@mojaloop/central-services-shared').Util.id({ type: 'ulid' });
|
|
33
|
-
const { Logger } = require('@mojaloop/sdk-standard-components');
|
|
34
33
|
const Cache = require('~/lib/cache');
|
|
34
|
+
const { createLogger } = require('~/lib/logger');
|
|
35
35
|
|
|
36
36
|
const createCache = async () => {
|
|
37
|
-
const logger =
|
|
37
|
+
const logger = createLogger({ context: { app: 'model-unit-tests-cache' } });
|
|
38
38
|
const cache = new Cache({
|
|
39
39
|
cacheUrl: 'redis://dummy:1234',
|
|
40
40
|
logger,
|
|
@@ -43,7 +43,8 @@ const Cache = require('~/lib/cache');
|
|
|
43
43
|
const { AccountsModel } = require('~/lib/model');
|
|
44
44
|
|
|
45
45
|
const StateMachine = require('javascript-state-machine');
|
|
46
|
-
const { MojaloopRequests
|
|
46
|
+
const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
|
|
47
|
+
const { createLogger } = require('~/lib/logger');
|
|
47
48
|
const { SDKStateEnum } = require('../../../../src/lib/model/common');
|
|
48
49
|
|
|
49
50
|
const defaultConfig = require('./data/defaultConfig');
|
|
@@ -114,7 +115,7 @@ describe('AccountsModel', () => {
|
|
|
114
115
|
}
|
|
115
116
|
|
|
116
117
|
beforeAll(() => {
|
|
117
|
-
logger =
|
|
118
|
+
logger = createLogger({ context: { app: 'outbound-model-unit-tests-cache' }, stringify: () => '' });
|
|
118
119
|
});
|
|
119
120
|
|
|
120
121
|
beforeEach(async () => {
|
|
@@ -40,15 +40,19 @@ jest.mock('redis');
|
|
|
40
40
|
jest.mock('~/lib/model/lib/requests',() => require('./mockedLibRequests'));
|
|
41
41
|
|
|
42
42
|
const randomUUID = require('@mojaloop/central-services-shared').Util.id({type: 'ulid'});
|
|
43
|
-
const
|
|
43
|
+
const { MojaloopRequests, Ilp } = require('@mojaloop/sdk-standard-components');
|
|
44
|
+
const { createLogger } = require('~/lib/logger');
|
|
45
|
+
const { BackendRequests, HTTPResponseError } = require('~/lib/model/lib/requests');
|
|
46
|
+
const Cache = require('~/lib/cache');
|
|
47
|
+
const shared = require('~/lib/model/lib/shared');
|
|
44
48
|
const Model = require('~/lib/model').InboundTransfersModel;
|
|
49
|
+
|
|
50
|
+
const { SDKStateEnum } = require('../../../../src/lib/model/common');
|
|
51
|
+
|
|
52
|
+
const defaultConfig = require('./data/defaultConfig');
|
|
45
53
|
const mocks = require('./data/mocks');
|
|
46
54
|
const mockArguments = require('./data/mockArguments');
|
|
47
55
|
const mockTxnReqquestsArguments = require('./data/mockTxnRequestsArguments');
|
|
48
|
-
const { MojaloopRequests, Ilp, Logger } = require('@mojaloop/sdk-standard-components');
|
|
49
|
-
const { BackendRequests, HTTPResponseError } = require('~/lib/model/lib/requests');
|
|
50
|
-
const Cache = require('~/lib/cache');
|
|
51
|
-
const shared = require('~/lib/model/lib/shared');
|
|
52
56
|
|
|
53
57
|
const getTransfersBackendResponse = require('./data/getTransfersBackendResponse');
|
|
54
58
|
const getTransfersMojaloopResponse = require('./data/getTransfersMojaloopResponse');
|
|
@@ -61,8 +65,6 @@ const fxNotificationToBackend = require('./data/fxNotificationToBackend.json');
|
|
|
61
65
|
const fxNotificationAbortedToBackend = require('./data/fxNotificationAbortedToBackend.json');
|
|
62
66
|
const fxNotificationReservedToBackend = require('./data/fxNotificationReservedToBackend.json');
|
|
63
67
|
|
|
64
|
-
const { SDKStateEnum } = require('../../../../src/lib/model/common');
|
|
65
|
-
const { version } = require('os');
|
|
66
68
|
const FSPIOPTransferStateEnum = require('@mojaloop/central-services-shared').Enum.Transfers.TransferState;
|
|
67
69
|
const FSPIOPBulkTransferStateEnum = require('@mojaloop/central-services-shared').Enum.Transfers.BulkTransferState;
|
|
68
70
|
|
|
@@ -73,7 +75,7 @@ describe('inboundModel', () => {
|
|
|
73
75
|
let logger;
|
|
74
76
|
|
|
75
77
|
beforeAll(async () => {
|
|
76
|
-
logger =
|
|
78
|
+
logger = createLogger({ context: { app: 'inbound-model-unit-tests' }, stringify: () => '' });
|
|
77
79
|
});
|
|
78
80
|
|
|
79
81
|
beforeEach(async () => {
|
|
@@ -40,12 +40,12 @@ process.env.SUPPORTED_CURRENCIES='USD';
|
|
|
40
40
|
jest.mock('@mojaloop/sdk-standard-components');
|
|
41
41
|
jest.mock('redis');
|
|
42
42
|
|
|
43
|
+
const StateMachine = require('javascript-state-machine');
|
|
44
|
+
const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
|
|
45
|
+
const { createLogger } = require('~/lib/logger');
|
|
43
46
|
const Cache = require('~/lib/cache');
|
|
44
47
|
const Model = require('~/lib/model').OutboundBulkQuotesModel;
|
|
45
48
|
|
|
46
|
-
const { MojaloopRequests, Logger } = require('@mojaloop/sdk-standard-components');
|
|
47
|
-
const StateMachine = require('javascript-state-machine');
|
|
48
|
-
|
|
49
49
|
const { SDKStateEnum } = require('../../../../src/lib/model/common');
|
|
50
50
|
|
|
51
51
|
const defaultConfig = require('./data/defaultConfig');
|
|
@@ -107,7 +107,7 @@ describe('OutboundBulkQuotesModel', () => {
|
|
|
107
107
|
}
|
|
108
108
|
|
|
109
109
|
beforeAll(async () => {
|
|
110
|
-
logger =
|
|
110
|
+
logger = createLogger({ context: { app: 'outbound-model-unit-tests-cache' }, stringify: () => '' });
|
|
111
111
|
bulkQuoteResponse = JSON.parse(JSON.stringify(bulkQuoteResponseTemplate));
|
|
112
112
|
});
|
|
113
113
|
|
|
@@ -43,8 +43,9 @@ jest.mock('redis');
|
|
|
43
43
|
const Cache = require('~/lib/cache');
|
|
44
44
|
const Model = require('~/lib/model').OutboundBulkTransfersModel;
|
|
45
45
|
|
|
46
|
-
const { MojaloopRequests, Logger } = require('@mojaloop/sdk-standard-components');
|
|
47
46
|
const StateMachine = require('javascript-state-machine');
|
|
47
|
+
const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
|
|
48
|
+
const { createLogger } = require('~/lib/logger');
|
|
48
49
|
const { SDKStateEnum } = require('../../../../src/lib/model/common');
|
|
49
50
|
|
|
50
51
|
const defaultConfig = require('./data/defaultConfig');
|
|
@@ -102,7 +103,7 @@ describe('outboundBulkTransferModel', () => {
|
|
|
102
103
|
}
|
|
103
104
|
|
|
104
105
|
beforeAll(async () => {
|
|
105
|
-
logger =
|
|
106
|
+
logger = createLogger({ context: { app: 'outbound-model-unit-tests-cache' }, stringify: () => '' });
|
|
106
107
|
});
|
|
107
108
|
|
|
108
109
|
beforeEach(async () => {
|
|
@@ -38,17 +38,18 @@ process.env.SUPPORTED_CURRENCIES='USD';
|
|
|
38
38
|
jest.mock('@mojaloop/sdk-standard-components');
|
|
39
39
|
jest.mock('redis');
|
|
40
40
|
|
|
41
|
+
const StateMachine = require('javascript-state-machine');
|
|
42
|
+
const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
|
|
43
|
+
const { createLogger } = require('~/lib/logger');
|
|
41
44
|
const Cache = require('~/lib/cache');
|
|
42
45
|
const Model = require('~/lib/model').OutboundRequestToPayModel;
|
|
43
46
|
const PartiesModel = require('~/lib/model').PartiesModel;
|
|
44
47
|
|
|
45
|
-
const { MojaloopRequests, Logger } = require('@mojaloop/sdk-standard-components');
|
|
46
|
-
const StateMachine = require('javascript-state-machine');
|
|
47
48
|
const { SDKStateEnum } = require('../../../../src/lib/model/common');
|
|
48
49
|
|
|
49
50
|
const defaultConfig = require('./data/defaultConfig');
|
|
50
|
-
const requestToPayRequest = require('./data/requestToPayRequest');
|
|
51
51
|
const payeeParty = require('./data/payeeParty');
|
|
52
|
+
const requestToPayRequest = require('./data/requestToPayRequest');
|
|
52
53
|
const transactionRequestResponseTemplate = require('./data/transactionRequestResponse');
|
|
53
54
|
|
|
54
55
|
const genPartyId = (party) => {
|
|
@@ -85,7 +86,7 @@ describe('outboundModel', () => {
|
|
|
85
86
|
*/
|
|
86
87
|
|
|
87
88
|
beforeAll(async () => {
|
|
88
|
-
logger =
|
|
89
|
+
logger = createLogger({ context: { app: 'outbound-model-unit-tests-cache' }, stringify: () => '' });
|
|
89
90
|
transactionRequestResponse = JSON.parse(JSON.stringify(transactionRequestResponseTemplate));
|
|
90
91
|
});
|
|
91
92
|
|
|
@@ -38,11 +38,12 @@ process.env.SUPPORTED_CURRENCIES='USD';
|
|
|
38
38
|
jest.mock('@mojaloop/sdk-standard-components');
|
|
39
39
|
jest.mock('redis');
|
|
40
40
|
|
|
41
|
+
const StateMachine = require('javascript-state-machine');
|
|
42
|
+
const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
|
|
43
|
+
const { createLogger } = require('~/lib/logger');
|
|
41
44
|
const Cache = require('~/lib/cache');
|
|
42
45
|
const Model = require('~/lib/model').OutboundRequestToPayTransferModel;
|
|
43
46
|
|
|
44
|
-
const { MojaloopRequests, Logger } = require('@mojaloop/sdk-standard-components');
|
|
45
|
-
const StateMachine = require('javascript-state-machine');
|
|
46
47
|
const { SDKStateEnum } = require('../../../../src/lib/model/common');
|
|
47
48
|
|
|
48
49
|
const defaultConfig = require('./data/defaultConfig');
|
|
@@ -57,7 +58,6 @@ const emitQuoteResponseCacheMessage = (cache, quoteId, quoteResponse) => cache.p
|
|
|
57
58
|
// util function to simulate a authorizations response subscription message on a cache client
|
|
58
59
|
const emitAuthorizationsResponseCacheMessage = (cache, authorizationsResponse) => cache.publish(`otp_${requestToPayTransferRequest.transactionRequestId}`, JSON.stringify(authorizationsResponse));
|
|
59
60
|
|
|
60
|
-
|
|
61
61
|
// util function to simulate a transfer fulfilment subscription message on a cache client
|
|
62
62
|
const emitTransferFulfilCacheMessage = (cache, transferId, fulfil) => cache.publish(`tf_${transferId}`, JSON.stringify(fulfil));
|
|
63
63
|
|
|
@@ -81,7 +81,7 @@ describe('outboundRequestToPayTransferModel', () => {
|
|
|
81
81
|
|
|
82
82
|
|
|
83
83
|
beforeAll(async () => {
|
|
84
|
-
logger =
|
|
84
|
+
logger = createLogger({ context: { app: 'outbound-model-unit-tests-cache' }, stringify: () => '' });
|
|
85
85
|
quoteResponse = JSON.parse(JSON.stringify(quoteResponseTemplate));
|
|
86
86
|
});
|
|
87
87
|
|
|
@@ -35,15 +35,14 @@ process.env.SUPPORTED_CURRENCIES='USD';
|
|
|
35
35
|
jest.mock('redis');
|
|
36
36
|
jest.unmock('@mojaloop/sdk-standard-components');
|
|
37
37
|
|
|
38
|
-
const
|
|
38
|
+
const StateMachine = require('javascript-state-machine');
|
|
39
39
|
const { MojaloopRequests } = jest.requireActual('@mojaloop/sdk-standard-components');
|
|
40
40
|
|
|
41
41
|
const Cache = require('~/lib/cache');
|
|
42
|
-
const { MetricsClient } = require('~/lib/metrics');
|
|
43
42
|
const Model = require('~/lib/model').OutboundTransfersModel;
|
|
44
43
|
const PartiesModel = require('~/lib/model').PartiesModel;
|
|
45
|
-
|
|
46
|
-
const
|
|
44
|
+
const { createLogger } = require('~/lib/logger');
|
|
45
|
+
const { MetricsClient } = require('~/lib/metrics');
|
|
47
46
|
|
|
48
47
|
const defaultConfig = require('./data/defaultConfig');
|
|
49
48
|
const transferRequest = require('./data/transferRequest');
|
|
@@ -160,7 +159,7 @@ describe('API_TYPE="iso20022"', () => {
|
|
|
160
159
|
|
|
161
160
|
beforeEach(async () => {
|
|
162
161
|
config = JSON.parse(JSON.stringify(defaultConfig));
|
|
163
|
-
logger =
|
|
162
|
+
logger = createLogger({ context: { app: 'outbound-model-unit-tests-cache' }, stringify: () => '' });
|
|
164
163
|
cache = new Cache({
|
|
165
164
|
cacheUrl: 'redis://dummy:1234',
|
|
166
165
|
logger,
|
|
@@ -187,7 +186,7 @@ describe('API_TYPE="iso20022"', () => {
|
|
|
187
186
|
|
|
188
187
|
// mock the final method MojaloopRequests calls to send the http request
|
|
189
188
|
// this allows us to spy on the request body being sent
|
|
190
|
-
jest.spyOn(Object.getPrototypeOf(MojaloopRequests.prototype), '_request').mockImplementation(async (opts
|
|
189
|
+
jest.spyOn(Object.getPrototypeOf(MojaloopRequests.prototype), '_request').mockImplementation(async (opts) => {
|
|
191
190
|
// console.log(`_reqeust called ${opts}`);
|
|
192
191
|
if(opts.uri.includes('parties') && opts.method === 'GET') {
|
|
193
192
|
//get parties called
|
|
@@ -37,7 +37,7 @@ process.env.SUPPORTED_CURRENCIES='USD';
|
|
|
37
37
|
jest.mock('@mojaloop/sdk-standard-components');
|
|
38
38
|
jest.mock('redis');
|
|
39
39
|
|
|
40
|
-
const { MojaloopRequests
|
|
40
|
+
const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
|
|
41
41
|
const FSPIOPTransferStateEnum = require('@mojaloop/central-services-shared').Enum.Transfers.TransferState;
|
|
42
42
|
const StateMachine = require('javascript-state-machine');
|
|
43
43
|
|
|
@@ -45,6 +45,7 @@ const Model = require('~/lib/model').OutboundTransfersModel;
|
|
|
45
45
|
const PartiesModel = require('~/lib/model').PartiesModel;
|
|
46
46
|
const Cache = require('~/lib/cache');
|
|
47
47
|
const { MetricsClient } = require('~/lib/metrics');
|
|
48
|
+
const { createLogger } = require('~/lib/logger');
|
|
48
49
|
|
|
49
50
|
const mocks = require('./data/mocks');
|
|
50
51
|
const defaultConfig = require('./data/defaultConfig');
|
|
@@ -178,7 +179,7 @@ describe('OutboundTransfersModel Tests', () => {
|
|
|
178
179
|
}
|
|
179
180
|
|
|
180
181
|
beforeAll(async () => {
|
|
181
|
-
logger =
|
|
182
|
+
logger = createLogger({ context: { app: 'outbound-model-unit-tests-cache' }, stringify: () => '' });
|
|
182
183
|
quoteResponse = JSON.parse(JSON.stringify(quoteResponseTemplate));
|
|
183
184
|
metricsClient = new MetricsClient();
|
|
184
185
|
});
|
|
@@ -1659,7 +1660,7 @@ describe('OutboundTransfersModel Tests', () => {
|
|
|
1659
1660
|
beforeEach(() => {
|
|
1660
1661
|
model = new Model({
|
|
1661
1662
|
cache,
|
|
1662
|
-
logger:
|
|
1663
|
+
logger: createLogger({ context: { app: 'outbound-model-fx-flow-unit-tests' } }),
|
|
1663
1664
|
metricsClient,
|
|
1664
1665
|
...config,
|
|
1665
1666
|
});
|
|
@@ -27,15 +27,16 @@
|
|
|
27
27
|
**********/
|
|
28
28
|
|
|
29
29
|
jest.unmock('@mojaloop/sdk-standard-components');
|
|
30
|
-
|
|
30
|
+
|
|
31
31
|
const { mockAxios } = require('../../../../../helpers');
|
|
32
|
+
const { createLogger } = require('~/lib/logger');
|
|
32
33
|
|
|
33
34
|
const { BackendRequests, HTTPResponseError } = require('../../../../../../src/lib/model/lib/requests');
|
|
34
35
|
const defaultConfig = require('../../data/defaultConfig');
|
|
35
36
|
|
|
36
37
|
const config = {
|
|
37
38
|
...defaultConfig,
|
|
38
|
-
logger:
|
|
39
|
+
logger: createLogger(),
|
|
39
40
|
};
|
|
40
41
|
|
|
41
42
|
describe('backendRequests Tests -->', () => {
|
|
@@ -26,7 +26,8 @@
|
|
|
26
26
|
- Paweł Marzec <pawel.marzec@modusbox.com>
|
|
27
27
|
--------------
|
|
28
28
|
******/
|
|
29
|
-
|
|
29
|
+
|
|
30
|
+
const { createLogger } = require('../../src/lib/logger');
|
|
30
31
|
|
|
31
32
|
function mockLogger(context, keepQuiet) {
|
|
32
33
|
// if keepQuite is undefined then be quiet
|
|
@@ -44,7 +45,8 @@ function mockLogger(context, keepQuiet) {
|
|
|
44
45
|
error: jest.fn(),
|
|
45
46
|
trace: jest.fn(),
|
|
46
47
|
info: jest.fn(),
|
|
47
|
-
fatal: jest.fn(),
|
|
48
|
+
// fatal: jest.fn(),
|
|
49
|
+
// todo: add all methods from ContextLogger
|
|
48
50
|
|
|
49
51
|
isVerboseEnabled: jest.fn(() => true),
|
|
50
52
|
isDebugEnabled: jest.fn(() => true),
|
|
@@ -52,16 +54,17 @@ function mockLogger(context, keepQuiet) {
|
|
|
52
54
|
isErrorEnabled: jest.fn(() => true),
|
|
53
55
|
isTraceEnabled: jest.fn(() => true),
|
|
54
56
|
isInfoEnabled: jest.fn(() => true),
|
|
55
|
-
isFatalEnabled: jest.fn(() => true)
|
|
57
|
+
// isFatalEnabled: jest.fn(() => true)
|
|
56
58
|
};
|
|
57
59
|
const mockLogger = ({
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
60
|
+
...methods,
|
|
61
|
+
push: jest.fn(() => mockLogger),
|
|
62
|
+
child: jest.fn(() => mockLogger)
|
|
63
|
+
});
|
|
61
64
|
|
|
62
65
|
return mockLogger;
|
|
63
66
|
}
|
|
64
|
-
return
|
|
67
|
+
return createLogger();
|
|
65
68
|
}
|
|
66
69
|
|
|
67
70
|
module.exports = mockLogger;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mojaloop/sdk-scheme-adapter-outbound-command-event-handler",
|
|
3
|
-
"version": "0.3.0-snapshot.
|
|
3
|
+
"version": "0.3.0-snapshot.25",
|
|
4
4
|
"description": "Mojaloop sdk scheme adapter command event handler",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
44
|
"@mojaloop/api-snippets": "17.8.0",
|
|
45
|
-
"@mojaloop/central-services-shared": "18.
|
|
45
|
+
"@mojaloop/central-services-shared": "18.22.1",
|
|
46
46
|
"@mojaloop/logging-bc-client-lib": "0.5.8",
|
|
47
47
|
"@mojaloop/logging-bc-public-types-lib": "0.5.4",
|
|
48
48
|
"@mojaloop/sdk-scheme-adapter-private-shared-lib": "workspace:^",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"@types/convict": "6.1.6",
|
|
60
60
|
"@types/express": "5.0.0",
|
|
61
61
|
"@types/jest": "29.5.14",
|
|
62
|
-
"@types/node": "22.13.
|
|
62
|
+
"@types/node": "22.13.10",
|
|
63
63
|
"@types/node-cache": "4.2.5",
|
|
64
64
|
"@types/supertest": "6.0.2",
|
|
65
65
|
"@types/swagger-ui-express": "4.1.8",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mojaloop/sdk-scheme-adapter-outbound-domain-event-handler",
|
|
3
|
-
"version": "0.3.0-snapshot.
|
|
3
|
+
"version": "0.3.0-snapshot.25",
|
|
4
4
|
"description": "mojaloop sdk scheme adapter outbound domain event handler",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"@types/convict": "6.1.6",
|
|
57
57
|
"@types/express": "5.0.0",
|
|
58
58
|
"@types/jest": "29.5.14",
|
|
59
|
-
"@types/node": "22.13.
|
|
59
|
+
"@types/node": "22.13.10",
|
|
60
60
|
"@types/node-cache": "4.2.5",
|
|
61
61
|
"@types/supertest": "6.0.2",
|
|
62
62
|
"@types/swagger-ui-express": "4.1.8",
|