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

Settlement-v2 merge into master #615

Merged
merged 22 commits into from
Feb 27, 2020
Merged

Settlement-v2 merge into master #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2e21103
feature/1093 Alter DB Schema for Settlements (#501)
ggrg Jan 6, 2020
4e3e01e
Merge branch 'master' of github.com:mojaloop/central-ledger into sett…
ggrg Jan 6, 2020
6de15cf
Merge branch 'master' of github.com:mojaloop/central-ledger into sett…
ggrg Jan 7, 2020
8c4a3e9
Merge branch 'master' of github.com:mojaloop/central-ledger into sett…
ggrg Jan 10, 2020
2fc6e8d
feature/1095 Close Settlement Window Changes (#539)
ggrg Jan 10, 2020
f140f61
feature/1096 Create Settlement Changes #1 (#551)
ggrg Jan 14, 2020
5074b59
Merge branch 'master' of github.com:mojaloop/central-ledger into sett…
ggrg Jan 20, 2020
372db24
feature/1100 Settlement By Currency Wrap Up
ggrg Jan 22, 2020
626c20f
Preparing 8.8.2-snapshot settlement-v2 release
ggrg Jan 23, 2020
94cc321
Merge branch 'master' of github.com:mojaloop/central-ledger into sett…
ggrg Jan 24, 2020
07d9044
Implement createSettlementModel admin API#1179 (#578)
lazolalucas Feb 7, 2020
000d9c1
feature/1211 Settlement v2 Auto Position Reset (#586)
ggrg Feb 11, 2020
eab8e26
Prepared new settlement-v2 snapshot release
ggrg Feb 12, 2020
3de688a
Prepared new settlement-v2 snapshot release
ggrg Feb 12, 2020
83f6e63
Prepare 9.1.1-snapshot settlement-v2 release
ggrg Feb 12, 2020
6324ca6
#1207- Implement settlementModels management - GET and PUT operatio…
lazolalucas Feb 13, 2020
92a4056
feature/1210Validate Settlement Model Definition (#594)
ggrg Feb 14, 2020
1b39d6b
Merge branch 'master' of github.com:mojaloop/central-ledger into sett…
ggrg Feb 19, 2020
df79ec3
feature/1209 Restrict Create Settlement
ggrg Feb 20, 2020
9d1c979
Prepare version for PR against master
ggrg Feb 26, 2020
8b31ecf
Trigger circle CI re-run
ggrg Feb 26, 2020
2e37375
Changes as per PR review
ggrg Feb 27, 2020
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: 1 addition & 3 deletions .ncurc.json
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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