Merge branch 'release/5.0.0' into develop

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / videos / video-stats.ts

diff --git a/server/middlewares/validators/videos/video-stats.ts b/server/middlewares/validators/videos/video-stats.ts
index 12509abdecc8cbf6db80014c94b9ce2a5ca9dfee..a79526d397f2ae2e1d6372635a7f6a39d7c2e4c4 100644 (file)
--- a/server/middlewares/validators/videos/video-stats.ts
+++ b/server/middlewares/validators/videos/video-stats.ts
@@ -4,15 +4,20 @@ import { isDateValid } from '@server/helpers/custom-validators/misc'
 import { isValidStatTimeserieMetric } from '@server/helpers/custom-validators/video-stats'
 import { STATS_TIMESERIE } from '@server/initializers/constants'
 import { HttpStatusCode, UserRight, VideoStatsTimeserieQuery } from '@shared/models'
-import { logger } from '../../../helpers/logger'
 import { areValidationErrors, checkUserCanManageVideo, doesVideoExist, isValidVideoIdParam } from '../shared'
 
 const videoOverallStatsValidator = [
   isValidVideoIdParam('videoId'),
 
-  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking videoOverallStatsValidator parameters', { parameters: req.body })
+  query('startDate')
+    .optional()
+    .custom(isDateValid),
 
+  query('endDate')
+    .optional()
+    .custom(isDateValid),
+
+  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
     if (areValidationErrors(req, res)) return
     if (!await commonStatsCheck(req, res)) return
 
@@ -24,8 +29,6 @@ const videoRetentionStatsValidator = [
   isValidVideoIdParam('videoId'),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking videoRetentionStatsValidator parameters', { parameters: req.body })
-
     if (areValidationErrors(req, res)) return
     if (!await commonStatsCheck(req, res)) return
 
@@ -44,22 +47,17 @@ const videoTimeserieStatsValidator = [
   isValidVideoIdParam('videoId'),
 
   param('metric')
-    .custom(isValidStatTimeserieMetric)
-    .withMessage('Should have a valid timeserie metric'),
+    .custom(isValidStatTimeserieMetric),
 
   query('startDate')
     .optional()
-    .custom(isDateValid)
-    .withMessage('Should have a valid start date'),
+    .custom(isDateValid),
 
   query('endDate')
     .optional()
-    .custom(isDateValid)
-    .withMessage('Should have a valid end date'),
+    .custom(isDateValid),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking videoTimeserieStatsValidator parameters', { parameters: req.body })
-
     if (areValidationErrors(req, res)) return
     if (!await commonStatsCheck(req, res)) return