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

feature/1211 Auto position reset #240

Merged
merged 4 commits into from
Feb 12, 2020
Merged

feature/1211 Auto position reset #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bbf61c4
Auto position reset functionality
ggrg Feb 11, 2020
233f86c
Merge branch 'settlement-v2' of github.com:mojaloop/central-settlemen…
ggrg Feb 11, 2020
60ecf1c
Re-run integration tests
ggrg Feb 12, 2020
1969f57
Use newest central-ledger snapshot release for integration tests
ggrg Feb 12, 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
266 changes: 133 additions & 133 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "central-settlement",
"description": "Central settlements hosted by a scheme to record and make settlements.",
"version": "8.8.0",
"description": "Central settlements hosted by a scheme to record and make settlements",
"version": "9.1.0-snapshot",
"license": "Apache-2.0",
"private": false,
"author": "ModusBox",
Expand Down
232 changes: 117 additions & 115 deletions src/models/settlement/facade.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,8 @@ const Facade = {
// seq-settlement-6.2.5, step 3
const settlementData = await knex('settlement AS s')
.join('settlementStateChange AS ssc', 'ssc.settlementStateChangeId', 's.currentStateChangeId')
.select('s.settlementId', 'ssc.settlementStateId', 'ssc.reason', 'ssc.createdDate')
.join('settlementModel AS sm', 'sm.settlementModelId', 's.settlementModelId')
.select('s.settlementId', 'ssc.settlementStateId', 'ssc.reason', 'ssc.createdDate', 'sm.autoPositionReset')
.where('s.settlementId', settlementId)
.first()
.transacting(trx)
Expand All @@ -766,6 +767,9 @@ const Facade = {
if (!settlementData) {
throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR, 'Settlement not found')
} else {
const autoPositionReset = settlementData.autoPositionReset
delete settlementData.autoPositionReset

// seq-settlement-6.2.5, step 5
const settlementAccountList = await knex('settlementParticipantCurrency AS spc')
.leftJoin('settlementParticipantCurrencyStateChange AS spcsc', 'spcsc.settlementParticipantCurrencyStateChangeId', 'spc.currentStateChangeId')
Expand Down Expand Up @@ -853,115 +857,111 @@ const Facade = {

// seq-settlement-6.2.5, step 11
for (let participant in payload.participants) {
if (Object.prototype.hasOwnProperty.call(payload.participants, participant)) {
const participantPayload = payload.participants[participant]
participants.push({ id: participantPayload.id, accounts: [] })
const pi = participants.length - 1
participant = participants[pi]
// seq-settlement-6.2.5, step 12
for (const account in participantPayload.accounts) {
if (Object.prototype.hasOwnProperty.call(participantPayload.accounts, account)) {
const accountPayload = participantPayload.accounts[account]
// seq-settlement-6.2.5, step 13
if (allAccounts[accountPayload.id] === undefined) {
participant.accounts.push({
id: accountPayload.id,
errorInformation: ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR, 'Account not found').toApiErrorObject().errorInformation
})
// seq-settlement-6.2.5, step 14
} else if (participantPayload.id !== allAccounts[accountPayload.id].participantId) {
processedAccounts.push(accountPayload.id)
participant.accounts.push({
id: accountPayload.id,
errorInformation: ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR, 'Participant and account mismatch').toApiErrorObject().errorInformation
})
// seq-settlement-6.2.5, step 15
} else if (processedAccounts.indexOf(accountPayload.id) > -1) {
participant.accounts.push({
id: accountPayload.id,
state: allAccounts[accountPayload.id].state,
reason: allAccounts[accountPayload.id].reason,
createdDate: allAccounts[accountPayload.id].createdDate,
netSettlementAmount: allAccounts[accountPayload.id].netSettlementAmount,
errorInformation: ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR, 'Account already processed once').toApiErrorObject().errorInformation
})
// seq-settlement-6.2.5, step 16
} else if (allAccounts[accountPayload.id].state === accountPayload.state) {
processedAccounts.push(accountPayload.id)
participant.accounts.push({
id: accountPayload.id,
state: accountPayload.state,
reason: accountPayload.reason,
externalReference: accountPayload.externalReference,
createdDate: transactionTimestamp,
netSettlementAmount: allAccounts[accountPayload.id].netSettlementAmount
})
settlementParticipantCurrencyStateChange.push({
settlementParticipantCurrencyId: allAccounts[accountPayload.id].key,
settlementStateId: accountPayload.state,
reason: accountPayload.reason,
externalReference: accountPayload.externalReference
})
allAccounts[accountPayload.id].reason = accountPayload.reason
allAccounts[accountPayload.id].createdDate = transactionTimestamp
// seq-settlement-6.2.5, step 17
} else if ((settlementData.settlementStateId === enums.settlementStates.PENDING_SETTLEMENT && accountPayload.state === enums.settlementStates.PS_TRANSFERS_RECORDED) ||
(settlementData.settlementStateId === enums.settlementStates.PS_TRANSFERS_RECORDED && accountPayload.state === enums.settlementStates.PS_TRANSFERS_RESERVED) ||
(settlementData.settlementStateId === enums.settlementStates.PS_TRANSFERS_RESERVED && accountPayload.state === enums.settlementStates.PS_TRANSFERS_COMMITTED) ||
((settlementData.settlementStateId === enums.settlementStates.PS_TRANSFERS_COMMITTED || settlementData.settlementStateId === enums.settlementStates.SETTLING) &&
accountPayload.state === enums.settlementStates.SETTLED)) {
processedAccounts.push(accountPayload.id)
participant.accounts.push({
id: accountPayload.id,
state: accountPayload.state,
reason: accountPayload.reason,
externalReference: accountPayload.externalReference,
createdDate: transactionTimestamp,
netSettlementAmount: allAccounts[accountPayload.id].netSettlementAmount
})
const spcsc = {
settlementParticipantCurrencyId: allAccounts[accountPayload.id].key,
settlementStateId: accountPayload.state,
reason: accountPayload.reason,
externalReference: accountPayload.externalReference,
createdDate: transactionTimestamp
}
if (accountPayload.state === enums.settlementStates.PS_TRANSFERS_RECORDED) {
spcsc.settlementTransferId = Uuid()
}
settlementParticipantCurrencyStateChange.push(spcsc)

if (accountPayload.state === enums.settlementStates.PS_TRANSFERS_RECORDED) {
settlementAccounts.pendingSettlementCount--
settlementAccounts.psTransfersRecordedCount++
} else if (accountPayload.state === enums.settlementStates.PS_TRANSFERS_RESERVED) {
settlementAccounts.psTransfersRecordedCount--
settlementAccounts.psTransfersReservedCount++
} else if (accountPayload.state === enums.settlementStates.PS_TRANSFERS_COMMITTED) {
settlementAccounts.psTransfersReservedCount--
settlementAccounts.psTransfersCommittedCount++
} else /* if (accountPayload.state === enums.settlementStates.SETTLED) */ { // disabled as else path is never taken
settlementAccounts.psTransfersCommittedCount--
settlementAccounts.settledCount++
settlementAccounts.settledIdList.push(accountPayload.id)
}
settlementAccounts.changedIdList.push(accountPayload.id)
allAccounts[accountPayload.id].state = accountPayload.state
allAccounts[accountPayload.id].reason = accountPayload.reason
allAccounts[accountPayload.id].externalReference = accountPayload.externalReference
allAccounts[accountPayload.id].createdDate = transactionTimestamp
// seq-settlement-6.2.5, step 18
} else {
participant.accounts.push({
id: accountPayload.id,
state: allAccounts[accountPayload.id].state,
reason: allAccounts[accountPayload.id].reason,
createdDate: allAccounts[accountPayload.id].createdDate,
netSettlementAmount: allAccounts[accountPayload.id].netSettlementAmount,
errorInformation: ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR, 'State change not allowed').toApiErrorObject().errorInformation
})
}
const participantPayload = payload.participants[participant]
participants.push({ id: participantPayload.id, accounts: [] })
const pi = participants.length - 1
participant = participants[pi]
// seq-settlement-6.2.5, step 12
for (const account in participantPayload.accounts) {
const accountPayload = participantPayload.accounts[account]
// seq-settlement-6.2.5, step 13
if (allAccounts[accountPayload.id] === undefined) {
participant.accounts.push({
id: accountPayload.id,
errorInformation: ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR, 'Account not found').toApiErrorObject().errorInformation
})
// seq-settlement-6.2.5, step 14
} else if (participantPayload.id !== allAccounts[accountPayload.id].participantId) {
processedAccounts.push(accountPayload.id)
participant.accounts.push({
id: accountPayload.id,
errorInformation: ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR, 'Participant and account mismatch').toApiErrorObject().errorInformation
})
// seq-settlement-6.2.5, step 15
} else if (processedAccounts.indexOf(accountPayload.id) > -1) {
participant.accounts.push({
id: accountPayload.id,
state: allAccounts[accountPayload.id].state,
reason: allAccounts[accountPayload.id].reason,
createdDate: allAccounts[accountPayload.id].createdDate,
netSettlementAmount: allAccounts[accountPayload.id].netSettlementAmount,
errorInformation: ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR, 'Account already processed once').toApiErrorObject().errorInformation
})
// seq-settlement-6.2.5, step 16
} else if (allAccounts[accountPayload.id].state === accountPayload.state) {
processedAccounts.push(accountPayload.id)
participant.accounts.push({
id: accountPayload.id,
state: accountPayload.state,
reason: accountPayload.reason,
externalReference: accountPayload.externalReference,
createdDate: transactionTimestamp,
netSettlementAmount: allAccounts[accountPayload.id].netSettlementAmount
})
settlementParticipantCurrencyStateChange.push({
settlementParticipantCurrencyId: allAccounts[accountPayload.id].key,
settlementStateId: accountPayload.state,
reason: accountPayload.reason,
externalReference: accountPayload.externalReference
})
allAccounts[accountPayload.id].reason = accountPayload.reason
allAccounts[accountPayload.id].createdDate = transactionTimestamp
// seq-settlement-6.2.5, step 17
} else if ((settlementData.settlementStateId === enums.settlementStates.PENDING_SETTLEMENT && accountPayload.state === enums.settlementStates.PS_TRANSFERS_RECORDED) ||
(settlementData.settlementStateId === enums.settlementStates.PS_TRANSFERS_RECORDED && accountPayload.state === enums.settlementStates.PS_TRANSFERS_RESERVED) ||
(settlementData.settlementStateId === enums.settlementStates.PS_TRANSFERS_RESERVED && accountPayload.state === enums.settlementStates.PS_TRANSFERS_COMMITTED) ||
((settlementData.settlementStateId === enums.settlementStates.PS_TRANSFERS_COMMITTED || settlementData.settlementStateId === enums.settlementStates.SETTLING) &&
accountPayload.state === enums.settlementStates.SETTLED)) {
processedAccounts.push(accountPayload.id)
participant.accounts.push({
id: accountPayload.id,
state: accountPayload.state,
reason: accountPayload.reason,
externalReference: accountPayload.externalReference,
createdDate: transactionTimestamp,
netSettlementAmount: allAccounts[accountPayload.id].netSettlementAmount
})
const spcsc = {
settlementParticipantCurrencyId: allAccounts[accountPayload.id].key,
settlementStateId: accountPayload.state,
reason: accountPayload.reason,
externalReference: accountPayload.externalReference,
createdDate: transactionTimestamp
}
if (accountPayload.state === enums.settlementStates.PS_TRANSFERS_RECORDED) {
spcsc.settlementTransferId = Uuid()
}
settlementParticipantCurrencyStateChange.push(spcsc)

if (accountPayload.state === enums.settlementStates.PS_TRANSFERS_RECORDED) {
settlementAccounts.pendingSettlementCount--
settlementAccounts.psTransfersRecordedCount++
} else if (accountPayload.state === enums.settlementStates.PS_TRANSFERS_RESERVED) {
settlementAccounts.psTransfersRecordedCount--
settlementAccounts.psTransfersReservedCount++
} else if (accountPayload.state === enums.settlementStates.PS_TRANSFERS_COMMITTED) {
settlementAccounts.psTransfersReservedCount--
settlementAccounts.psTransfersCommittedCount++
} else /* if (accountPayload.state === enums.settlementStates.SETTLED) */ { // disabled as else path is never taken
settlementAccounts.psTransfersCommittedCount--
settlementAccounts.settledCount++
settlementAccounts.settledIdList.push(accountPayload.id)
}
settlementAccounts.changedIdList.push(accountPayload.id)
allAccounts[accountPayload.id].state = accountPayload.state
allAccounts[accountPayload.id].reason = accountPayload.reason
allAccounts[accountPayload.id].externalReference = accountPayload.externalReference
allAccounts[accountPayload.id].createdDate = transactionTimestamp
// seq-settlement-6.2.5, step 18
} else {
participant.accounts.push({
id: accountPayload.id,
state: allAccounts[accountPayload.id].state,
reason: allAccounts[accountPayload.id].reason,
createdDate: allAccounts[accountPayload.id].createdDate,
netSettlementAmount: allAccounts[accountPayload.id].netSettlementAmount,
errorInformation: ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR, 'State change not allowed').toApiErrorObject().errorInformation
})
}
}
}
Expand Down Expand Up @@ -995,12 +995,14 @@ const Facade = {
}
await Promise.all(updatePromises)

