Refactor model utils

[github/Chocobozzz/PeerTube.git] / server / middlewares / sort.ts

diff --git a/server/middlewares/sort.ts b/server/middlewares/sort.ts
index 8c27e82379bfbb2b09f04b1bd249ea859ab9f2f3..77a532276d26de286b44ccb7c8700d82a4270504 100644 (file)
--- a/server/middlewares/sort.ts
+++ b/server/middlewares/sort.ts
@@ -1,43 +1,29 @@
-import * as express from 'express'
-import { SortType } from '../models/utils'
+import express from 'express'
 
-function setDefaultSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-createdAt'
+const setDefaultSort = setDefaultSortFactory('-createdAt')
+const setDefaultVideosSort = setDefaultSortFactory('-publishedAt')
 
-  return next()
-}
-
-function setDefaultSearchSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-match'
-
-  return next()
-}
-
-function setBlacklistSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  let newSort: SortType = { sortModel: undefined, sortValue: '' }
-
-  if (!req.query.sort) req.query.sort = '-createdAt'
-
-  // Set model we want to sort onto
-  if (req.query.sort === '-createdAt' || req.query.sort === 'createdAt' ||
-      req.query.sort === '-id' || req.query.sort === 'id') {
-    // If we want to sort onto the BlacklistedVideos relation, we won't specify it in the query parameter ...
-    newSort.sortModel = undefined
-  } else {
-    newSort.sortModel = 'Video'
-  }
-
-  newSort.sortValue = req.query.sort
+const setDefaultVideoRedundanciesSort = setDefaultSortFactory('name')
 
-  req.query.sort = newSort
-
-  return next()
-}
+const setDefaultSearchSort = setDefaultSortFactory('-match')
+const setBlacklistSort = setDefaultSortFactory('-createdAt')
 
 // ---------------------------------------------------------------------------
 
 export {
   setDefaultSort,
   setDefaultSearchSort,
+  setDefaultVideosSort,
+  setDefaultVideoRedundanciesSort,
   setBlacklistSort
 }
+
+// ---------------------------------------------------------------------------
+
+function setDefaultSortFactory (sort: string) {
+  return (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    if (!req.query.sort) req.query.sort = sort
+
+    return next()
+  }
+}