From e02643f32e4c97ca307f8fc5b69be79c40d70a3b Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Mon, 22 May 2017 20:58:25 +0200
Subject: Type models

---
 server/lib/request/base-request-scheduler.ts        | 4 ++--
 server/lib/request/request-scheduler.ts             | 9 +++++----
 server/lib/request/request-video-event-scheduler.ts | 2 +-
 server/lib/request/request-video-qadu-scheduler.ts  | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'server/lib/request')

diff --git a/server/lib/request/base-request-scheduler.ts b/server/lib/request/base-request-scheduler.ts
index 7fc88b5f1..b7ef6abf9 100644
--- a/server/lib/request/base-request-scheduler.ts
+++ b/server/lib/request/base-request-scheduler.ts
@@ -1,6 +1,6 @@
-import { eachLimit } from 'async/eachLimit'
+import * as eachLimit from 'async/eachLimit'
 
-const db = require('../../initializers/database')
+import { database as db } from '../../initializers/database'
 import { logger, makeSecureRequest } from '../../helpers'
 import {
   API_VERSION,
diff --git a/server/lib/request/request-scheduler.ts b/server/lib/request/request-scheduler.ts
index 2006a6f03..26ffbfb86 100644
--- a/server/lib/request/request-scheduler.ts
+++ b/server/lib/request/request-scheduler.ts
@@ -1,4 +1,4 @@
-const db = require('../../initializers/database')
+import { database as db } from '../../initializers/database'
 import { BaseRequestScheduler } from './base-request-scheduler'
 import { logger } from '../../helpers'
 import {
@@ -59,13 +59,14 @@ class RequestScheduler extends BaseRequestScheduler {
     const toIds = options.toIds
     const transaction = options.transaction
 
-    const pods = []
+    // TODO: check the setPods works
+    const podIds = []
 
     // If there are no destination pods abort
     if (toIds.length === 0) return callback(null)
 
     toIds.forEach(toPod => {
-      pods.push(db.Pod.build({ id: toPod }))
+      podIds.push(toPod)
     })
 
     const createQuery = {
@@ -83,7 +84,7 @@ class RequestScheduler extends BaseRequestScheduler {
     return db.Request.create(createQuery, dbRequestOptions).asCallback((err, request) => {
       if (err) return callback(err)
 
-      return request.setPods(pods, dbRequestOptions).asCallback(callback)
+      return request.setPods(podIds, dbRequestOptions).asCallback(callback)
     })
   }
 
diff --git a/server/lib/request/request-video-event-scheduler.ts b/server/lib/request/request-video-event-scheduler.ts
index 6e5306c7d..bde50b1d3 100644
--- a/server/lib/request/request-video-event-scheduler.ts
+++ b/server/lib/request/request-video-event-scheduler.ts
@@ -1,4 +1,4 @@
-const db = require('../../initializers/database')
+import { database as db } from '../../initializers/database'
 import { BaseRequestScheduler } from './base-request-scheduler'
 import {
   REQUESTS_VIDEO_EVENT_LIMIT_PODS,
diff --git a/server/lib/request/request-video-qadu-scheduler.ts b/server/lib/request/request-video-qadu-scheduler.ts
index d81822723..dab526088 100644
--- a/server/lib/request/request-video-qadu-scheduler.ts
+++ b/server/lib/request/request-video-qadu-scheduler.ts
@@ -1,4 +1,4 @@
-const db = require('../../initializers/database')
+import { database as db } from '../../initializers/database'
 import { BaseRequestScheduler } from './base-request-scheduler'
 import { logger } from '../../helpers'
 import {
-- 
cgit v1.2.3