X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fjobs.ts;h=eebd195b0e0a603857a933d8e780159fd42af724;hb=cbe2f36d93c779ca08424336be7e3988e57be01d;hp=9291401402fd9cadf3e060b44c5707adac782f4a;hpb=3b01f4c0ac764ecb70efaadfd939ca868c28769c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/jobs.ts b/server/controllers/api/jobs.ts index 929140140..eebd195b0 100644 --- a/server/controllers/api/jobs.ts +++ b/server/controllers/api/jobs.ts @@ -1,7 +1,5 @@ -import * as express from 'express' -import { ResultList } from '../../../shared' -import { Job, JobState, JobType } from '../../../shared/models' -import { UserRight } from '../../../shared/models/users' +import express from 'express' +import { Job, JobState, JobType, ResultList, UserRight } from '@shared/models' import { isArray } from '../../helpers/custom-validators/misc' import { JobQueue } from '../../lib/job-queue' import { @@ -9,18 +7,20 @@ import { authenticate, ensureUserHasRight, jobsSortValidator, + openapiOperationDoc, + paginationValidatorBuilder, setDefaultPagination, setDefaultSort } from '../../middlewares' -import { paginationValidator } from '../../middlewares/validators' import { listJobsValidator } from '../../middlewares/validators/jobs' const jobsRouter = express.Router() jobsRouter.get('/:state?', + openapiOperationDoc({ operationId: 'getJobs' }), authenticate, ensureUserHasRight(UserRight.MANAGE_JOBS), - paginationValidator, + paginationValidatorBuilder([ 'jobs' ]), jobsSortValidator, setDefaultSort, setDefaultPagination, @@ -69,6 +69,7 @@ async function formatJob (job: any, state?: JobState): Promise { 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),