-import * as express from 'express'
+import express from 'express'
import { param, query } from 'express-validator'
import { isValidJobState, isValidJobType } from '../../helpers/custom-validators/jobs'
-import { logger, loggerTagsFactory } from '../../helpers/logger'
+import { loggerTagsFactory } from '../../helpers/logger'
import { areValidationErrors } from './shared'
const lTags = loggerTagsFactory('validators', 'jobs')
const listJobsValidator = [
param('state')
- .optional()
- .custom(isValidJobState).not().isEmpty().withMessage('Should have a valid job state'),
+ .optional()
+ .custom(isValidJobState),
query('jobType')
.optional()
- .custom(isValidJobType).withMessage('Should have a valid job state'),
+ .custom(isValidJobType),
(req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking listJobsValidator parameters.', { parameters: req.params, ...lTags() })
-
- if (areValidationErrors(req, res)) return
+ if (areValidationErrors(req, res, lTags())) return
return next()
}