Merge branch 'development' into Style-manager-access-MUI-Switch-to-match-Figma-design

Author: trillium

.gitignore

@@ -14,4 +14,5 @@ test.db
 videos/
 screenshots/
 vrms.code-workspace
-.vscode/
+.vscode/
+backend/swagger-output.json

backend/app.js

@@ -1,25 +1,34 @@
-
 // app.js - Entry point for our application
 
+import { createRequire } from 'module';
+import cookieParser from 'cookie-parser';
 // Load in all of our node modules. Their uses are explained below as they are called.
-const express = require('express');
-const morgan = require('morgan');
-const cron = require('node-cron');
-const fetch = require('node-fetch');
-const cookieParser = require('cookie-parser');
+import express from 'express';
+import morgan from 'morgan';
+import cron from 'node-cron';
+import fetch from 'node-fetch';
+import swaggerUi from 'swagger-ui-express';
+
+const require = createRequire(import.meta.url);
+let swaggerDocument;
+try {
+  swaggerDocument = require('./swagger-output.json');
+} catch (e) {
+  console.warn('swagger-output.json not found. Run "npm run swagger" to generate it.');
+  swaggerDocument = null;
+}
 
 const customRequestHeaderName = 'x-customrequired-header';
-const dontCheckCustomRequestHeaderApis = ['GET::/api/recurringevents', 'GET::/api/healthcheck'];
-
-// Import environment variables
-const dotenv = require('dotenv');
-const dotenvExpand = require('dotenv-expand');
-
-const myEnv = dotenv.config();
-dotenvExpand(myEnv);
+const dontCheckCustomRequestHeaderApis = [
+  'GET::/api/recurringevents',
+  'GET::/api/healthcheck',
+  'GET::/api-docs',
+  'GET::/api-docs/',
+];
 
 // Verify environment variables
