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/project#2553): send extra notification back to payee when a transfer is aborted #872

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
1e75b98
refactor: make actionLetter and functionality more readable
lewisdaly Nov 10, 2021
3476ae0
refactor: make fulfil more readable, remove redundant else blocks
lewisdaly Nov 10, 2021
d8b35ed
refactor: make fulfil more readable, remove redundant else blocks
lewisdaly Nov 10, 2021
81d27f7
refactor: make fulfil more readable, remove redundant else blocks
lewisdaly Nov 10, 2021
2ea02a7
feat: add placeholder FINAL_STATUS_FAILED event entrypoints
lewisdaly Nov 10, 2021
0451998
Merge branch 'master' of github.com:mojaloop/central-ledger into feat…
lewisdaly Nov 16, 2021
045341f
chore(todos): add ticket numbers to todo statements
lewisdaly Nov 16, 2021
69df0c0
chore(deps): rename central-object-store to object-store-lib
lewisdaly Nov 16, 2021
b6372b8
chore(deps): update object-store-lib to `11.1.1`
lewisdaly Nov 17, 2021
c382a20
feat: add extra notification when the RESERVED action fals on the ful…
lewisdaly Nov 17, 2021
85d6b35
feat: adding unit tests for RESERVED_ABORTED notification
lewisdaly Nov 17, 2021
1ad585f
feat: adding unit tests for RESERVED_ABORTED notification
lewisdaly Nov 17, 2021
639396e
feat: clean up extra tests
lewisdaly Nov 17, 2021
6aa55a2
chore(refactor): remove commented test code
lewisdaly Nov 17, 2021
f307030
chore(refactor): remove commented test code
lewisdaly Nov 17, 2021
0467fa9
feat(int): working on handlers integration tests
lewisdaly Nov 18, 2021
a8fb745
feat(int): working on testConsumer to monitor kafka events
lewisdaly Nov 18, 2021
b6a0010
feat(int): working on testConsumer to monitor kafka events
lewisdaly Nov 18, 2021
a9fdbac
feat(int): working on testConsumer to monitor kafka events
lewisdaly Nov 18, 2021
c0b32dd
feat(int): working on testConsumer to monitor kafka events
lewisdaly Nov 18, 2021
7be5fb4
feat(int): working on testConsumer to monitor kafka events
lewisdaly Nov 18, 2021
03d55dd
feat(int): working on testConsumer to monitor kafka events
lewisdaly Nov 22, 2021
4a0b520
feat(int): debugging open handles issue
lewisdaly Nov 22, 2021
a2d738e
feat(int): reenable disabled tests
lewisdaly Nov 23, 2021
828125b
feat(int): fix flaky test
lewisdaly Nov 23, 2021
271f0c0
feat(int): fix flaky test
lewisdaly Nov 23, 2021
872252f
fix(unit): fix basic unit test
lewisdaly Nov 23, 2021
9ec7e29
Merge branch 'master' of github.com:mojaloop/central-ledger into feat…
lewisdaly Nov 23, 2021
0d9fa92
feat(handlers): fixing up completedTimestamp in notification
lewisdaly Nov 23, 2021
23aaad7
feat(handlers): fixing up completedTimestamp in notification
lewisdaly Nov 23, 2021
06b3aca
fix(vulns): run npm audit, ignore unfixable medium vulns for 1 month
lewisdaly Nov 23, 2021
1216307
fix(vulns): run npm audit, ignore unfixable medium vulns for 1 month
lewisdaly Nov 23, 2021
ece14fd
feat(unit): implement tests for other notifications
lewisdaly Nov 23, 2021
8a6a4a1
feat(unit): implement tests for other notifications
lewisdaly Nov 23, 2021
2651e4e
feat(unit): implement tests for other notifications
lewisdaly Nov 23, 2021
61f912a
chore: appease linting gods
lewisdaly Nov 23, 2021
17aeec0
chore: remove unused code, unused devDependency
lewisdaly Nov 23, 2021
157d4ee
feat(int): add event notification consumer config to integration test…
lewisdaly Nov 23, 2021
aa99f2d
fix(int): integration test runner on ci
lewisdaly Nov 24, 2021
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Tests include code coverage via istanbul. See the test/ folder for testing scrip
If you want to run integration tests in a repetitive manner, you can startup the test containers using `docker-compose`, login to running `central-ledger` container like so:

