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

Add missing return status messages

Browse Source
This commit is contained in:
G.Ambatte
2024-05-15 16:08:26 +12:00
parent 2a91d3ddbd
commit 2502c0e87c
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/admin.api.js
View File

@@ -170,14 +170,18 @@ router.post('/admin/lock/:id', mw.adminOnly, async (req, res)=>{
const lock = req.body; const lock = req.body;
lock.applied = new Date; lock.applied = new Date;
let brew;
try { try {
const filter = { const filter = {
shareId : req.params.id shareId : req.params.id
}; };
const brew = await HomebrewModel.findOne(filter); brew = await HomebrewModel.findOne(filter);
if(brew.lock) return res.json({ status: 'ALREADY LOCKED', detail: `Lock already exists on brew ${req.params.id} - ${brew.title}` }); if(brew.lock) {
console.log('ALREADY LOCKED');
return res.json({ status: 'ALREADY LOCKED', detail: `Lock already exists on brew ${req.params.id} - ${brew.title}` });
}
brew.lock = lock; brew.lock = lock;
brew.markModified('lock'); brew.markModified('lock');
@@ -187,7 +191,7 @@ router.post('/admin/lock/:id', mw.adminOnly, async (req, res)=>{
console.log(`Lock applied to brew ID ${brew.shareId} - ${brew.title}`); console.log(`Lock applied to brew ID ${brew.shareId} - ${brew.title}`);
} catch (error) { } catch (error) {
console.error(error); console.error(error);
return res.json({ error, message: `Unable to set lock on brew ${req.params.id}` }); return res.json({ status: 'ERROR', error, message: `Unable to set lock on brew ${req.params.id}` });
} }
return res.json({ status: 'LOCKED', detail: `Lock applied to brew ID ${brew.shareId} - ${brew.title}`, lock }); return res.json({ status: 'LOCKED', detail: `Lock applied to brew ID ${brew.shareId} - ${brew.title}`, lock });
@@ -244,8 +248,8 @@ router.get('/admin/lock/review/request/:id', async (req, res)=>{
// Any user can request a review of their document // Any user can request a review of their document
try { try {
const filter = { const filter = {
shareId : req.params.id, shareId : req.params.id,
'lock.locked' : true lock : { $exists: 1 }
}; };
const brew = await HomebrewModel.findOne(filter); const brew = await HomebrewModel.findOne(filter);
@@ -283,7 +287,7 @@ router.get('/admin/lock/review/remove/:id', mw.adminOnly, async (req, res)=>{
const brew = await HomebrewModel.findOne(filter); const brew = await HomebrewModel.findOne(filter);
if(!brew) { return res.json({ status: 'NOT REMOVED', detail: `Brew ID ${req.params.id} does not have a review pending!` }); }; if(!brew) { return res.json({ status: 'NOT REMOVED', detail: `Brew ID ${req.params.id} does not have a review pending!` }); };
delete brew.lock.reviewRequested; brew.lock.reviewRequested = undefined;
brew.markModified('lock'); brew.markModified('lock');
await brew.save(); await brew.save();