authenticate,
ensureUserHasRight,
jobsSortValidator,
+ paginationValidatorBuilder,
setDefaultPagination,
setDefaultSort
} from '../../middlewares'
-import { paginationValidator } from '../../middlewares/validators'
import { listJobsValidator } from '../../middlewares/validators/jobs'
const jobsRouter = express.Router()
jobsRouter.get('/:state?',
authenticate,
ensureUserHasRight(UserRight.MANAGE_JOBS),
- paginationValidator,
+ paginationValidatorBuilder([ 'jobs' ]),
jobsSortValidator,
setDefaultSort,
setDefaultPagination,
const result: ResultList<Job> = {
total,
- data: state
- ? jobs.map(j => formatJob(j, state))
- : await Promise.all(jobs.map(j => formatJobWithUnknownState(j)))
+ data: await Promise.all(jobs.map(j => formatJob(j, state)))
}
return res.json(result)
}
-async function formatJobWithUnknownState (job: any) {
- return formatJob(job, await job.getState())
-}
-
-function formatJob (job: any, state: JobState): Job {
+async function formatJob (job: any, state?: JobState): Promise<Job> {
const error = isArray(job.stacktrace) && job.stacktrace.length !== 0
? job.stacktrace[0]
: null
return {
id: job.id,
- state: state,
+ state: state || await job.getState(),
type: job.queue.name as JobType,
data: job.data,
+ progress: await job.progress(),
+ priority: job.opts.priority,
error,
createdAt: new Date(job.timestamp),
finishedOn: new Date(job.finishedOn),