Skip to content

Commit

Permalink
Settlement-v2 merge into master (#615)
Browse files Browse the repository at this point in the history
* feature/1093 Alter DB Schema for Settlements (#501)

* Added migrations and seeds

* WIP

* Remove unused code (#504)

* Remove unused code

* Update dependencies

* Maintenance update (#505)

- Upgraded Event-SDK
- Version bump

* Upgraded central-services-stream for #1114KafkaErrorLocalQueuefull fix (#511)

* package.json and package-lock

* Changes following peer review

* Added settlementWindowContent.settlementId

Co-authored-by: Steven Oderayi <oderayi@gmail.com>
Co-authored-by: Miguel de Barros <miguel@debarros.me>

* feature/1095 Close Settlement Window Changes (#539)

* Added additional window states

* Change to currentStateId. Dependencies update

* feature/1096 Create Settlement Changes #1 (#551)

* Seed settlementModel samples. Deps

* settlementModel.name unique index

* Re-run failed integration tests. Added hapi-swagger to ncu ignore list

* feature/1100 Settlement By Currency Wrap Up

Disabled settlementModel seeds (#564)

* Preparing 8.8.2-snapshot settlement-v2 release

* Implement createSettlementModel admin API#1179 (#578)

* Changes:

* 1179-Create SettlementModel API new code

* Address PR comments:
- Used central-services-shared for the enums
- handled duplicate insert to not return internal server error and sql statement
- Fixed validations on the routes.js
- Changed settlementCurrency to currency on the request
- Changed type to ledgerAccountType on the request

* 1179-Create SettlementModel API

Cleaned up the code

* Triggering build

* Applied standard.JS

* feature/1211 Settlement v2 Auto Position Reset  (#586)

* Added settlementModel.autoPositionReset. Dependencies update

* Fix /settlementModel to plural /settlementModels

* Fix npm vulnerabilities

* Prepared new settlement-v2 snapshot release

* Prepared new settlement-v2 snapshot release

* Prepare 9.1.1-snapshot settlement-v2 release

*   #1207- Implement settlementModels management - GET and PUT operations  (#588)

*    Changes for story #1207:

			- Added PUT/GET routes with Joi validations
			- Included #1211 autoPositionReset property to GET requests
			- Created handler scripts
			- Implemented DAO scripts
			- Updated Unit tests

* Fixed npm audit errors

* 1207- Implement settlementModels management - GET and PUT operations

 * Moved enums to central-services-shared
 * Updated central-services-shared version

* feature/1210Validate Settlement Model Definition (#594)

* Implemented settlement model definition validation. Node upgrade

* 9.1.2-snapshot

* Fix coverage

* Change as per PR request

* feature/1209 Restrict Create Settlement

settlement model unique constraint (#606)

* Trigger circle CI re-run

* Changes as per PR review

Co-authored-by: Steven Oderayi <oderayi@gmail.com>
Co-authored-by: Miguel de Barros <miguel@debarros.me>
Co-authored-by: lazolalucas <lazolalucas@users.noreply.github.com>
  • Loading branch information
4 people authored Feb 27, 2020
1 parent 2cff500 commit 267bab7
Show file tree
Hide file tree
Showing 171 changed files with 2,825 additions and 502 deletions.
4 changes: 1 addition & 3 deletions .ncurc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{
"reject": [

]
"reject": []
}
49 changes: 1 addition & 48 deletions audit-resolve.json
Original file line number Diff line number Diff line change
@@ -1,48 +1 @@
{
"decisions": {
"1164|hapi-swagger>handlebars": {
"decision": "fix",
"madeAt": 1569472078085
},
"1164|nyc>istanbul-reports>handlebars": {
"decision": "fix",
"madeAt": 1569472078086
},
"1184|npm-check-updates>pacote>make-fetch-happen>https-proxy-agent": {
"decision": "ignore",
"madeAt": 1571649787349,
"expiresAt": 1574241710583
},
"1184|npm-check-updates>pacote>npm-registry-fetch>make-fetch-happen>https-proxy-agent": {
"decision": "ignore",
"madeAt": 1571649787349,
"expiresAt": 1574241710583
},
"1316|hapi-swagger>handlebars": {
"decision": "fix",
"madeAt": 1574855424585
},
"1316|nyc>istanbul-reports>handlebars": {
"decision": "fix",
"madeAt": 1574855424585
},
"1324|hapi-swagger>handlebars": {
"decision": "fix",
"madeAt": 1574855424585
},
"1324|nyc>istanbul-reports>handlebars": {
"decision": "fix",
"madeAt": 1574855424585
},
"1325|hapi-swagger>handlebars": {
"decision": "fix",
"madeAt": 1574855424585
},
"1325|nyc>istanbul-reports>handlebars": {
"decision": "fix",
"madeAt": 1574855424585
}
},
"rules": {},
"version": 1
}

3 changes: 2 additions & 1 deletion migrations/100100_event.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110100_contactType.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110101_contactType-indexes.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110200_currency.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110201_currency-scale.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110300_endpointType.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110301_endpointType-indexes.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110400_ledgerEntryType.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110401_ledgerEntryType-indexes.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110450_ledgerAccountType.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110451_ledgerAccountType-indexes.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110500_participantLimitType.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110501_participantLimitType-indexes.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110600_transferParticipantRoleType.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110601_transferParticipantRoleType-indexes.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110700_transferState.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110800_settlementWindowState.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/110900_settlementState.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/111000_amountType.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Contributors
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/111001_amountType-indexes.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Contributors
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/111100_balanceOfPayments.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Contributors
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/111101_balanceOfPayments-indexes.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Contributors
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/111200_partyIdentifierType.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Contributors
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/111201_partyIdentifierType-indexes.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Contributors
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/111300_partyType.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Contributors
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/111301_partyType-indexes.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Contributors
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/111400_quoteDuplicateCheck.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Contributors
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/111500_transactionInitiator.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Contributors
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/111501_transactionInitiator-indexes.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Contributors
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/111600_transactionInitiatorType.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Contributors
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
3 changes: 2 additions & 1 deletion migrations/111601_transactionInitiatorType-indexes.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Contributors
* Gates Foundation
- Name Surname <name.surname@gatesfoundation.com>
* Georgi Georgiev <georgi.georgiev@modusbox.com>
* ModusBox
- Georgi Georgiev <georgi.georgiev@modusbox.com>
--------------
******/

Expand Down
Loading

0 comments on commit 267bab7

Please sign in to comment.