Merge pull request #5143 from naturalcrit/Cleanup_homebrew.api

Clean up `updateBrew` in `homebrew.api.js`

server/homebrew.api.js

@@ -222,7 +222,7 @@ const api = {
 		return _.omit(brew, ['_id', 'views', 'lastViewed']);
 	},
 	excludeGoogleProps : (brew)=>{ //Remove props that should not be saved to Google (only stored to Homebrewery stub)
-		return _.omit(brew, ['version', 'tags', 'systems', 'published', 'authors', 'owner', 'views', 'thumbnail']);
+		return _.omit(brew, ['version', 'tags', 'systems', 'published', 'authors', 'invitedAuthors', 'owner', 'views', 'thumbnail']);
 	},
 	excludeStubProps : (brew)=>{ //Remove props that should not be saved to stub-only brews
 		brew.text = brew.textBin = undefined; // Can't use _.omit because this brew is a Mongoose object
@@ -339,7 +339,6 @@ const api = {
 		return res.status(200).send(returnObj);
 	},
 	updateBrew : async (req, res)=>{
-		// Initialize brew from request and body, destructure query params, and set the initial value for the after-save method
 		const brewFromClient = api.excludePropsFromUpdate(req.body);
 		const brewFromServer = req.brew;
 
@@ -392,65 +391,57 @@ const api = {
 		brew.title       = brew.title.trim();
 		brew.description = brew.description.trim() || '';
 		brew.text        = api.mergeBrewText(brew);
-
+		brew.updatedAt   = new Date();
-		const googleId = brew.googleId;
+		brew.version     = (brew.version || 1) + 1;
-		const { saveToGoogle, removeFromGoogle } = req.query;
-		let afterSave = async ()=>true;
-
-		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
-			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;
-		} 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
-			brew.googleId = await api.newGoogleBrew(req.account, api.excludeGoogleProps(brew), res);
-
-			if(!brew.googleId) return;
-		} else if(brew.googleId) {
-			// If the google id exists and no other actions are being performed, update the google brew
-			const updated = await GoogleActions.updateGoogleBrew(api.excludeGoogleProps(brew), req.ip);
-
-			if(!updated) return;
-		}
-
-		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
-			api.excludeStubProps(brew);
-		}
-		brew.updatedAt = new Date();
-		brew.version = (brew.version || 1) + 1;
-
 		if(req.account) {
 			brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
 			brew.invitedAuthors = _.uniq(_.filter(brew.invitedAuthors, (a)=>req.account.username !== a));
 		}
 
-		// define a function to catch our save errors
+		//=====----- Update to or remove from Google Drive -----=========//
-		const saveError = (err)=>{
+		const originalGoogleId = brew.googleId;
-			console.error(err);
+		const { saveToGoogle, removeFromGoogle } = req.query;
-			res.status(err.status || 500).send(err.message || 'Unable to save brew to Homebrewery database');
+
-		};
+		if(brew.googleId && removeFromGoogle) {     // If removing from google, remove the brew's googleId
-		let saved;
+			brew.googleId = undefined;
-		if(!brew._id) {
-			// if the brew does not have a stub id, create and save it, then write the new value back to the brew.
-			saved = await new HomebrewModel(brew).save().catch(saveError);
-		} else {
-			// if the brew does have a stub id, update it using the stub id as the key.
-			brew = _.assign(await HomebrewModel.findOne({ _id: brew._id }), brew);
-			saved = await brew.save()
-				.catch(saveError);
 		}
+		else if(!brew.googleId && saveToGoogle) { // If adding to google, create new google document and record the googleId
+			brew.googleId = await api.newGoogleBrew(req.account, brew, res);
+			if(!brew.googleId) return;
+		}
+		else if(brew.googleId) {                  // If already on google, update the google brew
+			const updated = await GoogleActions.updateGoogleBrew(api.excludeGoogleProps(brew), req.ip);
+			if(!updated) return;
+		}
+
+		//=====----- Update to Mongo -----=====//
+		if(brew.googleId) {
+			// If google id exists after above actions, Mongo will store only a stub; exclude non-stub properties from update
+			brew = api.excludeStubProps(brew);
+		}
+
+		if(brew._id) // if the brew has a stub id, fetch and merge into Mongo stub document
+			brew = _.assign(await HomebrewModel.findOne({ _id: brew._id }), brew);
+		else		 // if not, create a new Mongo document
+			brew = new HomebrewModel(brew);
+
+		let saved = await brew.save()
+			.catch((err)=>{
+				console.error(err);
+				res.status(err.status || 500).send(err.message || 'Unable to save brew to Homebrewery database');
+			});
+
 		if(!saved) return;
-		// Call and wait for afterSave to complete
+
-		const after = await afterSave();
+		if(originalGoogleId && removeFromGoogle) {
-		if(!after) return;
+			const deleted = await api.deleteGoogleBrew(req.account, originalGoogleId, 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