From 69818c9394366b954b6ba3bd697bd9d2b09f2a16 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sat, 10 Jun 2017 22:15:25 +0200 Subject: Type functions --- server/lib/request/request-video-qadu-scheduler.ts | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'server/lib/request/request-video-qadu-scheduler.ts') diff --git a/server/lib/request/request-video-qadu-scheduler.ts b/server/lib/request/request-video-qadu-scheduler.ts index dab526088..436fd8e50 100644 --- a/server/lib/request/request-video-qadu-scheduler.ts +++ b/server/lib/request/request-video-qadu-scheduler.ts @@ -1,3 +1,5 @@ +import * as Sequelize from 'sequelize' + import { database as db } from '../../initializers/database' import { BaseRequestScheduler } from './base-request-scheduler' import { logger } from '../../helpers' @@ -8,6 +10,12 @@ import { REQUEST_VIDEO_QADU_TYPES } from '../../initializers' +export type RequestVideoQaduSchedulerOptions = { + type: string + videoId: string + transaction?: Sequelize.Transaction +} + class RequestVideoQaduScheduler extends BaseRequestScheduler { constructor () { super() @@ -27,7 +35,7 @@ class RequestVideoQaduScheduler extends BaseRequestScheduler { return db.RequestVideoQadu } - buildRequestObjects (requests) { + buildRequestObjects (requests: { [ toPodId: number ]: any }[]) { const requestsToMakeGrouped = {} Object.keys(requests).forEach(toPodId => { @@ -96,17 +104,12 @@ class RequestVideoQaduScheduler extends BaseRequestScheduler { return requestsToMakeGrouped } - // { type, videoId, transaction? } - createRequest (options, callback) { - const type = options.type - const videoId = options.videoId - const transaction = options.transaction - - const dbRequestOptions: { transaction?: any } = {} + createRequest ({ type, videoId, transaction }: RequestVideoQaduSchedulerOptions, callback: (err: Error) => void) { + const dbRequestOptions: Sequelize.BulkCreateOptions = {} if (transaction) dbRequestOptions.transaction = transaction // Send the update to all our friends - db.Pod.listAllIds(options.transaction, function (err, podIds) { + db.Pod.listAllIds(transaction, function (err, podIds) { if (err) return callback(err) const queries = [] -- cgit v1.2.3