import * as express from 'express'
+import { ResultList } from '../../../shared'
+import { Job, JobType, JobState } from '../../../shared/models'
import { UserRight } from '../../../shared/models/users'
-import { getFormattedObjects } from '../../helpers'
-import { asyncMiddleware, authenticate, ensureUserHasRight, jobsSortValidator, setJobsSort, setPagination } from '../../middlewares'
+import { JobQueue } from '../../lib/job-queue'
+import {
+ asyncMiddleware,
+ authenticate,
+ ensureUserHasRight,
+ jobsSortValidator,
+ setDefaultPagination,
+ setDefaultSort
+} from '../../middlewares'
import { paginationValidator } from '../../middlewares/validators'
-import { JobModel } from '../../models/job/job'
+import { listJobsValidator } from '../../middlewares/validators/jobs'
+import { isArray } from '../../helpers/custom-validators/misc'
const jobsRouter = express.Router()
-jobsRouter.get('/',
+jobsRouter.get('/:state',
authenticate,
ensureUserHasRight(UserRight.MANAGE_JOBS),
paginationValidator,
jobsSortValidator,
- setJobsSort,
- setPagination,
+ setDefaultSort,
+ setDefaultPagination,
+ asyncMiddleware(listJobsValidator),
asyncMiddleware(listJobs)
)
// ---------------------------------------------------------------------------
async function listJobs (req: express.Request, res: express.Response, next: express.NextFunction) {
- const resultList = await JobModel.listForApi(req.query.start, req.query.count, req.query.sort)
+ const state: JobState = req.params.state
+ const asc = req.query.sort === 'createdAt'
+
+ const jobs = await JobQueue.Instance.listForApi(state, req.query.start, req.query.count, asc)
+ const total = await JobQueue.Instance.count(state)
+
+ const result: ResultList<any> = {
+ total,
+ data: jobs.map(j => formatJob(j, state))
+ }
+ return res.json(result)
+}
+
+function formatJob (job: any, state: JobState): Job {
+ const error = isArray(job.stacktrace) && job.stacktrace.length !== 0 ? job.stacktrace[0] : null
- return res.json(getFormattedObjects(resultList.data, resultList.total))
+ return {
+ id: job.id,
+ state: state,
+ type: job.queue.name as JobType,
+ data: job.data,
+ error,
+ createdAt: new Date(job.timestamp),
+ finishedOn: new Date(job.finishedOn),
+ processedOn: new Date(job.processedOn)
+ }
}