-require('assert-env')([
+import assertEnv from 'assert-env';
+assertEnv([
   'CUSTOM_REQUEST_HEADER',
   'SLACK_OAUTH_TOKEN',
   'SLACK_BOT_TOKEN',
@@ -52,37 +61,41 @@ app.use(cookieParser());
 // HTTP Request Logger
 app.use(morgan('dev'));
 
-// WORKERS
-const runOpenCheckinWorker = require('./workers/openCheckins');
-runOpenCheckinWorker(cron, fetch);
-
-const runCloseCheckinWorker = require('./workers/closeCheckins');
-runCloseCheckinWorker(cron, fetch);
+// Swagger API Documentation
+if (swaggerDocument) {
+  app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument));
+}
 
-const { createRecurringEvents } = require('./workers/createRecurringEvents');
-createRecurringEvents(cron, fetch);
-// const runSlackBot = require("./workers/slackbot")(fetch);
+import closeCheckins from './workers/closeCheckins.js';
+import createRecurringEvents from './workers/createRecurringEvents.js';
+// WORKERS
+import openCheckins from './workers/openCheckins.js';
+const runOpenCheckinWorker = openCheckins(cron, fetch);
+const runCloseCheckinWorker = closeCheckins(cron, fetch);
+const runCreateRecurringEventsWorker = createRecurringEvents(cron, fetch);
+// import slackbot from './workers/slackbot.js';
+// const runSlackBot = slackbot(fetch);
 
 // Run cleanup expired refresh token(s) on startup
-const { cleanupExpiredTokens } = require('./workers/tokenCleanup');
+import { cleanupExpiredTokens } from './workers/tokenCleanup.js';
 cleanupExpiredTokens();
 
 // MIDDLEWARE
-const errorhandler = require('./middleware/errorhandler.middleware');
+import errorhandler from './middleware/errorhandler.middleware.js';
 
+//import slackRouter from './routers/slack.router.js';
+import authRouter from './routers/auth.router.js';
+import checkInsRouter from './routers/checkIns.router.js';
+import checkUserRouter from './routers/checkUser.router.js';
 // ROUTES
-const eventsRouter = require('./routers/events.router');
-const checkInsRouter = require('./routers/checkIns.router');
-const usersRouter = require('./routers/users.router');
-const questionsRouter = require('./routers/questions.router');
-const checkUserRouter = require('./routers/checkUser.router');
-const grantPermissionRouter = require('./routers/grantpermission.router');
-const projectsRouter = require('./routers/projects.router');
-const recurringEventsRouter = require('./routers/recurringEvents.router');
-const projectTeamMembersRouter = require('./routers/projectTeamMembers.router');
-//const slackRouter = require("./routers/slack.router");
-const authRouter = require('./routers/auth.router');
-const healthCheckRouter = require('./routers/healthCheck.router');
+import eventsRouter from './routers/events.router.js';
+import grantPermissionRouter from './routers/grantpermission.router.js';
+import healthCheckRouter from './routers/healthCheck.router.js';
+import projectTeamMembersRouter from './routers/projectTeamMembers.router.js';
+import projectsRouter from './routers/projects.router.js';
+import questionsRouter from './routers/questions.router.js';
+import recurringEventsRouter from './routers/recurringEvents.router.js';
+import usersRouter from './routers/users.router.js';
 
 // Check that clients to the API are sending the custom request header on all methods
 // except for ones described in the dontCheckCustomRequestHeaderApis array.
@@ -132,4 +145,4 @@ app.get('*', (req, res, next) => {
 
 app.use(errorhandler);
 
-module.exports = app;
+export default app;

backend/config/auth.config.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   JWT_SECRET: process.env.JWT_SECRET || 'placeholder_secret_key_for_development_only',
   CUSTOM_REQUEST_HEADER: process.env.CUSTOM_REQUEST_HEADER,
   // 15 minutes as a string for JWT expiration

backend/config/auth.config.test.js

@@ -1,3 +1,5 @@
+import { describe, it, expect, vi, beforeAll, beforeEach, afterAll, afterEach, test } from 'vitest';
+
 test.skip('Environment variables are working as expected', () => {
   const backendUrl = process.env.REACT_APP_PROXY;
   expect(backendUrl).toBe(`http://localhost:${process.env.BACKEND_PORT}`);

backend/config/database.config.js

@@ -1,2 +1,4 @@
-exports.PORT = process.env.BACKEND_PORT;
-exports.DATABASE_URL = process.env.DATABASE_URL;
+export default {
+  PORT: process.env.BACKEND_PORT,
+  DATABASE_URL: process.env.DATABASE_URL,
+};

backend/config/index.js

@@ -1,7 +1,7 @@
-const CONFIG_AUTH = require('./auth.config');
-const CONFIG_DB = require('./database.config');
+import CONFIG_AUTH from './auth.config.js';
+import CONFIG_DB from './database.config.js';
 
-module.exports = {
+export {
   CONFIG_AUTH,
   CONFIG_DB,
 };

backend/controllers/email.controller.js

@@ -1,5 +1,5 @@
-const nodemailer = require('nodemailer');
-const { google } = require('googleapis');
+import nodemailer from 'nodemailer';
+import { google } from 'googleapis';
 
 const { OAuth2 } = google.auth;
 
@@ -130,4 +130,4 @@ const EmailController = {
   sendLoginLink,
   sendEmail,
 };
-module.exports = EmailController;
+export default EmailController;

backend/controllers/email.controller.test.js

@@ -1,4 +1,5 @@
-const EmailController = require('./email.controller');
+import { describe, it, expect, vi, beforeAll, beforeEach, afterAll, afterEach, test } from 'vitest';
+import EmailController from './email.controller.js';
 
 test('Can import the email controller', async () => {
   expect(EmailController).not.toBeUndefined();

backend/controllers/event.controller.js

@@ -1,4 +1,4 @@
-const { Event } = require('../models');
+import { Event } from '../models/index.js';
 
 const EventController = {};
 
@@ -79,4 +79,4 @@ EventController.update = async function (req, res) {
   }
 };
 
-module.exports = EventController;
+export default EventController;

backend/controllers/event.controller.test.js

@@ -1,4 +1,5 @@
-const EventController = require('./event.controller');
+import { describe, it, expect, vi, beforeAll, beforeEach, afterAll, afterEach, test } from 'vitest';
+import EventController from './event.controller.js';
 
 test('Can import the email controller', async () => {
   expect(EventController).not.toBeUndefined();