From eb08047657e739bcd9e592d76307befa3998482b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 25 Oct 2017 11:55:06 +0200 Subject: Use async/await in controllers --- server/helpers/database-utils.ts | 1 - server/helpers/utils.ts | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'server/helpers') diff --git a/server/helpers/database-utils.ts b/server/helpers/database-utils.ts index 987e42eb0..dcc9e2577 100644 --- a/server/helpers/database-utils.ts +++ b/server/helpers/database-utils.ts @@ -1,6 +1,5 @@ // TODO: import from ES6 when retry typing file will include errorFilter function import * as retry from 'async/retry' -import * as Promise from 'bluebird' import { logger } from './logger' diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts index 3317dddc3..6cabe117c 100644 --- a/server/helpers/utils.ts +++ b/server/helpers/utils.ts @@ -1,4 +1,5 @@ import * as express from 'express' +import * as Sequelize from 'sequelize' import * as Promise from 'bluebird' import { pseudoRandomBytesPromise } from './core-utils' @@ -69,6 +70,13 @@ function computeResolutionsToTranscode (videoFileHeight: number) { return resolutionsEnabled } +function resetSequelizeInstance (instance: Sequelize.Instance, savedFields: object) { + Object.keys(savedFields).forEach(key => { + const value = savedFields[key] + instance.set(key, value) + }) +} + type SortType = { sortModel: any, sortValue: string } // --------------------------------------------------------------------------- @@ -79,5 +87,6 @@ export { getFormattedObjects, isSignupAllowed, computeResolutionsToTranscode, + resetSequelizeInstance, SortType } -- cgit v1.2.3