f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-14 10:42:38 +00:00
Code Wiki Activity

renaming to keep some consistency

Browse Source
This commit is contained in:
Víctor Losada Hernández
2024-09-01 19:12:25 +02:00
parent e830c51a16
commit 226ad49663
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
server/vault.api.js
View File

@@ -20,16 +20,16 @@ const authorConditions = (author) => {
}; };
const rendererConditions = (legacy, v3) => { const rendererConditions = (legacy, v3) => {
const brewsQuery = {}; const renderer = {};
if (legacy === 'true' && v3 !== 'true') { if (legacy === 'true' && v3 !== 'true') {
brewsQuery.renderer = 'legacy'; renderer.renderer = 'legacy';
} else if (v3 === 'true' && legacy !== 'true') { } else if (v3 === 'true' && legacy !== 'true') {
brewsQuery.renderer = 'V3'; renderer.renderer = 'V3';
} }
//if all renderers are selected, doesn't make sense to add them to the query, it would only take longer //if all renderers are selected, doesn't make sense to add them to the query, it would only take longer
return brewsQuery; return renderer;
}; };
const findBrews = async (req, res) => { const findBrews = async (req, res) => {
@@ -40,16 +40,16 @@ const findBrews = async (req, res) => {
const count = Math.max(parseInt(req.query.count) || 20, mincount); const count = Math.max(parseInt(req.query.count) || 20, mincount);
const skip = (page - 1) * count; const skip = (page - 1) * count;
const brewsQuery = rendererConditions(req.query.legacy, req.query.v3); const rendererQuery = rendererConditions(req.query.legacy, req.query.v3);
const titleConditions = titleConditions(title); const titleQuery = titleConditions(title);
const authorConditions = authorConditions(author); const authorQuery = authorConditions(author);
const combinedQuery = { const combinedQuery = {
$and: [ $and: [
{ published: true }, { published: true },
brewsQuery, rendererQuery,
titleConditions, titleQuery,
authorConditions, authorQuery,
], ],
}; };
@@ -84,16 +84,16 @@ const findTotal = async (req, res) => {
const title = req.query.title || ''; const title = req.query.title || '';
const author = req.query.author || ''; const author = req.query.author || '';
const brewsQuery = rendererConditions(req.query.legacy, req.query.v3); const rendererQuery = rendererConditions(req.query.legacy, req.query.v3);
const titleConditions = titleConditions(title); const titleQuery = titleConditions(title);
const authorConditions = authorConditions(author); const authorQuery = authorConditions(author);
const combinedQuery = { const combinedQuery = {
$and: [ $and: [
{ published: true }, { published: true },
brewsQuery, rendererQuery,
titleConditions, titleQuery,
authorConditions, authorQuery,
], ],
}; };