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

Remove undesired properties from brews prior to updating

Browse Source 
Clean up tab/spacing in `googleActions.js`
This commit is contained in:
G.Ambatte
2021-08-26 17:21:45 +12:00
parent 8e841c6825
commit 941bb94190
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/googleActions.js
View File

@@ -151,19 +151,21 @@ GoogleActions = {
if(await GoogleActions.existsGoogleBrew(auth, brew.googleId) == true) { if(await GoogleActions.existsGoogleBrew(auth, brew.googleId) == true) {
await drive.files.update({ await drive.files.update({
fileId : brew.googleId, fileId : brew.googleId,
resource : { name : `${brew.title}.txt`, resource : {
description : `${brew.description}`, name : `${brew.title}.txt`,
properties : { title : brew.title, description : `${brew.description}`,
published : brew.published, properties : {
lastViewed : brew.lastViewed, title : brew.title,
views : brew.views, published : brew.published,
version : brew.version, version : brew.version,
renderer : brew.renderer, renderer : brew.renderer,
tags : brew.tags, tags : brew.tags,
systems : brew.systems.join() } systems : brew.systems.join() }
}, },
media : { mimeType : 'text/plain', media : {
body : brew.text } mimeType : 'text/plain',
body : brew.text
}
}) })
.catch((err)=>{ .catch((err)=>{
console.log('Error saving to google'); console.log('Error saving to google');

14
server/homebrew.api.js
View File

@@ -61,10 +61,20 @@ const newBrew = (req, res)=>{
}); });
}; };
const cleanBrew = (brew)=>{
// Remove undesired properties
const undesiredPropertyNames=['views', 'lastViewed'];
for (const undesiredProperty of undesiredPropertyNames) {
delete brew[undesiredProperty];
};
return brew;
};
const updateBrew = (req, res)=>{ const updateBrew = (req, res)=>{
HomebrewModel.get({ editId: req.params.id }) HomebrewModel.get({ editId: req.params.id })
.then((brew)=>{ .then((brew)=>{
brew = _.merge(brew, req.body); const updateBrew = cleanBrew(req.body);
brew = _.merge(brew, updateBrew);
brew.text = mergeBrewText(brew.text, brew.style); brew.text = mergeBrewText(brew.text, brew.style);
// Compress brew text to binary before saving // Compress brew text to binary before saving
@@ -151,7 +161,7 @@ const updateGoogleBrew = async (req, res, next)=>{
try { oAuth2Client = GoogleActions.authCheck(req.account, res); } catch (err) { return res.status(err.status).send(err.message); } try { oAuth2Client = GoogleActions.authCheck(req.account, res); } catch (err) { return res.status(err.status).send(err.message); }
const brew = req.body; const brew = cleanBrew(req.body);
brew.text = mergeBrewText(brew.text, brew.style); brew.text = mergeBrewText(brew.text, brew.style);
const updatedBrew = await GoogleActions.updateGoogleBrew(oAuth2Client, brew); const updatedBrew = await GoogleActions.updateGoogleBrew(oAuth2Client, brew);