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

fix: bulk quotes callback sending wrong value patterns #230

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 60 additions & 0 deletions spec_files/api_definitions/fspiop_1.0/mockRef.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,65 @@
{
"id": "errorInformation.errorDescription",
"pattern": "This is a mock error description"
},
{
"id": "individualQuoteResults.items.condition",
"pattern": "[A-Fa-f0-9]{64}"
},
{
"id": "individualQuoteResults.items.ilpPacket",
"pattern": "[A-Fa-f0-9]{256}"
},
{
"id": "individualQuoteResults.items.payee.name",
"pattern": "KeepsafeFamilyBank|TreasuryBankFinancial|SilverCoinBanking|RainyDaysBanks|PiggyBankFiduciary|FinancialPartnerBank"
},
{
"id": "individualQuoteResults.items.payee.personalInfo.complexName.firstName",
"pattern": "John|David|Michael|Chris|Mike|Mark|Paul|Daniel|James|Maria"
},
{
"id": "individualQuoteResults.items.payee.personalInfo.complexName.middleName",
"pattern": "G|P|N|S"
},
{
"id": "individualQuoteResults.items.payee.personalInfo.complexName.lastName",
"pattern": "Smith|Jones|Johnson|Lee|Brown|Williams|Rodriguez|Garcia|Gonzalez|Lopez"
},
{
"id": "individualQuoteResults.items.payee.personalInfo.dateOfBirth",
"pattern": "^(19)\\d\\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|2[0-8])$"
},
{
"id": "individualQuoteResults.items.transferAmount.currency",
"pattern": "USD"
},
{
"id": "individualQuoteResults.items.transferAmount.amount",
"pattern": "123"
},
{
"id": "individualQuoteResults.items.payeeFspCommission.currency",
"pattern": "USD"
},
{
"id": "individualQuoteResults.items.payeeFspCommission.amount",
"pattern": "3"
},
{
"id": "individualQuoteResults.items.payeeFspFee.currency",
"pattern": "USD"
},
{
"id": "individualQuoteResults.items.payeeFspFee.amount",
"pattern": "2"
},
{
"id": "individualQuoteResults.items.payeeReceiveAmount.currency",
"pattern": "USD"
},
{
"id": "individualQuoteResults.items.payeeReceiveAmount.amount",
"pattern": "123"
}
]
60 changes: 60 additions & 0 deletions spec_files/api_definitions/fspiop_1.1/mockRef.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,65 @@
{
"id": "errorInformation.errorDescription",
"pattern": "This is a mock error description"
},
{
"id": "individualQuoteResults.items.condition",
"pattern": "[A-Fa-f0-9]{64}"
},
{
"id": "individualQuoteResults.items.ilpPacket",
"pattern": "[A-Fa-f0-9]{256}"
},
{
"id": "individualQuoteResults.items.payee.name",
"pattern": "KeepsafeFamilyBank|TreasuryBankFinancial|SilverCoinBanking|RainyDaysBanks|PiggyBankFiduciary|FinancialPartnerBank"
},
{
"id": "individualQuoteResults.items.payee.personalInfo.complexName.firstName",
"pattern": "John|David|Michael|Chris|Mike|Mark|Paul|Daniel|James|Maria"
},
{
"id": "individualQuoteResults.items.payee.personalInfo.complexName.middleName",
"pattern": "G|P|N|S"
},
{
"id": "individualQuoteResults.items.payee.personalInfo.complexName.lastName",
"pattern": "Smith|Jones|Johnson|Lee|Brown|Williams|Rodriguez|Garcia|Gonzalez|Lopez"
},
{
"id": "individualQuoteResults.items.payee.personalInfo.dateOfBirth",
"pattern": "^(19)\\d\\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|2[0-8])$"
},
{
"id": "individualQuoteResults.items.transferAmount.currency",
"pattern": "USD"
},
{
"id": "individualQuoteResults.items.transferAmount.amount",
"pattern": "123"
},
{
"id": "individualQuoteResults.items.payeeFspCommission.currency",
"pattern": "USD"
},
{
"id": "individualQuoteResults.items.payeeFspCommission.amount",
"pattern": "3"
},
{
"id": "individualQuoteResults.items.payeeFspFee.currency",
"pattern": "USD"
},
{
"id": "individualQuoteResults.items.payeeFspFee.amount",
"pattern": "2"
},
{
"id": "individualQuoteResults.items.payeeReceiveAmount.currency",
"pattern": "USD"
},
{
"id": "individualQuoteResults.items.payeeReceiveAmount.amount",
"pattern": "123"
}
]
37 changes: 36 additions & 1 deletion src/lib/mocking/openApiMockHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,42 @@ const generateAsyncCallback = async (item, context, req) => {
require('./middleware-functions/quotesAssociation').handleQuotes(context, req, fulfilment)
}
// TODO: Handle method and path verifications against the generated ones
CallbackHandler.handleCallback(generatedCallback, context, req)

// Switch to deal with bulkRequest cases (bulkQuotes for now, bulkTransfers next, where we can optimize this)
switch (context.request.path) {
case '/bulkQuotes': {
const individualQuotes = Object.assign(generatedCallback.body.individualQuoteResults)

for (let i = 0; i < individualQuotes.length; i += 1) {
individualQuotes[i].quoteId = context.request.requestBody.individualQuotes[i].quoteId
}

const results = []

const randomlySplitList = (list) => {
if (list.length === 0) {
return
}
const pieceSize = Math.floor(Math.random() * list.length) + 1
const result = list.splice(0, pieceSize)

results.push(result)
randomlySplitList(list)
}

randomlySplitList(individualQuotes)

for (let i = 0; i < results.length; i += 1) {
const bulkQuoteCallback = Object.assign({}, generatedCallback)
bulkQuoteCallback.body.individualQuoteResults = results[i]
await CallbackHandler.handleCallback(bulkQuoteCallback, context, req)
}
break
}
default:
CallbackHandler.handleCallback(generatedCallback, context, req)
}

// Handle triggers for a transaction request
require('./middleware-functions/transactionRequestsService').handleRequest(context, req, generatedCallback, item.triggerTemplatesFolder)
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/mocking/openApiRulesEngine.js
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ const callbackRules = async (context, req) => {
}
generatedCallback.callbackInfo = await replaceVariablesFromRequest(req.customInfo.callbackInfo, context, req)
generatedCallback.method = req.customInfo.callbackInfo.successCallback.method
generatedCallback.body = await callbackGenerator.generateRequestBody(operationCallback, generatedCallback.method, jsfRefs1)
generatedCallback.body = await callbackGenerator.generateRequestBody(operationCallback, generatedCallback.method, jsfRefs1, context.request.body)
generatedCallback.headers = await callbackGenerator.generateRequestHeaders(operationCallback, generatedCallback.method, jsfRefs1)

// Override the values in generated callback with the values from callback map file
Expand Down