Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(mojaloop/2998): change ttk apis to async #409

Merged
merged 82 commits into from
Nov 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
08a9099
Added a design diagram
Jun 22, 2022
eb4e519
Formatted the sequence diagram and added notes
Jun 22, 2022
007fa96
feat: added autoaccept party/quotes
Jun 22, 2022
2f3e222
feat: added inbound diagram
Jun 22, 2022
9781bca
feat: added inbound diagram
Jun 22, 2022
0ebc6c1
Merge pull request #321 from mojaloop/feat/design-bulk-transfers-shashi
vijayg10 Jun 23, 2022
b35c209
chore: re-organized the folder structure of bulk design documents
Jun 23, 2022
e1f8220
chore: added a overview image
Jun 23, 2022
390792d
chore: changed image
Jun 23, 2022
da16ec2
fix formatting
Jun 23, 2022
3a84a0d
refactored outbound sequence diagram
Jun 23, 2022
c341c2b
chore: fixed quotes in bulk seq diagram
Jun 24, 2022
733d9df
fix: refactored the parties and quotes with proper states
Jun 24, 2022
617e69d
fix: defined proper states in outbound transfers seq diagram
Jun 24, 2022
eb532d6
feat: refined inbound bulk sequence diagrams
Jun 24, 2022
90cb8a5
feat: added redis message format
Jun 27, 2022
f914e42
chore: modified redis doc
Jun 27, 2022
ed21a6f
fix
Jun 27, 2022
7248b27
feat!: Initial Commit (#323)
shashi165 Jun 28, 2022
d49f893
Made some changes to redis
Jun 28, 2022
0ad8622
Finalized outbound sequence diagram
Jun 28, 2022
4ef2be1
mbp-633-638 Add interface, types, errors and aggregate
gibaros Jun 29, 2022
d015a36
changed the inbound transfer event names
Jun 30, 2022
99b4959
rename events and topics for outbound
Jun 30, 2022
5c5d7c9
Added inbound redis message format
Jun 30, 2022
818c218
Changed quotes and transfers requests to core connector to sync
Jun 30, 2022
5b95759
Merge pull request #322 from mojaloop/feat/design-bulk-transfers
vijayg10 Jun 30, 2022
782d8e6
feat: update aggregate, irepo, organize types in public, private and …
gibaros Jul 1, 2022
cf97be4
Merge pull request #324 from mojaloop/mbp-633-638-lookup
vijayg10 Jul 1, 2022
e040aaa
fix: fixed the cicd audit check (#326)
shashi165 Jul 1, 2022
f766123
chore: merge master into mvp (#337)
mdebarros Jul 19, 2022
56848fe
feat(mojaloop/2799): implement mvp bulk discovery (#335)
vijayg10 Aug 19, 2022
fd0581b
feat(mojaloop/#2883): add SDKOutboundBulkPartyInfoRequested domain ev…
kleyow Aug 23, 2022
60c2074
feat(mojaloop/#2874): add implement full CI-CD Pipeline to do automat…
mdebarros Aug 24, 2022
5e90a35
chore: added missing release/shapshot npm scripts to modules, and als…
mdebarros Aug 24, 2022
53369b4
chore: updated changelog git url in versionrc file
mdebarros Aug 24, 2022
8d90d34
feat(mojaloop/#2883): add PartyInfoCallbackReceived domain event hand…
kleyow Aug 24, 2022
1806e81
feat!: merge with master, fix 2813 bugs (#357)
kirgene Aug 30, 2022
9bd9bfd
refactor(mojaloop/#2883): move repo code out of command module and in…
kleyow Sep 2, 2022
c4b048f
fix: redis timeout while running integration tests (#361)
kirgene Sep 2, 2022
008b38a
feat(mojaloop/2802): add bulk quotes related functionality (#356)
vijayg10 Sep 6, 2022
e1562e3
fix(mojaloop/#2883): resolve integration tests being broken due to im…
kleyow Sep 6, 2022
5388f42
feat(mojaloop/#2883): add PartyInfoCallbackProcessed domain handler (…
kleyow Sep 7, 2022
1271f57
docs: openapi bulk doc update (#363)
kirgene Sep 8, 2022
be4e5e0
feat!: implement backend and fspiop event services (#365)
kirgene Sep 9, 2022
90188ae
fix: config env vars (#367)
kirgene Sep 9, 2022
b1b57fc
fix: api-svc headers (#368)
kirgene Sep 9, 2022
8bb4272
fix(mojaloop/2886): fix bulk-quotes and bulk-transfers (#344) (#369)
vijayg10 Sep 9, 2022
1e1f9a6
fix(mojaloop/2809): bulk quotes endpoint in inbound api-template file…
vijayg10 Sep 13, 2022
9a6401f
fix(mojaloop/2809): api-svc issues (#372)
vijayg10 Sep 13, 2022
adfabd9
fix(mojaloop/2809): some more issues (#373)
vijayg10 Sep 13, 2022
39dce3a
fix(mojaloop/2809): individual transfer results is empty (#374)
vijayg10 Sep 14, 2022
76171b4
fix: post bulk tx status code (#375)
kirgene Sep 14, 2022
95b8ec5
feat: add test cases for fspiop and backend event servers (#377)
kirgene Sep 16, 2022
f3ef8ed
fix(mojaloop/#2809): fixed outbound party error response format (#381)
vijayg10 Sep 20, 2022
747f0fe
feat: handle more events on backend api (#385)
kirgene Sep 22, 2022
3ee88b1
fix(mojaloop/2941): handled party lookup timeout error (#386)
vijayg10 Sep 22, 2022
73217eb
feat(bulk/#2802): merge integration tests for bulk parties and quotes…
sri-miriyala Sep 22, 2022
fcd84fe
feat(mojaloop/#2803): sdk scheme adapter add bulk transfers calls (St…
mdebarros Sep 28, 2022
f2278fc
fix: package run commands referencing incorrect module names (#395)
mdebarros Oct 5, 2022
de47a79
fix: ci build order (#396)
kleyow Oct 5, 2022
da5c0ad
feat(mojaloop/#2914): import api server with health endpoint (#394)
kleyow Oct 6, 2022
b0b3617
feat(mojaloop/#2809): merge local end to end func tests (#398)
sri-miriyala Oct 10, 2022
efd90d9
chore(mojaloop/#2990): pull in changes from master (#405)
kleyow Oct 20, 2022
99a1fb6
feat(mojaloop#2965): end-end functional tests (#402)
sri-miriyala Oct 21, 2022
161a74f
chore(mojaloop/#2990): pull in changes from master again due to merge…
kleyow Oct 21, 2022
938403b
Merge branch 'master' of github.com:mojaloop/sdk-scheme-adapter into …
kleyow Oct 21, 2022
155d6bd
chore(snapshot): 20.0.0-snapshot.0
kleyow Oct 21, 2022
6221cd6
chore: undo snapshot command
kleyow Oct 21, 2022
792d127
chore(snapshot): 20.0.0-snapshot.0
mdebarros Oct 21, 2022
f74de6a
snapshot adjust
mdebarros Oct 21, 2022
fcf8999
snapshot adjust
mdebarros Oct 21, 2022
8cfc7f6
fix: CI references of package-lock.json changed to package.json
mdebarros Oct 21, 2022
c9fdcb2
fix: ci snapshot/release tags failing
mdebarros Oct 21, 2022
b3c5de8
fix(mojaloop/#2993): change external bulk prepare to internal functio…
kleyow Oct 31, 2022
ae665c1
chore(snapshot): 20.0.0-snapshot.25
kleyow Oct 31, 2022
d2ab71b
chore: dep update
kleyow Oct 31, 2022
3cfe9be
feat: changed dfsp backend and sdk outbound apis to async
Nov 1, 2022
11fbd93
chore: update func ttk version to enable dynamic rules
Nov 1, 2022
9de162a
feat: changed the happy path test case to align with async version of…
Nov 1, 2022
5832f6d
Merge branch master of https://github.com/mojaloop/sdk-scheme-adapter…
Nov 1, 2022
47dff59
chore: updated dependencies
Nov 1, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Changelog: [mojaloop/thirdparty-api-svc](https://github.com/mojaloop/sdk-scheme-adapter)
# Changelog: [mojaloop/sdk-scheme-adapter](https://github.com/mojaloop/sdk-scheme-adapter)
## [20.0.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v19.0.1...v20.0.0) (2022-10-31)


Expand Down Expand Up @@ -71,7 +71,7 @@

### Bug Fixes

* **mojaloop/#2811:** sdk-scheme-adapter sending incorrect transferState on a PUT transfers Callback ([#331](https://github.com/mojaloop/sdk-scheme-adapter/issues/331)) ([f7e450c](https://github.com/mojaloop/sdk-scheme-adapter/commit/f7e450cc2568f70f6c9abbb39d9c2186787c31b7)), closes [mojaloop/#2811](https://github.com/mojaloop/project/issues/2811)
* **mojaloop/#2811:** sdk-scheme-adapter sending incorrect transferState on a PUT transfers Callback ([#331](https://github.com/mojaloop/sdk-scheme-adapter/issues/331)) ([f7e450c](https://github.com/mojaloop/sdk-scheme-adapter/commit/f7e450cc2568f70f6c9abbb39d9c2186787c31b7)), closes [mojaloop/#2811](https://github.com/mojaloop/project/issues/2811) [mojaloop/#2816](https://github.com/mojaloop/sdk-scheme-adapter/issues/2816)
* updated dependencies ([6500476](https://github.com/mojaloop/sdk-scheme-adapter/commit/650047699ce7679d21a08daa1fb3cf2956b0e514))

### [17.0.1](https://github.com/mojaloop/sdk-scheme-adapter/compare/v17.0.0...v17.0.1) (2022-07-04)
Expand Down
2 changes: 1 addition & 1 deletion modules/api-svc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"@babel/core": "^7.19.6",
"@babel/preset-env": "^7.19.4",
"@redocly/openapi-cli": "^1.0.0-beta.94",
"@types/jest": "^29.2.0",
"@types/jest": "^29.2.1",
"babel-jest": "^29.2.2",
"eslint": "^8.26.0",
"eslint-config-airbnb-base": "^15.0.0",
Expand Down
4 changes: 2 additions & 2 deletions modules/outbound-command-event-handler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
"devDependencies": {
"@types/convict": "^6.1.1",
"@types/express": "^4.17.14",
"@types/jest": "^29.2.0",
"@types/node": "^18.11.8",
"@types/jest": "^29.2.1",
"@types/node": "^18.11.9",
"@types/node-cache": "^4.2.5",
"@types/supertest": "^2.0.12",
"@types/swagger-ui-express": "^4.1.3",
Expand Down
4 changes: 2 additions & 2 deletions modules/outbound-domain-event-handler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"devDependencies": {
"@types/convict": "^6.1.1",
"@types/express": "^4.17.14",
"@types/jest": "^29.2.0",
"@types/node": "^18.11.8",
"@types/jest": "^29.2.1",
"@types/node": "^18.11.9",
"@types/node-cache": "^4.2.5",
"@types/supertest": "^2.0.12",
"@types/swagger-ui-express": "^4.1.3",
Expand Down
2 changes: 1 addition & 1 deletion modules/private-shared-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"uuid": "^9.0.0"
},
"devDependencies": {
"@types/node": "^18.11.8",
"@types/node": "^18.11.9",
"eslint": "^8.26.0",
"jest": "^29.2.2",
"npm-check-updates": "^16.3.16",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
"tslib": "^2.4.1"
},
"devDependencies": {
"@types/jest": "^29.2.0",
"@types/node": "^18.11.8",
"@types/jest": "^29.2.1",
"@types/node": "^18.11.9",
"@types/node-cache": "^4.2.5",
"@typescript-eslint/eslint-plugin": "^5.42.0",
"@typescript-eslint/parser": "^5.42.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"/bulkTransactions": {
"post": {
"fspid": "{$request.headers.fspiop-source}",
"successCallback": {
"method": "put",
"path": "/bulkTransactions/{bulkTransactionId}",
"pathPattern": "/bulkTransactions/{$request.body.bulkTransactionId}",
"headerOverride": {
"Date": "{$request.headers.date}"
},
"bodyOverride": {}
},
"errorCallback": {
"method": "put",
"path": "/bulkTransactions/{bulkTransactionId}/error",
"pathPattern": "/bulkTransactions/{$request.body.bulkTransactionId}/error",
"headerOverride": {
"Date": "{$request.headers.date}"
}
}
}
},
"/bulkTransactions/{bulkTransactionId}": {
"put": {
"fspid": "{$request.headers.fspiop-source}",
"successCallback": {
"method": "put",
"path": "/bulkTransactions/{bulkTransactionId}",
"pathPattern": "/bulkTransactions/{$request.params.bulkTransactionId}",
"headerOverride": {
"Date": "{$request.headers.date}"
},
"bodyOverride": {}
},
"errorCallback": {
"method": "put",
"path": "/bulkTransactions/{bulkTransactionId}/error",
"pathPattern": "/bulkTransactions/{$request.params.bulkTransactionId}/error",
"headerOverride": {
"Date": "{$request.headers.date}"
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1398,7 +1398,7 @@
{
"ruleId": 11,
"priority": 11,
"description": "post /bulkQuotes - default path - receiver responds with 2 quote results",
"description": "post /bulkQuotes - default path",
"apiVersion": {
"minorVersion": 4,
"majorVersion": 1,
Expand Down Expand Up @@ -1430,34 +1430,29 @@
"body": {
"bulkQuoteId": "{$request.body.bulkQuoteId}",
"expiration": "2040-01-01T00:00:00.000Z",
"individualQuoteResults": [
{
"quoteId": "{$request.body.individualQuotes[0].quoteId}",
"transferAmount": "{$request.body.individualQuotes[0].amount}",
"transferAmountCurrency": "{$request.body.individualQuotes[0].currency}",
"payeeReceiveAmount": "{$request.body.individualQuotes[0].amount}",
"payeeReceiveAmountCurrency": "{$request.body.individualQuotes[0].currency}",
"payeeFspFeeAmount": "0",
"payeeFspFeeAmountCurrency": "{$request.body.individualQuotes[0].currency}",
"payeeFspCommissionAmount": "0",
"payeeFspCommissionAmountCurrency": "{$request.body.individualQuotes[0].currency}"
},
{
"quoteId": "{$request.body.individualQuotes[1].quoteId}",
"transferAmount": "{$request.body.individualQuotes[1].amount}",
"transferAmountCurrency": "{$request.body.individualQuotes[1].currency}",
"payeeReceiveAmount": "{$request.body.individualQuotes[1].amount}",
"payeeReceiveAmountCurrency": "{$request.body.individualQuotes[1].currency}",
"payeeFspFeeAmount": "0",
"payeeFspFeeAmountCurrency": "{$request.body.individualQuotes[1].currency}",
"payeeFspCommissionAmount": "0",
"payeeFspCommissionAmountCurrency": "{$request.body.individualQuotes[1].currency}"
}
]
"individualQuoteResults": []
},
"statusCode": "200",
"scripts": {
"scriptingEngine": "postman"
"exec": [
"const reqBody = JSON.parse(request.body)",
"const individualQuoteResults = reqBody.individualQuotes.map(quote => ({",
" payeeFspCommissionAmount: \"0\",",
" payeeFspCommissionAmountCurrency: quote.currency,",
" payeeFspFeeAmount: \"0\",",
" payeeFspFeeAmountCurrency: quote.currency,",
" payeeReceiveAmount: quote.amount,",
" payeeReceiveAmountCurrency: quote.currency,",
" quoteId: quote.quoteId,",
" transferAmount: quote.amount,",
" transferAmountCurrency: quote.currency",
"}))",
"",
"custom.appendEventBody({",
" individualQuoteResults",
"})"
],
"scriptingEngine": "javascript"
}
},
"type": "FIXED_RESPONSE"
Expand Down Expand Up @@ -1929,18 +1924,21 @@
"body": {
"bulkTransferId": "{$request.body.bulkTransferId}",
"homeTransactionId": "{$request.body.homeTransactionId}",
"individualTransferResults": [
{
"transferId": "{$request.body.individualTransfers[0].transferId}"
},
{
"transferId": "{$request.body.individualTransfers[1].transferId}"
}
]
"individualTransferResults": []
},
"statusCode": "200",
"scripts": {
"scriptingEngine": "postman"
"exec": [
"const reqBody = JSON.parse(request.body)",
"const individualTransferResults = reqBody.individualTransfers.map(transfer => ({",
" transferId: transfer.transferId",
"}))",
"",
"custom.appendEventBody({",
" individualTransferResults",
"})"
],
"scriptingEngine": "javascript"
}
},
"type": "FIXED_RESPONSE"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,16 @@
{
"type": "mojaloop_simulator_inbound",
"version": "1.4",
"folderPath": "mojaloop_simulator_sim_1.4"
"folderPath": "mojaloop_simulator_sim_1.4",
"asynchronous": true
},
{
"type": "scheme_adapter_outbound",
"version": "1.0",
"folderPath": "mojaloop_sdk_outbound_scheme_adapter_1.0",
"hostnames": [],
"prefix": "/sdk-out"
"prefix": "/sdk-out",
"asynchronous": true
}
]
}
4 changes: 2 additions & 2 deletions test/func/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ services:
ml-testing-toolkit:
networks:
- mojaloop-net
image: mojaloop/ml-testing-toolkit:v15.0.0
image: mojaloop/ml-testing-toolkit:v15.2.0
container_name: ml-testing-toolkit
user: root
volumes:
Expand All @@ -94,7 +94,7 @@ services:
command: npm start

ml-testing-toolkit-ui:
image: mojaloop/ml-testing-toolkit-ui:v15.0.0
image: mojaloop/ml-testing-toolkit-ui:v15.0.1
ports:
- "6060:6060"
networks:
Expand Down
Loading