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

Merge pull request #5147 from naturalcrit/Cleanup_homebrew.api

Browse Source 
Pre-save, do not try to deflate text if doesn't exist
This commit is contained in:
Trevor Buckner
2026-10-22 14:34:43 -04:00
committed by GitHub
parent 0b73dbe0a8 3c93529995
commit 41e2eb5baa
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/homebrew.api.js
+2 -2
View File
@@ -402,7 +402,7 @@ const api = {
const originalGoogleId = brew.googleId; const originalGoogleId = brew.googleId;
const { saveToGoogle, removeFromGoogle } = req.query; const { saveToGoogle, removeFromGoogle } = req.query;
if(brew.googleId && removeFromGoogle) { // If removing from google, remove the brew's googleId if(brew.googleId && removeFromGoogle) { // If removing from google, remove the brew's googleId
brew.googleId = undefined; brew.googleId = undefined;
} }
else if(!brew.googleId && saveToGoogle) { // If adding to google, create new google document and record the googleId else if(!brew.googleId && saveToGoogle) { // If adding to google, create new google document and record the googleId
@@ -425,7 +425,7 @@ const api = {
else // if not, create a new Mongo document else // if not, create a new Mongo document
brew = new HomebrewModel(brew); brew = new HomebrewModel(brew);
let saved = await brew.save() const saved = await brew.save()
.catch((err)=>{ .catch((err)=>{
console.error(err); console.error(err);
res.status(err.status || 500).send(err.message || 'Unable to save brew to Homebrewery database'); res.status(err.status || 500).send(err.message || 'Unable to save brew to Homebrewery database');
server/homebrew.model.js
+5 -5
View File
@@ -32,8 +32,8 @@ const HomebrewSchema = mongoose.Schema({
lock : { type: Object, index: true } lock : { type: Object, index: true }
}, { versionKey: false }); }, { versionKey: false });
HomebrewSchema.pre('save', ()=>{ HomebrewSchema.pre('save', function() {
if(!this.googleId) { if(this.text !== undefined) {
this.textBin = zlib.deflateRawSync(this.text); this.textBin = zlib.deflateRawSync(this.text);
this.text = undefined; this.text = undefined;
} }
@@ -44,9 +44,9 @@ HomebrewSchema.statics.increaseView = async function(query) {
brew.lastViewed = new Date(); brew.lastViewed = new Date();
brew.views = brew.views + 1; brew.views = brew.views + 1;
await brew.save() await brew.save()
.catch((err)=>{ .catch((err)=>{
return err; return err;
}); });
return brew; return brew;
}; };