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.

Sign up for GitHub

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

fix(mojaloop/2886): fix bulk-quotes and bulk-transfers functionality #344

Merged
merged 33 commits into from
Aug 24, 2022
Merged

fix(mojaloop/2886): fix bulk-quotes and bulk-transfers functionality #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7eeca03
fix: added bulkquotes endpoint to inbound api server definition
Aug 11, 2022
9cfd9f6
'chore(snapshot):
Aug 11, 2022
b672c2d
fix: added bulk-quotes to inbound api definition
Aug 12, 2022
4e79d32
chore(snapshot): 19.0.1-snapshot.0
Aug 12, 2022
f0422e2
chore: update dependencies
Aug 12, 2022
ee3ab99
chore(snapshot): 19.0.1-snapshot.1
Aug 12, 2022
3232b74
Merge branch fix/bulk-quotes of https://github.com/vijayg10/sdk-schem…
Aug 15, 2022
05f8075
chore(snapshot): 20.0.0-snapshot.1
Aug 15, 2022
523744e
chore: updated dependencies
Aug 15, 2022
22ba830
chore(snapshot): 20.0.0-snapshot.2
Aug 15, 2022
807938e
chore(snapshot): 20.0.0-snapshot.3
Aug 15, 2022
dadab42
changed ttk port
Aug 15, 2022
051d442
chore(snapshot): 20.0.0-snapshot.4
Aug 15, 2022
e5b033e
fix: updated ttk config files and fixed integration tests
Aug 15, 2022
b2ec8d9
chore(snapshot): 20.0.0-snapshot.5
Aug 15, 2022
8baf84f
fix: bulk quotes callback redis publish channel
Aug 22, 2022
5c0590b
chore: dep updates
Aug 22, 2022
4f73456
chore(snapshot): 20.0.0-snapshot.6
Aug 22, 2022
637defc
chore: added exception for audit check
Aug 22, 2022
222ba1a
chore(snapshot): 20.0.0-snapshot.7
Aug 22, 2022
b0eb24d
fix: fixed bulk quotes and bulk transfers response in outbound api
Aug 23, 2022
dfc9914
chore(snapshot): 20.0.0-snapshot.8
Aug 23, 2022
e3d19b5
fix: lint issues
Aug 23, 2022
2946229
chore(snapshot): 20.0.0-snapshot.9
Aug 23, 2022
1522044
fix: unit tests
Aug 23, 2022
f33819e
chore(snapshot): 20.0.0-snapshot.10
Aug 23, 2022
fbc9767
fix: updated mojaloop sim api in ttk
Aug 24, 2022
180cbe2
fix: revert the version
Aug 24, 2022
0b137e1
chore(snapshot): 19.0.1-snapshot.0
Aug 24, 2022
4cf8581
chore(snapshot): 19.0.1-snapshot.1
Aug 24, 2022
1164644
chore(snapshot): 19.0.1-snapshot.2
Aug 24, 2022
37b1b38
chore: renamed file
Aug 24, 2022
fe645d4
fix: updated the dependencies
Aug 24, 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
3 changes: 2 additions & 1 deletion audit-ci.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"GHSA-mjxr-4v3x-q3m4",
"GHSA-rjqq-98f6-6j3r",
"GHSA-3cvr-822r-rqcc",
"GHSA-p9pc-299p-vxgp"
"GHSA-p9pc-299p-vxgp",
"GHSA-8qr4-xgw6-wmr3"
]
}
32 changes: 16 additions & 16 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ services:
ml-testing-toolkit:
networks:
- mojaloop-net
image: mojaloop/ml-testing-toolkit:v11.7.11
image: mojaloop/ml-testing-toolkit:v15.0.0
container_name: ml-testing-toolkit
volumes:
- "./docker/ml-testing-toolkit/spec_files:/opt/mojaloop-testing-toolkit/spec_files"
- "./docker/ml-testing-toolkit/secrets:/opt/mojaloop-testing-toolkit/secrets"
- "./docker/ml-testing-toolkit/spec_files:/opt/app/spec_files"
- "./docker/ml-testing-toolkit/secrets:/opt/app/secrets"

