diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-11-09 17:51:58 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-11-27 19:40:51 +0100 |
commit | e4f97babf701481b55cc10fb3448feab5f97c867 (patch) | |
tree | af37402a594dc5ff09f71ecb0687e8cfe4cdb471 /server/models/job/job.ts | |
parent | 343ad675f2a26c15b86150a9a3552e619d5d44f4 (diff) | |
download | PeerTube-e4f97babf701481b55cc10fb3448feab5f97c867.tar.gz PeerTube-e4f97babf701481b55cc10fb3448feab5f97c867.tar.zst PeerTube-e4f97babf701481b55cc10fb3448feab5f97c867.zip |
Begin activitypub
Diffstat (limited to 'server/models/job/job.ts')
-rw-r--r-- | server/models/job/job.ts | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/server/models/job/job.ts b/server/models/job/job.ts index 968f9d71d..ce1203e5a 100644 --- a/server/models/job/job.ts +++ b/server/models/job/job.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { values } from 'lodash' | 1 | import { values } from 'lodash' |
2 | import * as Sequelize from 'sequelize' | 2 | import * as Sequelize from 'sequelize' |
3 | 3 | ||
4 | import { JOB_STATES } from '../../initializers' | 4 | import { JOB_STATES, JOB_CATEGORIES } from '../../initializers' |
5 | 5 | ||
6 | import { addMethodsToModel } from '../utils' | 6 | import { addMethodsToModel } from '../utils' |
7 | import { | 7 | import { |
@@ -13,7 +13,7 @@ import { | |||
13 | import { JobState } from '../../../shared/models/job.model' | 13 | import { JobState } from '../../../shared/models/job.model' |
14 | 14 | ||
15 | let Job: Sequelize.Model<JobInstance, JobAttributes> | 15 | let Job: Sequelize.Model<JobInstance, JobAttributes> |
16 | let listWithLimit: JobMethods.ListWithLimit | 16 | let listWithLimitByCategory: JobMethods.ListWithLimitByCategory |
17 | 17 | ||
18 | export default function defineJob (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) { | 18 | export default function defineJob (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) { |
19 | Job = sequelize.define<JobInstance, JobAttributes>('Job', | 19 | Job = sequelize.define<JobInstance, JobAttributes>('Job', |
@@ -22,6 +22,10 @@ export default function defineJob (sequelize: Sequelize.Sequelize, DataTypes: Se | |||
22 | type: DataTypes.ENUM(values(JOB_STATES)), | 22 | type: DataTypes.ENUM(values(JOB_STATES)), |
23 | allowNull: false | 23 | allowNull: false |
24 | }, | 24 | }, |
25 | category: { | ||
26 | type: DataTypes.ENUM(values(JOB_CATEGORIES)), | ||
27 | allowNull: false | ||
28 | }, | ||
25 | handlerName: { | 29 | handlerName: { |
26 | type: DataTypes.STRING, | 30 | type: DataTypes.STRING, |
27 | allowNull: false | 31 | allowNull: false |
@@ -40,7 +44,7 @@ export default function defineJob (sequelize: Sequelize.Sequelize, DataTypes: Se | |||
40 | } | 44 | } |
41 | ) | 45 | ) |
42 | 46 | ||
43 | const classMethods = [ listWithLimit ] | 47 | const classMethods = [ listWithLimitByCategory ] |
44 | addMethodsToModel(Job, classMethods) | 48 | addMethodsToModel(Job, classMethods) |
45 | 49 | ||
46 | return Job | 50 | return Job |
@@ -48,7 +52,7 @@ export default function defineJob (sequelize: Sequelize.Sequelize, DataTypes: Se | |||
48 | 52 | ||
49 | // --------------------------------------------------------------------------- | 53 | // --------------------------------------------------------------------------- |
50 | 54 | ||
51 | listWithLimit = function (limit: number, state: JobState) { | 55 | listWithLimitByCategory = function (limit: number, state: JobState) { |
52 | const query = { | 56 | const query = { |
53 | order: [ | 57 | order: [ |
54 | [ 'id', 'ASC' ] | 58 | [ 'id', 'ASC' ] |