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

Unwind google deletion logic

Browse Source
This commit is contained in:
Trevor Buckner
2026-10-21 20:07:45 +00:00
parent d65aa2d7f0
commit e1ddac766f
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/homebrew.api.js
+14 -15
View File
@@ -398,20 +398,12 @@ const api = {
brew.description = brew.description.trim() || ''; brew.description = brew.description.trim() || '';
brew.text = api.mergeBrewText(brew); brew.text = api.mergeBrewText(brew);
//=====----- Update to or remove from Google Drive -----=========//
const googleId = brew.googleId; const googleId = brew.googleId;
const { saveToGoogle, removeFromGoogle } = req.query; const { saveToGoogle, removeFromGoogle } = req.query;
let afterSave = async ()=>true;
if(brew.googleId && removeFromGoogle) { if(brew.googleId && removeFromGoogle) {
// If the google id exists and we're removing it from google, set afterSave to delete the google brew and mark the brew's google id as undefined // If the google id exists and we're removing it from google, mark the brew's google id as undefined
afterSave = async ()=>{
return await api.deleteGoogleBrew(req.account, googleId, brew.editId, res)
.catch((err)=>{
console.error(err);
res.status(err?.status || err?.response?.status || 500).send(err.message || err);
});
};
brew.googleId = undefined; brew.googleId = undefined;
} else if(!brew.googleId && saveToGoogle) { } else if(!brew.googleId && saveToGoogle) {
// If we don't have a google id and the user wants to save to google, create the google brew and set the google id on the brew // If we don't have a google id and the user wants to save to google, create the google brew and set the google id on the brew
@@ -425,8 +417,9 @@ const api = {
if(!updated) return; if(!updated) return;
} }
//=====----- Update to Mongo -----=====//
if(brew.googleId) { if(brew.googleId) {
// If the google id exists after all those actions, exclude the props that are stored in google and aren't needed for rendering the brew items // If google id exists after above actions, Mongo will store only a stub; exclude non-stub properties from update
brew = api.excludeStubProps(brew); brew = api.excludeStubProps(brew);
} else { } else {
// Compress brew text to binary before saving // Compress brew text to binary before saving
@@ -454,11 +447,17 @@ const api = {
brew = new HomebrewModel(brew); brew = new HomebrewModel(brew);
let saved = await brew.save().catch(saveError); let saved = await brew.save().catch(saveError);
if(!saved) return; if(!saved) return;
// Call and wait for afterSave to complete
const after = await afterSave(); if(googleId && removeFromGoogle) {
if(!after) return; const deleted = await api.deleteGoogleBrew(req.account, googleId, brew.editId, res)
.catch((err)=>{
console.error(err);
res.status(err?.status || err?.response?.status || 500).send(err.message || err);
});
if(!deleted) return;
}
saved.textBin = undefined; // Remove textBin from the saved object to save bandwidth saved.textBin = undefined; // Remove textBin from the saved object to save bandwidth