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

Just renaming/rearranging variables

Browse Source
This commit is contained in:
Trevor Buckner
2021-08-26 23:09:56 -04:00
parent 1ed5c219ec
commit 1e8c285eef
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/googleActions.js
View File

@@ -163,7 +163,8 @@ GoogleActions = {
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 : { media : {
mimeType : 'text/plain', mimeType : 'text/plain',

22
server/homebrew.api.js
View File

@@ -19,6 +19,15 @@ const getGoodBrewTitle = (text)=>{
.slice(0, MAX_TITLE_LENGTH); .slice(0, MAX_TITLE_LENGTH);
}; };
const excludePropsFromUpdate = (brew)=>{
// Remove undesired properties
const propsToExclude = ['views', 'lastViewed'];
for (const prop of propsToExclude) {
delete brew[prop];
};
return brew;
};
const mergeBrewText = (text, style)=>{ const mergeBrewText = (text, style)=>{
if(typeof style !== 'undefined') { if(typeof style !== 'undefined') {
text = `\`\`\`css\n` + text = `\`\`\`css\n` +
@@ -61,19 +70,10 @@ 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)=>{
const updateBrew = cleanBrew(req.body); const updateBrew = excludePropsFromUpdate(req.body);
brew = _.merge(brew, updateBrew); brew = _.merge(brew, updateBrew);
brew.text = mergeBrewText(brew.text, brew.style); brew.text = mergeBrewText(brew.text, brew.style);
@@ -164,7 +164,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 = cleanBrew(req.body); const brew = excludePropsFromUpdate(req.body);
brew.text = mergeBrewText(brew.text, brew.style); brew.text = mergeBrewText(brew.text, brew.style);
try { try {