ports:
- "5000:5000"
- "4040:4040"
- "5050:5050"
environment:
- AUTH_ENABLED=FALSE
Expand All @@ -54,15 +54,15 @@ services:
#
# for local development we want to have ttk-ui
#
# mojaloop-testing-toolkit-ui:
# image: mojaloop/ml-testing-toolkit-ui:v11.8.4
# ports:
# - "6060:6060"
# networks:
# - mojaloop-net
# environment:
# - API_BASE_URL=http://localhost:5050
# - AUTH_ENABLED=FALSE
# command:
# - sh
# - /usr/share/nginx/start.sh
mojaloop-testing-toolkit-ui:
image: mojaloop/ml-testing-toolkit-ui:v15.0.0
ports:
- "6060:6060"
networks:
- mojaloop-net
environment:
- API_BASE_URL=http://localhost:5050
- AUTH_ENABLED=FALSE
command:
- sh
- /usr/share/nginx/start.sh
125 changes: 125 additions & 0 deletions docker/ml-testing-toolkit/sample-tests/test_outbound_p2p_and_bulk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
{
"name": "multi",
"test_cases": [
{
"id": 3,
"name": "outbound-post-bulk-quotes",
"requests": [
{
"id": 1,
"description": "Post BulkQuotes",
"apiVersion": {
"minorVersion": 0,
"majorVersion": 1,
"type": "scheme_adapter_outbound",
"prefix": "/sdk-out",
"hostnames": [],
"specFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml",
"callbackMapFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json",
"responseMapFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/response_map.json",
"jsfRefFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/mockRef.json",
"triggerTemplatesFolder": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/trigger_templates"
},
"operationPath": "/bulkQuotes",
"path": "/bulkQuotes",
"method": "post",
"url": "http://172.17.0.1:4001",
"body": {
"homeTransactionId": "7c5eaec1-5db2-4aca-92dd-0b68071becaa",
"bulkQuoteId": "7106d650-fb27-4a2a-9b70-c9731fc058aa",
"from": {
"idType": "MSISDN",
"idValue": "123456789",
"type": "CONSUMER",
"displayName": "PayerFirst PayerLast",
"firstName": "PayerFirst",
"middleName": "Something",
"lastName": "PayerLast",
"fspId": "ttkpm4mlreceiver"
},
"individualQuotes": [
{
"quoteId": "5fdba48f-0388-4a56-94e9-57f1bc4d78fc",
"to": {
"type": "CONSUMER",
"idType": "MSISDN",
"idValue": "48500002222",
"fspId": "ttkpm4mlreceiver"
},
"amountType": "SEND",
"currency": "USD",
"amount": "10",
"transactionType": "TRANSFER",
"note": "test"
}
]
}
},
{
"id": 2,
"description": "bulkTransfers",
"apiVersion": {
"minorVersion": 0,
"majorVersion": 1,
"type": "scheme_adapter_outbound",
"prefix": "/sdk-out",
"hostnames": [],
"specFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml",
"callbackMapFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json",
"responseMapFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/response_map.json",
"jsfRefFile": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/mockRef.json",
"triggerTemplatesFolder": "spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/trigger_templates"
},
"operationPath": "/bulkTransfers",
"path": "/bulkTransfers",
"method": "post",
"url": "http://172.17.0.1:4001",
"body": {
"homeTransactionId": "{$prev.1.request.body.homeTransactionId}",
"bulkTransferId": "{$function.generic.generateUUID}",
"bulkQuoteId": "7106d650-fb27-4a2a-9b70-c9731fc058aa",
"from": {
"idType": "MSISDN",
"idValue": "123456789",
"type": "CONSUMER",
"displayName": "PayerFirst PayerLast",
"firstName": "PayerFirst",
"middleName": "Something",
"lastName": "PayerLast",
"fspId": "ttkpm4mlreceiver"
},
"individualTransfers": [
{
"transferId": "{$function.generic.generateUUID}",
"to": {
"type": "CONSUMER",
"idType": "MSISDN",
"idValue": "48500002222",
"fspId": "ttkpm4mlreceiver"
},
"amountType": "SEND",
"currency": "USD",
"amount": "10",
"transactionType": "TRANSFER",
"note": "string",
"ilpPacket": "{$prev.1.response.body.individualQuoteResults[0].ilpPacket}",
"condition": "{$prev.1.response.body.individualQuoteResults[0].condition}"
}
],
"extensions": {
"extension": [
{
"key": "string",
"value": "string"
}
]
}
}
}
],
"fileInfo": {
"path": "test_sdk1.json"
}
}
]
}
Loading