f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-24 16:22:44 +00:00
Code Wiki Activity

rest of the suggested changes

Browse Source
This commit is contained in:
Víctor Losada Hernández
2024-09-01 11:14:09 +02:00
parent f0b447866c
commit 3fc2e5202e
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/homebrew/pages/errorPage/errors/errorIndex.js
View File

@@ -174,6 +174,8 @@ const errorIndex = (props)=>{
'90' : dedent` An unexpected error occurred while looking for these brews.
Try again in a few minutes.`,
'91' : dedent` An unexpected error occurred while trying to get the total of brews.`,
};
};

27
server/vault.api.js
View File

@@ -4,7 +4,7 @@ const HomebrewModel = require('./homebrew.model.js').model;
const router = express.Router();
const buildTitleConditions = (title) => {
const titleConditions = (title) => {
if (!title) return {};
return {
$text: {
@@ -14,12 +14,12 @@ const buildTitleConditions = (title) => {
};
};
const buildAuthorConditions = (author) => {
const authorConditions = (author) => {
if (!author) return {};
return { authors: author };
};
const buildRendererConditions = (legacy, v3) => {
const rendererConditions = (legacy, v3) => {
const brewsQuery = {};
if (legacy === 'true' && v3 !== 'true') {
@@ -40,9 +40,9 @@ const findBrews = async (req, res) => {
const count = Math.max(parseInt(req.query.count) || 20, mincount);
const skip = (page - 1) * count;
const brewsQuery = buildRendererConditions(req.query.legacy, req.query.v3);
const titleConditions = buildTitleConditions(title);
const authorConditions = buildAuthorConditions(author);
const brewsQuery = rendererConditions(req.query.legacy, req.query.v3);
const titleConditions = titleConditions(title);
const authorConditions = authorConditions(author);
const combinedQuery = {
$and: [
@@ -84,9 +84,9 @@ const findTotal = async (req, res) => {
const title = req.query.title || '';
const author = req.query.author || '';
const brewsQuery = buildRendererConditions(req.query.legacy, req.query.v3);
const titleConditions = buildTitleConditions(title);
const authorConditions = buildAuthorConditions(author);
const brewsQuery = rendererConditions(req.query.legacy, req.query.v3);
const titleConditions = titleConditions(title);
const authorConditions = authorConditions(author);
const combinedQuery = {
$and: [
@@ -99,17 +99,12 @@ const findTotal = async (req, res) => {
await HomebrewModel.countDocuments(combinedQuery)
.then((totalBrews) => {
console.log(
'when returning, the total of brews is ',
totalBrews,
'for the query',
JSON.stringify(combinedQuery)
);
console.log(`when returning, the total of brews is ${totalBrews} for the query ${JSON.stringify(combinedQuery)}`);
res.json({ totalBrews });
})
.catch((error) => {
console.error(error);
throw {...err, message: "Error finding brews in Vault search", HBErrorCode: 90};
throw {...err, message: "Error finding brews in Vault search findTotal function", HBErrorCode: 91};
});
};