X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fjobs.ts;h=ed6c945335cebb7f7894aaeb3bd79e82a5045c1b;hb=8872828d59a5152e27734711ae30ebe86e84f570;hp=f6fbff36962955700801c70ed3d9cf1b10c70ee6;hpb=5cd80545422bba855cc9a730a2e13cc9d982c34b;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/api/jobs.ts b/server/controllers/api/jobs.ts
index f6fbff369..ed6c94533 100644
--- a/server/controllers/api/jobs.ts
+++ b/server/controllers/api/jobs.ts
@@ -1,21 +1,30 @@
 import * as express from 'express'
-import { asyncMiddleware, jobsSortValidator, setJobsSort, setPagination } from '../../middlewares'
-import { paginationValidator } from '../../middlewares/validators/pagination'
-import { database as db } from '../../initializers'
-import { getFormattedObjects } from '../../helpers/utils'
-import { authenticate } from '../../middlewares/oauth'
-import { ensureUserHasRight } from '../../middlewares/user-right'
-import { UserRight } from '../../../shared/models/users/user-right.enum'
+import { ResultList } from '../../../shared'
+import { Job, JobType, JobState } from '../../../shared/models'
+import { UserRight } from '../../../shared/models/users'
+import { JobQueue } from '../../lib/job-queue'
+import {
+  asyncMiddleware,
+  authenticate,
+  ensureUserHasRight,
+  jobsSortValidator,
+  setDefaultPagination,
+  setDefaultSort
+} from '../../middlewares'
+import { paginationValidator } from '../../middlewares/validators'
+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,
+  listJobsValidator,
   asyncMiddleware(listJobs)
 )
 
@@ -27,8 +36,38 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function listJobs (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const resultList = await db.Job.listForApi(req.query.start, req.query.count, req.query.sort)
+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,
+    start: req.query.start,
+    count: req.query.count,
+    asc,
+    jobType
+  })
+  const total = await JobQueue.Instance.count(state, jobType)
+
+  const result: ResultList<Job> = {
+    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)
+  }
 }