From c46c4a9320a805c14f79b4a8e15bafa660129c9e Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Thu, 28 Apr 2022 20:19:01 +1200
Subject: [PATCH] Switch to use `select` method

---
 server/app.js            | 13 ++++++++++++-
 server/homebrew.model.js |  6 +++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/server/app.js b/server/app.js
index 7d1e54d80..c04e9b370 100644
--- a/server/app.js
+++ b/server/app.js
@@ -194,7 +194,18 @@ app.get('/download/:id', asyncHandler(async (req, res)=>{
 app.get('/user/:username', async (req, res, next)=>{
 	const ownAccount = req.account && (req.account.username == req.params.username);
 
-	const fields = 'title pageCount description authors views shareId editId createdAt updatedAt lastViewed';
+	const fields = [
+		'title',
+		'pageCount',
+		'description',
+		'authors',
+		'views',
+		'shareId',
+		'editId',
+		'createdAt',
+		'updatedAt',
+		'lastViewed'
+	];
 
 	let brews = await HomebrewModel.getByUser(req.params.username, ownAccount, fields)
 	.catch((err)=>{
diff --git a/server/homebrew.model.js b/server/homebrew.model.js
index d0692f0a9..cce9f9ac6 100644
--- a/server/homebrew.model.js
+++ b/server/homebrew.model.js
@@ -39,7 +39,7 @@ HomebrewSchema.statics.increaseView = async function(query) {
 
 HomebrewSchema.statics.get = function(query, fields=null){
 	return new Promise((resolve, reject)=>{
-		Homebrew.find(query, fields, null, (err, brews)=>{
+		Homebrew.find(query, (err, brews)=>{
 			if(err || !brews.length) return reject('Can not find brew');
 			if(!_.isNil(brews[0].textBin)) {			// Uncompress zipped text field
 				unzipped = zlib.inflateRawSync(brews[0].textBin);
@@ -48,7 +48,7 @@ HomebrewSchema.statics.get = function(query, fields=null){
 			if(!brews[0].renderer)
 				brews[0].renderer = 'legacy';
 			return resolve(brews[0]);
-		});
+		}).select(fields);
 	});
 };
 
@@ -58,7 +58,7 @@ HomebrewSchema.statics.getByUser = function(username, allowAccess=false, fields=
 		if(allowAccess){
 			delete query.published;
 		}
-		Homebrew.find(query, fields).lean().exec((err, brews)=>{ //lean() converts results to JSObjects
+		Homebrew.find(query).select(fields).lean().exec((err, brews)=>{ //lean() converts results to JSObjects
 			if(err) return reject('Can not find brew');
 			return resolve(brews);
 		});