f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-20 11:52:46 +00:00
Code Wiki Activity

Shift remaining lock API functions to use throw

Browse Source
This commit is contained in:
G.Ambatte
2025-04-07 16:32:33 +12:00
parent ef6f022ea3
commit a218b87215
2 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,23 +203,33 @@ const errorIndex = (props)=>{
// ####### Lock Errors // ####### Lock Errors
'60' : dedent`General Lock Error`, '60' : dedent`Lock Error: General`,
'61' : dedent`Lock Error: Unable to get lock count`, '61' : dedent`Lock Get Error: Unable to get lock count`,
'62' : dedent`Lock Error: Cannot lock`, '62' : dedent`Lock Set Error: Cannot lock`,
'63' : dedent`Lock Error: Cannot lock - brew not found`, '63' : dedent`Lock Set Error: Brew not found`,
'64' : dedent`Lock Error: Cannot lock - already locked`, '64' : dedent`Lock Set Error: Already locked`,
'65' : dedent`Lock Error: Cannot unlock`, '65' : dedent`Lock Remove Error: Cannot unlock`,
'66' : dedent`Lock Error: Cannot unlock - brew not found`, '66' : dedent`Lock Remove Error: Brew not found`,
'67' : dedent`Lock Error: Cannot unlock - not locked`, '67' : dedent`Lock Remove Error: Not locked`,
'68' : dedent`Lock Error: Cannot get pending reviews`, '68' : dedent`Lock Get Review Error: Cannot get review requests`,
'69' : dedent`Lock Set Review Error: Cannot set review request`,
'70' : dedent`Lock Set Review Error: Brew not found`,
'71' : dedent`Lock Set Review Error: Review already requested`,
'72' : dedent`Lock Remove Review Error: Cannot clear review request`,
'73' : dedent`Lock Remove Review Error: Brew not found`,
// ####### Other Errors // ####### Other Errors

18
server/admin.api.js
View File

@@ -258,7 +258,7 @@ router.get('/api/lock/reviews', mw.adminOnly, asyncHandler(async (req, res)=>{
]; ];
const reviewDocuments = await HomebrewModel.aggregate(countReviewsPipeline) const reviewDocuments = await HomebrewModel.aggregate(countReviewsPipeline)
.catch((error)=>{ .catch((error)=>{
throw { name: 'Unable to get reviews', message: 'Unable to get review collection', status: 500, HBErrorCode: '68', error }; throw { name: 'Can Not Get Reviews', message: 'Unable to get review collection', status: 500, HBErrorCode: '68', error };
}); });
return res.json({ return res.json({
reviewDocuments reviewDocuments
@@ -275,11 +275,11 @@ router.put('/admin/lock/review/request/:id', asyncHandler(async (req, res)=>{
}; };
const brew = await HomebrewModel.findOne(filter); const brew = await HomebrewModel.findOne(filter);
if(!brew) { return res.json({ status: 'NOT LOCKED', detail: `Brew ID ${req.params.id} is not locked!` }); }; if(!brew) { throw { name: 'Brew Not Found', message: `Cannot find a locked brew with ID ${req.params.id}`, code: 500, HBErrorCode: '70' }; };
if(brew.lock.reviewRequested){ if(brew.lock.reviewRequested){
// console.log(`Review already requested for brew ${brew.shareId} - ${brew.title}`); // console.log(`Review already requested for brew ${brew.shareId} - ${brew.title}`);
return res.json({ status: 'ALREADY REQUESTED', detail: `Review already requested for brew ${brew.shareId} - ${brew.title}` }); throw { name: 'Review Already Requested', message: `Review already requested for brew ${brew.shareId} - ${brew.title}`, code: 500, HBErrorCode: '71' };
}; };
brew.lock.reviewRequested = new Date(); brew.lock.reviewRequested = new Date();
@@ -287,12 +287,11 @@ router.put('/admin/lock/review/request/:id', asyncHandler(async (req, res)=>{
await brew.save() await brew.save()
.catch((error)=>{ .catch((error)=>{
console.error(error); throw { name: 'Can Not Set Review Request', message: `Unable to set request for review on brew ID ${req.params.id}`, code: 500, HBErrorCode: '69', error };
return res.json({ status: 'ERROR', detail: `Unable to set request for review on brew ID ${req.params.id}`, error });
}); });
// console.log(`Review requested on brew ${brew.shareId} - ${brew.title}`); // console.log(`Review requested on brew ${brew.shareId} - ${brew.title}`);
return res.json({ status: 'REVIEW REQUESTED', detail: `Review requested on brew ID ${brew.shareId} - ${brew.title}` }); return res.json({ name: 'Review Requested', message: `Review requested on brew ID ${brew.shareId} - ${brew.title}` });
})); }));
@@ -304,19 +303,18 @@ router.put('/api/lock/review/remove/:id', mw.adminOnly, asyncHandler(async (req,
}; };
const brew = await HomebrewModel.findOne(filter); const brew = await HomebrewModel.findOne(filter);
if(!brew) { return res.json({ status: 'REVIEW REQUEST NOT REMOVED', detail: `Brew ID ${req.params.id} does not have a review pending!` }); }; if(!brew) { throw { name: 'Can Not Clear Review Request', message: `Brew ID ${req.params.id} does not have a review pending!`, HBErrorCode: '73' }; };
brew.lock.reviewRequested = undefined; brew.lock.reviewRequested = undefined;
brew.markModified('lock'); brew.markModified('lock');
await brew.save() await brew.save()
.catch((error)=>{ .catch((error)=>{
console.error(error); throw { name: 'Can Not Clear Review Request', message: `Unable to remove request for review on brew ID ${req.params.id}`, HBErrorCode: '72', error };
return res.json({ status: 'ERROR', detail: `Unable to remove request for review on brew ID ${req.params.id}`, error });
}); });
// console.log(`Review request removed on brew ID ${brew.shareId} - ${brew.title}`); // console.log(`Review request removed on brew ID ${brew.shareId} - ${brew.title}`);
return res.json({ status: 'REVIEW REQUEST REMOVED', detail: `Review request removed for brew ID ${brew.shareId} - ${brew.title}` }); return res.json({ name: 'Review Request Cleared', message: `Review request removed for brew ID ${brew.shareId} - ${brew.title}` });
})); }));