-import * as retry from 'async/retry'
-import * as Bluebird from 'bluebird'
+import retry from 'async/retry'
+import Bluebird from 'bluebird'
import { Transaction } from 'sequelize'
import { Model } from 'sequelize-typescript'
import { sequelizeTypescript } from '@server/initializers/database'
.catch(err => callback(err))
})
.catch(err => {
- logger.error(`Cannot execute ${functionToRetry.name} with many retries.`, { err })
+ logger.warn(`Cannot execute ${functionToRetry.name} with many retries.`, { err })
throw err
})
}
// ---------------------------------------------------------------------------
-function updateInstanceWithAnother <M, T extends U, U extends Model<M>> (instanceToUpdate: T, baseInstance: U) {
- const obj = baseInstance.toJSON()
-
- for (const key of Object.keys(obj)) {
- instanceToUpdate[key] = obj[key]
- }
-}
-
-function resetSequelizeInstance (instance: Model<any>, savedFields: object) {
- Object.keys(savedFields).forEach(key => {
- instance[key] = savedFields[key]
- })
+function resetSequelizeInstance <T> (instance: Model<T>) {
+ return instance.reload()
}
function filterNonExistingModels <T extends { hasSameUniqueKeysThan (other: T): boolean }> (
resetSequelizeInstance,
retryTransactionWrapper,
transactionRetryer,
- updateInstanceWithAnother,
afterCommitIfTransaction,
filterNonExistingModels,
deleteAllModels,