-// TODO: import from ES6 when retry typing file will include errorFilter function
import * as retry from 'async/retry'
-
+import * as Bluebird from 'bluebird'
+import { Model } from 'sequelize-typescript'
import { logger } from './logger'
type RetryTransactionWrapperOptions = { errorMessage: string, arguments?: any[] }
-function retryTransactionWrapper (functionToRetry: (...args) => Promise<any>, options: RetryTransactionWrapperOptions) {
+function retryTransactionWrapper <T> (
+ functionToRetry: (...args) => Promise<T> | Bluebird<T>,
+ options: RetryTransactionWrapperOptions
+): Promise<T> {
const args = options.arguments ? options.arguments : []
- return transactionRetryer(callback => {
+ return transactionRetryer<T>(callback => {
functionToRetry.apply(this, args)
- .then(result => callback(null, result))
+ .then((result: T) => callback(null, result))
.catch(err => callback(err))
})
.catch(err => {
- // Do not throw the error, continue the process
- logger.error(options.errorMessage, err)
+ logger.error(options.errorMessage, { err })
+ throw err
})
}
-function transactionRetryer (func: Function) {
- return new Promise((res, rej) => {
+function transactionRetryer <T> (func: (err: any, data: T) => any) {
+ return new Promise<T>((res, rej) => {
retry({
times: 5,
errorFilter: err => {
const willRetry = (err.name === 'SequelizeDatabaseError')
- logger.debug('Maybe retrying the transaction function.', { willRetry })
+ logger.debug('Maybe retrying the transaction function.', { willRetry, err })
return willRetry
}
- }, func, err => err ? rej(err) : res())
+ }, func, (err, data) => err ? rej(err) : res(data))
})
}
+function updateInstanceWithAnother <T extends Model<T>> (instanceToUpdate: Model<T>, baseInstance: Model<T>) {
+ const obj = baseInstance.toJSON()
+
+ for (const key of Object.keys(obj)) {
+ instanceToUpdate.set(key, obj[key])
+ }
+}
+
// ---------------------------------------------------------------------------
export {
retryTransactionWrapper,
- transactionRetryer
+ transactionRetryer,
+ updateInstanceWithAnother
}