From 4971c40e2322ef5a39c96ab47e5c57bfa6b888bd Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Thu, 26 Aug 2021 17:21:45 +1200
Subject: [PATCH] Remove undesired properties from brews prior to updating
 Clean up tab/spacing in `googleActions.js`

---
 server/googleActions.js | 30 +++++++++++++++---------------
 server/homebrew.api.js  | 14 ++++++++++++--
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/server/googleActions.js b/server/googleActions.js
index 68532a7a9..d193f32f8 100644
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -154,21 +154,21 @@ GoogleActions = {
 		if(await GoogleActions.existsGoogleBrew(auth, brew.googleId) == true) {
 			await drive.files.update({
 				fileId   : brew.googleId,
-				resource : { name        : `${brew.title}.txt`,
-										 description : `${brew.description}`,
-										 properties  : { title      : brew.title,
-										 							    published  : brew.published,
-																	    lastViewed : brew.lastViewed,
-																	    views      : brew.views,
-																	    version    : brew.version,
-																	    renderer   : brew.renderer,
-																	    tags       : brew.tags,
-																	    systems    : brew.systems.join(),
-																	    pageCount  : brew.pageCount
-																 }
-									 },
-				media : { mimeType : 'text/plain',
-								  body     : brew.text }
+				resource : {
+					name        : `${brew.title}.txt`,
+					description : `${brew.description}`,
+					properties  : {
+						title     : brew.title,
+						published : brew.published,
+						version   : brew.version,
+						renderer  : brew.renderer,
+						tags      : brew.tags,
+						systems   : brew.systems.join() }
+				},
+				media : {
+					mimeType : 'text/plain',
+					body     : brew.text
+				}
 			})
 			.catch((err)=>{
 				console.log('Error saving to google');
diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 36d0aa576..afd5a8d30 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -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)=>{
 	HomebrewModel.get({ editId: req.params.id })
 		.then((brew)=>{
-			brew = _.merge(brew, req.body);
+			const updateBrew = cleanBrew(req.body);
+			brew = _.merge(brew, updateBrew);
 			brew.text = mergeBrewText(brew.text, brew.style);
 
 			// Compress brew text to binary before saving
@@ -154,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); }
 
-	const brew = req.body;
+	const brew = cleanBrew(req.body);
 	brew.text = mergeBrewText(brew.text, brew.style);
 
 	try {