Merge pull request #3212 from processing/revert-3211-task/mongodb-queries

Revert "Improve performance for user database queries"

Author: raclim

server/controllers/user.controller.js

@@ -171,9 +171,7 @@ export async function validateResetPasswordToken(req, res) {
   const user = await User.findOne({
     resetPasswordToken: req.params.token,
     resetPasswordExpires: { $gt: Date.now() }
-  })
-    .lean()
-    .exec();
+  }).exec();
   if (!user) {
     res.status(401).json({
       success: false,

server/models/project.js

@@ -76,7 +76,5 @@ projectSchema.methods.isSlugUnique = async function isSlugUnique() {
   };
 };
 
-projectSchema.index({ user: 1 }, { collation: { locale: 'en', strength: 2 } });
-
 export default mongoose.models.Project ||
   mongoose.model('Project', projectSchema);

server/models/user.js

@@ -310,7 +310,6 @@ userSchema.statics.findByEmailOrUsername = async function findByEmailOrUsername(
     const foundUser = await user
       .findOne(query)
       .collation({ locale: 'en', strength: 2 })
-      .lean()
       .exec();
 
     return foundUser;
@@ -344,7 +343,6 @@ userSchema.statics.findByEmailAndUsername = async function findByEmailAndUsernam
   const foundUser = await user
     .findOne(query)
     .collation({ locale: 'en', strength: 2 })
-    .lean()
     .exec();
 
   return foundUser;

server/views/404Page.js

@@ -78,13 +78,13 @@ export const get404Sketch = async () => {
     </html>`);
 
   try {
-    const p5User = await User.findOne({ username: 'p5' }).lean().exec();
+    const p5User = await User.findOne({ username: 'p5' }).exec();
 
     if (!p5User) {
       return errorMessage;
     }
 
-    const projects = await Project.find({ user: p5User._id }).lean().exec();
+    const projects = await Project.find({ user: p5User._id }).exec();
 
     if (!projects.length) {
       return errorMessage;