X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fjobs.ts;h=ed6c945335cebb7f7894aaeb3bd79e82a5045c1b;hb=8872828d59a5152e27734711ae30ebe86e84f570;hp=1fa662349a958d1c96c5272bd1054619093d9302;hpb=d5d9b6d7bfb7e9426b6462f7fdf285df39eea820;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/jobs.ts b/server/controllers/api/jobs.ts index 1fa662349..ed6c94533 100644 --- a/server/controllers/api/jobs.ts +++ b/server/controllers/api/jobs.ts @@ -24,7 +24,7 @@ jobsRouter.get('/:state', jobsSortValidator, setDefaultSort, setDefaultPagination, - asyncMiddleware(listJobsValidator), + listJobsValidator, asyncMiddleware(listJobs) ) @@ -39,11 +39,18 @@ export { async function listJobs (req: express.Request, res: express.Response) { const state = req.params.state as JobState const asc = req.query.sort === 'createdAt' + const jobType = req.query.jobType - const jobs = await JobQueue.Instance.listForApi(state, req.query.start, req.query.count, asc) - const total = await JobQueue.Instance.count(state) + const jobs = await JobQueue.Instance.listForApi({ + state, + start: req.query.start, + count: req.query.count, + asc, + jobType + }) + const total = await JobQueue.Instance.count(state, jobType) - const result: ResultList = { + const result: ResultList = { total, data: jobs.map(j => formatJob(j, state)) }