Ts.750

backend/controllers/project.controller.js

@@ -109,15 +109,15 @@ ProjectController.bulkUpdateManagedByUsers = async function (req, res) {
   // Convert string IDs to ObjectId in bulkOps
   bulkOps.forEach((op) => {
     if (op?.updateOne?.filter._id) {
-      op.updateOne.filter._id = ObjectId(op.updateOne.filter._id);
+      op.updateOne.filter._id = new ObjectId(op.updateOne.filter._id);
     }
     if (op?.updateOne?.update) {
       const update = op.updateOne.update;
       if (update?.$addToSet?.managedByUsers) {
-        update.$addToSet.managedByUsers = ObjectId(update.$addToSet.managedByUsers);
+        update.$addToSet.managedByUsers = new ObjectId(update.$addToSet.managedByUsers);
       }
       if (update?.$pull?.managedByUsers) {
-        update.$pull.managedByUsers = ObjectId(update.$pull.managedByUsers);
+        update.$pull.managedByUsers = new ObjectId(update.$pull.managedByUsers);
       }
     }
   });

backend/controllers/user.controller.js

@@ -204,7 +204,7 @@ function generateAccessToken(user, auth_origin) {
   );
 }
 
-UserController.createUser = function (req, res) {
+UserController.createUser = async function (req, res) {
   const { firstName, lastName, email } = req.body;
   const { origin } = req.headers;
 
@@ -217,13 +217,12 @@ UserController.createUser = function (req, res) {
     accessLevel: 'user',
   });
 
-  // eslint-disable-next-line
-  user.save((err, usr) => {
-    if (err) {
-      res.sendStatus(400);
-    }
+  try {
+    await user.save();
     res.sendStatus(201);
-  });
+  } catch (err) {
+    res.sendStatus(400);
+  }
 
   const jsonToken = generateAccessToken(user);
 
@@ -333,15 +332,15 @@ UserController.bulkUpdateManagedProjects = async function (req, res) {
   // Convert string IDs to ObjectId in bulkOps
   bulkOps.forEach((op) => {
     if (op?.updateOne?.filter._id) {
-      op.updateOne.filter._id = ObjectId(op.updateOne.filter._id);
+      op.updateOne.filter._id = new ObjectId(op.updateOne.filter._id);
     }
     if (op?.updateOne?.update) {
       const update = op.updateOne.update;
       if (update?.$addToSet?.managedProjects) {
-        update.$addToSet.managedProjects = ObjectId(update.$addToSet.managedProjects);
+        update.$addToSet.managedProjects = new ObjectId(update.$addToSet.managedProjects);
       }
       if (update?.$pull?.managedProjects) {
-        update.$pull.managedProjects = ObjectId(update.$pull.managedProjects);
+        update.$pull.managedProjects = new ObjectId(update.$pull.managedProjects);
       }
     }
   });

backend/package.json

@@ -52,7 +52,7 @@
     "helmet": "^3.22.0",
     "jsonwebtoken": "^8.5.1",
     "mongodb-memory-server": "^6.9.0",
-    "mongoose": "^5.10.0",
+    "mongoose": "^8.9.5",
     "morgan": "^1.10.0",
     "node-cron": "^2.0.3",
     "node-fetch": "^2.6.7",

backend/scripts/cloneOrSyncCollections.js

@@ -69,8 +69,6 @@ async function connectDbs() {
   // Connect PROD using Mongoose
   await mongoose.connect(process.env.PROD_DB_URI, {
     dbName: PROD_DB_NAME,
-    useNewUrlParser: true,
-    useUnifiedTopology: true,
   });
   // Connect DEV using MongoClient
   const dev = new MongoClient(process.env.DEV_DB_URI);

backend/server.js

@@ -12,12 +12,7 @@ mongoose.Promise = global.Promise;
 let server;
 async function runServer(databaseUrl = CONFIG_DB.DATABASE_URL, port = CONFIG_DB.PORT) {
   await mongoose
-    .connect(databaseUrl, {
-      useNewUrlParser: true,
-      useCreateIndex: true,
-      useUnifiedTopology: true,
-      useFindAndModify: false,
-    })
+    .connect(databaseUrl)
     .catch((err) => err);
 
   server = app
@@ -48,35 +43,30 @@ async function closeServer() {
   });
 }
 
-function initial() {
-  Role.collection.estimatedDocumentCount((err, count) => {
-    if (!err && count === 0) {
-      new Role({
-        name: "APP_USER",
-      }).save((err) => {
-        if (err) {
-          console.log("error", err);
-        }
+async function initial() {
+  try {
+    const count = await Role.collection.estimatedDocumentCount();
 
-        console.log("added 'user' to roles collection");
-      });
+    if (count === 0) {
+      await new Role({
+        name: "APP_USER",
+      }).save();
+      console.log("added 'user' to roles collection");
 
-      new Role({
+      await new Role({
         name: "APP_ADMIN",
-      }).save((err) => {
-        if (err) {
-          console.log("error", err);
-        }
-
-        console.log("added 'moderator' to roles collection");
-      });
+      }).save();
+      console.log("added 'moderator' to roles collection");
     }
-  });
+  } catch (err) {
+    console.log("error", err);
+  }
 }
 
 if (require.main === module) {
-  runServer().catch((err) => console.error(err));
-  initial();
+  runServer()
+    .then(() => initial())
+    .catch((err) => console.error(err));
 }
 
 module.exports = { app, runServer, closeServer };

backend/setup-test.js

@@ -1,6 +1,5 @@
 // test-setup.js
 const mongoose = require("mongoose");
-mongoose.set("useCreateIndex", true);
 mongoose.promise = global.Promise;
 
 const { MongoMemoryServer } = require("mongodb-memory-server");
@@ -40,15 +39,11 @@ module.exports = {
         instance: { dbName: databaseName },
       });
       const mongoUri = await mongoServer.getUri();
-      const opts = {
-        useNewUrlParser: true,
-        useFindAndModify: false,
-        useCreateIndex: true,
-        useUnifiedTopology: true,
-      };
-      await mongoose.connect(mongoUri, opts, (err) => {
-        if (err) console.error(err);
-      });
+      try {
+        await mongoose.connect(mongoUri);
+      } catch (err) {
+        console.error(err);
+      }
     });
 
     // Disconnect Mongoose