From 8c4bbd946d2247c2e239cbbf8773d2d31c1a57aa Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 10 Jan 2023 11:09:30 +0100 Subject: Refactor model utils --- server/middlewares/sort.ts | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'server/middlewares') diff --git a/server/middlewares/sort.ts b/server/middlewares/sort.ts index 458895898..77a532276 100644 --- a/server/middlewares/sort.ts +++ b/server/middlewares/sort.ts @@ -1,5 +1,4 @@ import express from 'express' -import { SortType } from '../models/utils' const setDefaultSort = setDefaultSortFactory('-createdAt') const setDefaultVideosSort = setDefaultSortFactory('-publishedAt') @@ -7,27 +6,7 @@ const setDefaultVideosSort = setDefaultSortFactory('-publishedAt') const setDefaultVideoRedundanciesSort = setDefaultSortFactory('name') const setDefaultSearchSort = setDefaultSortFactory('-match') - -function setBlacklistSort (req: express.Request, res: express.Response, next: express.NextFunction) { - const 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 - - req.query.sort = newSort - - return next() -} +const setBlacklistSort = setDefaultSortFactory('-createdAt') // --------------------------------------------------------------------------- -- cgit v1.2.3