diff options
Diffstat (limited to 'server/models/job')
-rw-r--r-- | server/models/job/job-interface.ts | 4 | ||||
-rw-r--r-- | server/models/job/job.ts | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/server/models/job/job-interface.ts b/server/models/job/job-interface.ts index 31b377367..ba5622977 100644 --- a/server/models/job/job-interface.ts +++ b/server/models/job/job-interface.ts | |||
@@ -1,10 +1,10 @@ | |||
1 | import * as Sequelize from 'sequelize' | 1 | import * as Sequelize from 'sequelize' |
2 | import * as Promise from 'bluebird' | ||
2 | 3 | ||
3 | import { JobState } from '../../../shared/models/job.model' | 4 | import { JobState } from '../../../shared/models/job.model' |
4 | 5 | ||
5 | export namespace JobMethods { | 6 | export namespace JobMethods { |
6 | export type ListWithLimitCallback = (err: Error, jobInstances: JobInstance[]) => void | 7 | export type ListWithLimit = (limit: number, state: JobState) => Promise<JobInstance[]> |
7 | export type ListWithLimit = (limit: number, state: JobState, callback: ListWithLimitCallback) => void | ||
8 | } | 8 | } |
9 | 9 | ||
10 | export interface JobClass { | 10 | export interface JobClass { |
diff --git a/server/models/job/job.ts b/server/models/job/job.ts index 38e4e8f30..968f9d71d 100644 --- a/server/models/job/job.ts +++ b/server/models/job/job.ts | |||
@@ -5,7 +5,6 @@ import { JOB_STATES } from '../../initializers' | |||
5 | 5 | ||
6 | import { addMethodsToModel } from '../utils' | 6 | import { addMethodsToModel } from '../utils' |
7 | import { | 7 | import { |
8 | JobClass, | ||
9 | JobInstance, | 8 | JobInstance, |
10 | JobAttributes, | 9 | JobAttributes, |
11 | 10 | ||
@@ -49,7 +48,7 @@ export default function defineJob (sequelize: Sequelize.Sequelize, DataTypes: Se | |||
49 | 48 | ||
50 | // --------------------------------------------------------------------------- | 49 | // --------------------------------------------------------------------------- |
51 | 50 | ||
52 | listWithLimit = function (limit: number, state: JobState, callback: JobMethods.ListWithLimitCallback) { | 51 | listWithLimit = function (limit: number, state: JobState) { |
53 | const query = { | 52 | const query = { |
54 | order: [ | 53 | order: [ |
55 | [ 'id', 'ASC' ] | 54 | [ 'id', 'ASC' ] |
@@ -60,5 +59,5 @@ listWithLimit = function (limit: number, state: JobState, callback: JobMethods.L | |||
60 | } | 59 | } |
61 | } | 60 | } |
62 | 61 | ||
63 | return Job.findAll(query).asCallback(callback) | 62 | return Job.findAll(query) |
64 | } | 63 | } |