From 56185e2a1cc29cdb1f209803e64527a8efd9e9f1 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Tue, 3 Sep 2024 23:11:10 -0400 Subject: [PATCH] Tidy `findBrews` --- server/vault.api.js | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/server/vault.api.js b/server/vault.api.js index 7e7449f78..7ec694b6a 100644 --- a/server/vault.api.js +++ b/server/vault.api.js @@ -30,32 +30,27 @@ const rendererConditions = (legacy, v3) => { }; const findBrews = async (req, res) => { - const title = req.query.title || ''; + const title = req.query.title || ''; const author = req.query.author || ''; - const page = Math.max(parseInt(req.query.page) || 1, 1); - const mincount = 10; - const count = Math.max(parseInt(req.query.count) || 20, mincount); - const skip = (page - 1) * count; - - const rendererQuery = rendererConditions(req.query.legacy, req.query.v3); - const titleQuery = titleConditions(title); - const authorQuery = authorConditions(author); + const page = Math.max(parseInt(req.query.page) || 1, 1); + const count = Math.max(parseInt(req.query.count) || 20, 10); + const skip = (page - 1) * count; const combinedQuery = { $and: [ { published: true }, - rendererQuery, - titleQuery, - authorQuery, + rendererConditions(req.query.legacy, req.query.v3), + titleConditions(title), + authorConditions(author) ], }; const projection = { - editId: 0, - googleId: 0, - text: 0, - textBin: 0, - version: 0, + editId : 0, + googleId : 0, + text : 0, + textBin : 0, + version : 0 }; await HomebrewModel.find(combinedQuery, projection)