-
Notifications
You must be signed in to change notification settings - Fork 0
PM-1213 - handle insufficient funds errors #48
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,17 @@ const client = trolley({ | |
secret: TROLLEY_SECRET_KEY, | ||
}); | ||
|
||
/** | ||
* Determines if the provided validation errors indicate an "insufficient funds" error. | ||
*/ | ||
const isInsufficientFundsError = ({ | ||
validationErrors, | ||
}: { | ||
validationErrors: { code: string }[]; | ||
}) => | ||
validationErrors.length === 1 && | ||
validationErrors[0].code === 'non_sufficient_funds'; | ||
|
||
@Injectable() | ||
export class TrolleyService { | ||
private readonly logger = new Logger(`global/TrolleyService`); | ||
|
@@ -78,24 +89,64 @@ export class TrolleyService { | |
return; | ||
} | ||
|
||
const paymentPayload = { | ||
recipient: { | ||
id: recipientId, | ||
}, | ||
sourceAmount: totalAmount.toString(), | ||
sourceCurrency: 'USD', | ||
memo: 'Topcoder payment', | ||
// TODO: remove `,${Date.now()}` | ||
// if externalId is present, it must be unique | ||
externalId: `${winningsIds.join(',')},${Date.now()}`, | ||
}; | ||
|
||
try { | ||
const payment = await this.client.payment.create(paymentBatch.id, { | ||
recipient: { | ||
id: recipientId, | ||
}, | ||
sourceAmount: totalAmount.toString(), | ||
sourceCurrency: 'USD', | ||
memo: 'Topcoder payment', | ||
// TODO: remove `,${Date.now()}` | ||
// if externalId is present, it must be unique | ||
externalId: `${winningsIds.join(',')},${Date.now()}`, | ||
}); | ||
const payment = await this.client.payment.create( | ||
paymentBatch.id, | ||
paymentPayload, | ||
); | ||
|
||
this.logger.debug(`Created payment with id ${payment.id}`); | ||
|
||
return paymentBatch; | ||
} catch (e) { | ||
this.logger.error(`Failed to create payment, error '${e.message}'!`); | ||
console.log(e); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Using |
||
this.logger.error( | ||
`Failed to create payment, error '${e.message}'!`, | ||
paymentPayload, | ||
e.validationErrors | ||
? { validationErrors: e.validationErrors } | ||
: undefined, | ||
); | ||
} | ||
} | ||
|
||
async startProcessingPayment(paymentBatchId: string) { | ||
try { | ||
// generate quote | ||
await this.client.batch.generateQuote(paymentBatchId); | ||
|
||
// trigger trolley payment (batch) process | ||
await this.client.batch.startProcessing(paymentBatchId); | ||
} catch (error) { | ||
// payments with insufficient funds error are still created in trolley, | ||
// and they are storred as "pending". | ||
// no need to do anything. just log a warning, and move on | ||
if (isInsufficientFundsError(error)) { | ||
this.logger.warn( | ||
`Insufficient funds while processing payment: ${error.validationErrors}`, | ||
vas3a marked this conversation as resolved.
Show resolved
Hide resolved
|
||
); | ||
return; | ||
} | ||
|
||
this.logger.error( | ||
`Failed to process trolley payment batch: ${error.message}`, | ||
error.validationErrors | ||
? { validationErrors: error.validationErrors } | ||
: undefined, | ||
); | ||
throw new Error('Failed to process trolley payment batch!'); | ||
vas3a marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.