if (settlementData.settlementStateId === enums.settlementStates.PENDING_SETTLEMENT) {
await Facade.settlementTransfersPrepare(settlementId, transactionTimestamp, enums, trx)
} else if (settlementData.settlementStateId === enums.settlementStates.PS_TRANSFERS_RECORDED) {
await Facade.settlementTransfersReserve(settlementId, transactionTimestamp, enums, trx)
} else if (settlementData.settlementStateId === enums.settlementStates.PS_TRANSFERS_RESERVED) {
await Facade.settlementTransfersCommit(settlementId, transactionTimestamp, enums, trx)
if (autoPositionReset) {
if (settlementData.settlementStateId === enums.settlementStates.PENDING_SETTLEMENT) {
await Facade.settlementTransfersPrepare(settlementId, transactionTimestamp, enums, trx)
} else if (settlementData.settlementStateId === enums.settlementStates.PS_TRANSFERS_RECORDED) {
await Facade.settlementTransfersReserve(settlementId, transactionTimestamp, enums, trx)
} else if (settlementData.settlementStateId === enums.settlementStates.PS_TRANSFERS_RESERVED) {
await Facade.settlementTransfersCommit(settlementId, transactionTimestamp, enums, trx)
}
}

// seq-settlement-6.2.5, step 23
Expand Down
2 changes: 1 addition & 1 deletion test/integration-runner.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ SIMULATOR_REMOTE_PORT=${SIMULATOR_REMOTE_PORT:-"8444"}
CENTRAL_LEDGER_HOST=${CENTRAL_LEDGER_HOST:-"central-ledger-int"}
CENTRAL_LEDGER_PORT=${CENTRAL_LEDGER_PORT:-"3001"}
CENTRAL_LEDGER_IMAGE=${CENTRAL_LEDGER_IMAGE:-'mojaloop/central-ledger'}
CENTRAL_LEDGER_TAG=${CENTRAL_LEDGER_TAG:-'v8.8.2-snapshot'}
CENTRAL_LEDGER_TAG=${CENTRAL_LEDGER_TAG:-'v9.1.1-snapshot'}
ML_API_ADAPTER_HOST=${ML_API_ADAPTER_HOST:-"ml-api-adapter-int"}
ML_API_ADAPTER_PORT=${ML_API_ADAPTER_PORT:-"3000"}
ML_API_ADAPTER_IMAGE=${ML_API_ADAPTER_IMAGE:-'mojaloop/ml-api-adapter'}
Expand Down
2 changes: 2 additions & 0 deletions test/integration/settlementTransfer.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ const settlementModels = [
settlementInterchangeId: 2, // MULTILATERAL
settlementDelayId: 2, // DEFERRED
ledgerAccountTypeId: 1, // POSITION
autoPositionReset: true,
currencyId: null
},
{
Expand All @@ -71,6 +72,7 @@ const settlementModels = [
settlementInterchangeId: 2, // MULTILATERAL
settlementDelayId: 2, // DEFERRED
ledgerAccountTypeId: 1, // POSITION
autoPositionReset: true,
currencyId: 'USD'
}
]
Expand Down
Loading