Use saveInTransactionWithRetries helper

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / user-history.ts

diff --git a/server/middlewares/validators/user-history.ts b/server/middlewares/validators/user-history.ts
index 2f1d3cc4134ecb1ec2e424fa6fa366aac034ebd0..f2dae313437ad42c8a8835b25bdb21b52bd6504b 100644 (file)
--- a/server/middlewares/validators/user-history.ts
+++ b/server/middlewares/validators/user-history.ts
@@ -1,17 +1,37 @@
-import * as express from 'express'
-import { body } from 'express-validator'
-import { logger } from '../../helpers/logger'
-import { areValidationErrors } from './utils'
-import { isDateValid } from '../../helpers/custom-validators/misc'
+import express from 'express'
+import { body, param, query } from 'express-validator'
+import { exists, isDateValid, isIdValid } from '../../helpers/custom-validators/misc'
+import { areValidationErrors } from './shared'
 
-const userHistoryRemoveValidator = [
+const userHistoryListValidator = [
+  query('search')
+    .optional()
+    .custom(exists),
+
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    if (areValidationErrors(req, res)) return
+
+    return next()
+  }
+]
+
+const userHistoryRemoveAllValidator = [
   body('beforeDate')
     .optional()
-    .custom(isDateValid).withMessage('Should have a valid before date'),
+    .custom(isDateValid).withMessage('Should have a before date that conforms to ISO 8601'),
 
   (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking userHistoryRemoveValidator parameters', { parameters: req.body })
+    if (areValidationErrors(req, res)) return
+
+    return next()
+  }
+]
 
+const userHistoryRemoveElementValidator = [
+  param('videoId')
+    .custom(isIdValid),
+
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
     if (areValidationErrors(req, res)) return
 
     return next()
@@ -21,5 +41,7 @@ const userHistoryRemoveValidator = [
 // ---------------------------------------------------------------------------
 
 export {
-  userHistoryRemoveValidator
+  userHistoryListValidator,
+  userHistoryRemoveElementValidator,
+  userHistoryRemoveAllValidator
 }