```bash
docker-compose -f docker-compose.yml -f docker-compose.integration.yml up kafka mysql central-ledger
docker-compose -f docker-compose.yml -f docker-compose.integration.yml up -d kafka mysql central-ledger

#in a new shell
docker exec -it cl_central-ledger sh
Expand Down
64 changes: 64 additions & 0 deletions audit-resolve.json
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,70 @@
"decision": "ignore",
"madeAt": 1636447961306,
"expiresAt": 1639039953006
},
"1004946|@mojaloop/event-sdk>@grpc/proto-loader>yargs>string-width>strip-ansi>ansi-regex": {
"decision": "ignore",
"madeAt": 1637632202484,
"expiresAt": 1640224196369
},
"1004946|@mojaloop/event-sdk>@grpc/proto-loader>yargs>cliui>string-width>strip-ansi>ansi-regex": {
"decision": "ignore",
"madeAt": 1637632202484,
"expiresAt": 1640224196369
},
"1004946|@mojaloop/event-sdk>@grpc/proto-loader>yargs>cliui>wrap-ansi>string-width>strip-ansi>ansi-regex": {
"decision": "ignore",
"madeAt": 1637632202484,
"expiresAt": 1640224196369
},
"1004946|blipp>easy-table>ansi-regex": {
"decision": "fix",
"madeAt": 1637631903782
},
"1004854|00unidentified>widdershins>openapi-sampler>json-pointer": {
"decision": "ignore",
"madeAt": 1637631916550,
"expiresAt": 1640223810787
},
"1004869|00unidentified>widdershins>swagger2openapi>better-ajv-errors>jsonpointer": {
"decision": "ignore",
"madeAt": 1637631920791,
"expiresAt": 1640223810787
},
"1004869|00unidentified>widdershins>swagger2openapi>oas-validator>better-ajv-errors>jsonpointer": {
"decision": "ignore",
"madeAt": 1637631920791,
"expiresAt": 1640223810787
},
"1004876|hapi-swagger>swagger-parser>z-schema>validator": {
"decision": "ignore",
"madeAt": 1637631925279,
"expiresAt": 1640223810787
},
"1004946|00unidentified>widdershins>yargs>string-width>strip-ansi>ansi-regex": {
"decision": "ignore",
"madeAt": 1637631928013,
"expiresAt": 1640223810787
},
"1004946|00unidentified>widdershins>yargs>cliui>string-width>strip-ansi>ansi-regex": {
"decision": "ignore",
"madeAt": 1637631928013,
"expiresAt": 1640223810787
},
"1005383|00unidentified>shins>sanitize-html": {
"decision": "ignore",
"madeAt": 1637631931208,
"expiresAt": 1640223810787
},
"1005384|00unidentified>shins>sanitize-html": {
"decision": "ignore",
"madeAt": 1637631931208,
"expiresAt": 1640223810787
},
"1005534|00unidentified>widdershins>yargs>yargs-parser": {
"decision": "ignore",
"madeAt": 1637631933199,
"expiresAt": 1640223810787
}
},
"rules": {},
Expand Down
4 changes: 4 additions & 0 deletions docker-compose.integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ services:
# - ./node_modules:/opt/central-ledger/node_modules
environment:
- CLEDG_MONGODB__DISABLED=true
# Disable audit logs - makes it too verbose
- EVENT_SDK_LOG_FILTER="log:info, log:warning, log:error"
- CSL_LOG_TRANSPORT=console
- LOG_LEVEL=warn
command:
- tail
- -f
Expand Down
28 changes: 27 additions & 1 deletion docker/central-ledger/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
"rdkafkaConf": {
"client.id": "cl-con-bulk-get",
"group.id": "cl-group-bulk-get",
"metadata.broker.list": "localhost:29092",
"metadata.broker.list": "kafka:29092",
"socket.keepalive.enable": true,
"allow.auto.create.topics": true
},
Expand Down Expand Up @@ -310,6 +310,32 @@
}
}
}
},
"NOTIFICATION": {
"EVENT": {
"config": {
"options": {
"mode": 2,
"batchSize": 1,
"pollFrequency": 10,
"recursiveTimeout": 100,
"messageCharset": "utf8",
"messageAsJSON": true,
"sync": true,
"consumeTimeout": 1000
},
"rdkafkaConf": {
"client.id": "TESTONLY",
"group.id": "TESTONLY",
"metadata.broker.list": "kafka:29092",
"socket.keepalive.enable": true,
"allow.auto.create.topics": true
},
"topicConf": {
"auto.offset.reset": "earliest"
}
}
}
}
},
"PRODUCER": {
Expand Down
20 changes: 10 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"@mojaloop/central-services-health": "13.0.0",
"@mojaloop/central-services-logger": "10.6.2",
"@mojaloop/central-services-metrics": "11.0.0",
"@mojaloop/central-services-shared": "15.0.1",
"@mojaloop/central-services-shared": "git+https://github.com/vessels-tech/central-services-shared.git#feat/2553-patch-notification-3",
"@mojaloop/central-services-stream": "10.7.0",
"@mojaloop/event-sdk": "10.7.1",
"@mojaloop/ml-number": "11.2.1",
Expand Down
Loading