import { values } from 'lodash'
import * as Sequelize from 'sequelize'
-import { JOB_STATES } from '../../initializers'
+import { JOB_STATES, JOB_CATEGORIES } from '../../initializers'
import { addMethodsToModel } from '../utils'
import {
- JobClass,
JobInstance,
JobAttributes,
JobMethods
} from './job-interface'
+import { JobCategory, JobState } from '../../../shared/models/job.model'
let Job: Sequelize.Model<JobInstance, JobAttributes>
-let listWithLimit: JobMethods.ListWithLimit
+let listWithLimitByCategory: JobMethods.ListWithLimitByCategory
export default function defineJob (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
Job = sequelize.define<JobInstance, JobAttributes>('Job',
type: DataTypes.ENUM(values(JOB_STATES)),
allowNull: false
},
+ category: {
+ type: DataTypes.ENUM(values(JOB_CATEGORIES)),
+ allowNull: false
+ },
handlerName: {
type: DataTypes.STRING,
allowNull: false
{
indexes: [
{
- fields: [ 'state' ]
+ fields: [ 'state', 'category' ]
}
]
}
)
- const classMethods = [ listWithLimit ]
+ const classMethods = [ listWithLimitByCategory ]
addMethodsToModel(Job, classMethods)
return Job
// ---------------------------------------------------------------------------
-listWithLimit = function (limit: number, state: string, callback: JobMethods.ListWithLimitCallback) {
+listWithLimitByCategory = function (limit: number, state: JobState, jobCategory: JobCategory) {
const query = {
order: [
[ 'id', 'ASC' ]
],
limit: limit,
where: {
- state
+ state,
+ category: jobCategory
}
}
- return Job.findAll(query).asCallback(callback)
+ return Job.findAll(query)
}