Merge branch 'development' into lucie/mui-1711-events-js-update

Author: sasszz

backend/globalConfig.json

@@ -1 +1 @@
-{"mongoUri":"mongodb://127.0.0.1:53806/jest?","mongoDBName":"jest"}
+{"mongoUri":"mongodb://127.0.0.1:56074/jest?","mongoDBName":"jest"}

backend/jest-mongodb-config.js

@@ -1,5 +1,6 @@
 module.exports = {
-  preset: '@shelf/jest-mongodb',
+  testEnvironment: 'node',
   setupFilesAfterEnv: ['./jest.setup.js'],
   watchPathIgnorePatterns: ['globalConfig'],
+  testPathIgnorePatterns: ['/test/old-tests/'],
 };

backend/jest.config.js

@@ -15,7 +15,7 @@ function isAdminByEmail(req, res, next) {
       return res.sendStatus(400);
     } else {
       const role = user.accessLevel;
-      if (role === 'admin' || user.managedProjects.length > 0) {
+      if (role === 'admin' || role === 'superadmin' || user.managedProjects.length > 0) {
         next();
       } else {
         next(res.sendStatus(401));

backend/middleware/user.middleware.js

@@ -19,7 +19,6 @@
     "@babel/core": "^7.15.0",
     "@babel/eslint-parser": "^7.15.0",
     "@babel/eslint-plugin": "^7.14.5",
-    "@shelf/jest-mongodb": "^1.2.3",
     "concurrently": "^5.1.0",
     "debug": "^4.3.1",
     "eslint": "^7.9.0",

backend/package.json

@@ -73,7 +73,7 @@ router.post("/gitHub", async (req, res) => {
 
   const teamSlugs = [baseTeamSlug, managerTeamSlug];
 
-  if (accessLevel === "admin") teamSlugs.push(adminTeamSlug);
+  if (accessLevel === "admin" || accessLevel === "superadmin") teamSlugs.push(adminTeamSlug);
 
   function createSlug(string) {
     let slug = string.toLowerCase();

backend/routers/grantpermission.router.js

@@ -56,6 +56,31 @@ module.exports = {
       await removeAllCollections();
     });
 
+    // Disconnect Mongoose
+    afterAll(async () => {
+      await dropAllCollections();
+      await mongoose.connection.close();
+      await mongoServer.stop();
+    });
+  },
+  setupIntegrationDB(databaseName) {
+    // Connect to Mongoose
+    beforeAll(async () => {
+      mongoServer = new MongoMemoryServer({
+        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);
+      });
+    });
+
     // Disconnect Mongoose
     afterAll(async () => {
       await dropAllCollections();