X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fjobs.ts;h=aa58a9144ea4472db750337219939cdb7f78b5ae;hb=90d4bb8125e80c8060416d4d135ddeaf0a622ede;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..aa58a9144 100644
--- a/server/controllers/api/jobs.ts
+++ b/server/controllers/api/jobs.ts
@@ -1,21 +1,29 @@
 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'
 
 const jobsRouter = express.Router()
 
-jobsRouter.get('/',
+jobsRouter.get('/:state',
   authenticate,
   ensureUserHasRight(UserRight.MANAGE_JOBS),
   paginationValidator,
   jobsSortValidator,
-  setJobsSort,
-  setPagination,
+  setDefaultSort,
+  setDefaultPagination,
+  asyncMiddleware(listJobsValidator),
   asyncMiddleware(listJobs)
 )
 
@@ -28,7 +36,26 @@ 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)
+  const sort = req.query.sort === 'createdAt' ? 'ASC' : 'DESC'
+
+  const jobs = await JobQueue.Instance.listForApi(req.params.state, req.query.start, req.query.count, sort)
+  const total = await JobQueue.Instance.count(req.params.state)
+
+  const result: ResultList<any> = {
+    total,
+    data: jobs.map(j => formatJob(j.toJSON()))
+  }
+  return res.json(result)
+}
 
-  return res.json(getFormattedObjects(resultList.data, resultList.total))
+function formatJob (job: any): Job {
+  return {
+    id: job.id,
+    state: job.state as JobState,
+    type: job.type as JobType,
+    data: job.data,
+    error: job.error,
+    createdAt: new Date(parseInt(job.created_at, 10)),
+    updatedAt: new Date(parseInt(job.updated_at, 10))
+  }
 }