Merge branch 'devDocker_v2' of https://github.com/HEET-Group/Chronos into devDocker_v2

Author: HaoyL666

__backend-tests__/jest.config.js

@@ -1,18 +1,5 @@
 module.exports = {
-  //   testEnvironment: 'node', // Use the Node.js environment for testing
-  //   roots: ['<rootDir>/controllers'], // Set the root directory for test files
 
-  //   testRegex: '(/tests/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$',
-
-  //   // Code coverage settings
-  //   collectCoverage: true,
-  //   coverageDirectory: 'coverage',
-
-  //   // Specify the test path patterns to ignore frontend tests
-  //   testPathIgnorePatterns: ['/node_modules/', '/__tests__/'],
-  // };
-
-  // =======
   roots: ['<rootDir>'], // Set the root directory for test files (adjust this path to your test folder)
 
   testRegex: '(/tests/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$',

__backend-tests__/mockdbsetup.js

@@ -2,14 +2,20 @@ const mongoose = require("mongoose");
 const { MongoMemoryServer } = require("mongodb-memory-server");
 
 let mongo = null;
+let uri;
 
 const connectDB = async () => {
   mongo = await MongoMemoryServer.create();
-  const uri = mongo.getUri();
+  uri = await mongo.getUri();
 
   await mongoose.connect(uri, {
     useNewUrlParser: true,
     useUnifiedTopology: true,
+  }).then((result) => {
+    console.log(result.connection.readyState)
+    console.log(result.connection.host)
+  }).catch((err) => {
+    console.log('Unable to connect to MongoMemoryServer')
   });
 };
 
@@ -31,4 +37,4 @@ const dropCollections = async () => {
   };
 
 
-module.exports = { connectDB, dropDB, dropCollections}
+module.exports = { connectDB, dropDB, dropCollections, uri }

__backend-tests__/mongo.test.js

@@ -5,29 +5,13 @@ const mongoose = require('mongoose');
 const mongo = require('../chronos_npm_package/controllers/mongo');
 const ServicesModel = require('../chronos_npm_package/models/ServicesModel');
 const CommunicationModel = require('../chronos_npm_package/models/CommunicationModel');
-const { connectDB, dropDB, dropCollections } = require('./mockdbsetup');
+const { connectDB, dropDB, dropCollections, uri } = require('./mockdbsetup');
 const alert = require('../chronos_npm_package/controllers/alert');
-const ContainerInfoFunc = require('../chronos_npm_package/models/ContainerInfo');
 const dockerHelper = require('../chronos_npm_package/controllers/dockerHelper');
 
-require('dotenv').config();
-
-const db = 'mongodb+srv://Ok:Ok@cluster0.axo7iyw.mongodb.net/?retryWrites=true&w=majority';
-
-beforeAll(async () => {
-  await connectDB();
-});
-
-afterAll(async () => {
-  await dropDB();
-});
-
 jest.spyOn(console, 'log').mockImplementation(() => {});
-
 jest.mock('../chronos_npm_package/controllers/alert');
-
 jest.useFakeTimers();
-
 jest.spyOn(global, 'setInterval');
 
 jest.mock('../chronos_npm_package/controllers/healthHelpers', () => {
@@ -56,34 +40,25 @@ jest.mock('../chronos_npm_package/controllers/mongo', () => ({
 const HealthModel = {
   insertMany: jest.fn(() => Promise.resolve()),
 };
+const HealthModelFunc = jest.fn(() => HealthModel);
 
 jest.mock('../chronos_npm_package/controllers/dockerHelper', () => ({
   ...jest.requireActual('../chronos_npm_package/controllers/dockerHelper'),
   getDockerContainer: jest.fn(),
   readDockerContainer: jest.fn(),
 }));
 
-// jest.mock('../../chronos_npm_package/models/ContainerInfo', () => {
-//     const mockContainerInfoInstance = {
-//       create: jest.fn(),
-//     };
-//     return jest.fn(() => mockContainerInfoInstance);
-// });
-
-const HealthModelFunc = jest.fn(() => HealthModel);
-
 describe('mongo.connect', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
   test('should connect to MongoDB database', async () => {
-    await mongo.connect({ database: { URI: db } });
+    await mongo.connect({ database: { URI: uri } });
 
-    expect(mongoose.connect).toHaveBeenCalledWith(db);
-    // expect(console.log).toHaveBeenCalledWith(
-    //   expect.stringContaining('MongoDB database connected at')
-    // );
+    expect(console.log).toHaveBeenCalledWith(
+      expect.stringContaining('MongoDB database connected at')
+    );
   });
 
   test('should handle connection errors', async () => {
@@ -98,12 +73,14 @@ describe('mongo.connect', () => {
 });
 
 describe('mongo.services', () => {
-  beforeEach(() => {
+  beforeEach(async () => {
     jest.clearAllMocks();
+    await connectDB();
   });
 
   afterEach(async () => {
     await dropCollections();
+    await dropDB();
   });
 
   test('should create a new document', async () => {
@@ -114,12 +91,14 @@ describe('mongo.services', () => {
 });
 
 describe('mongo.communications', () => {
-  beforeEach(() => {
+  beforeEach(async () => {
     jest.clearAllMocks();
+    await connectDB();
   });
 
   afterEach(async () => {
     await dropCollections();
+    await dropDB();
   });
 
   test('should record request cycle and save communication to the database', async () => {
@@ -137,7 +116,7 @@ describe('mongo.communications', () => {
     const middleware = mongo.communications({ microservice: 'test3', slack: null, email: null });
     await middleware(req, res, () => {});
     const savedCommunication = await CommunicationModel.findOne({ microservice: 'test3' });
-    expect(savedCommunication).toBeDefined(); // The document should be defined if it exists
+    expect(savedCommunication).toBeDefined();
   });
 
   test('should send an alert', async () => {
@@ -166,13 +145,16 @@ describe('mongo.communications', () => {
 });
 
 describe('mongo.health', () => {
-  beforeEach(() => {
+  beforeEach(async () => {
     jest.clearAllMocks();
     jest.useFakeTimers();
+    await connectDB();
   });
 
-  afterEach(() => {
+  afterEach(async () => {
     jest.clearAllTimers();
+    await dropCollections();
+    await dropDB();
   });
 
   test('should collect data after the set interval', async () => {
@@ -209,11 +191,12 @@ describe('mongo.docker', () => {
   beforeEach(async () => {
     jest.clearAllMocks();
     jest.useFakeTimers();
+    await connectDB();
   });
 
   afterEach(async () => {
     await dropCollections();
-    jest.clearAllTimers();
+    await dropDB();
   });
 
   test('should collect docker container information', async () => {
@@ -244,6 +227,5 @@ describe('mongo.docker', () => {
     expect(dockerHelper.getDockerContainer).toHaveBeenCalledWith(microservice);
     jest.advanceTimersByTime(1000);
     expect(dockerHelper.readDockerContainer).toHaveBeenCalledWith(mockContainerData);
-    //expect(mockContainerInfoInstance.create).toHaveBeenCalledWith(mockReadDockerContainerData);
   });
 });

app/charts/DockerChart.tsx

@@ -14,7 +14,7 @@ type TimeFrame = '5m' | '15m' | '30m' | '1h' | '2h' | '1d' | '2d';
 
 /** 
  * @params {EventChartProps} props - the props object containing relevant data.
- * @desc Handles k8s metrics. Memoized component to generate event chart with formatted data 
+ * @desc Handles k8s and container metrics. Memoized component to generate event chart with formatted data 
  * @returns {JSX.Element} The JSX element with the event chart.
  */
 const GrafanaEventChart: React.FC<EventChartProps> = React.memo(props => {

app/charts/GrafanaEventChart.tsx

@@ -1,9 +1,3 @@
-/** From Version 5.2 Team:
- * This file does not seem to be showing any data.
- * Hope a future team figures it out.
- * Best of luck!
- */
-
 import { makeStyles } from '@material-ui/core/styles';
 import React, { useContext } from 'react';
 import Graph from 'react-graph-vis';
@@ -154,12 +148,6 @@ const RouteChart = React.memo(() => {
     },
   };
 
-  // const events = {
-  //   select(event) {
-  //     const { nodes, edges } = event;
-  //   },
-  // };
-
   if (communicationsData.length > 0 && communicationsData[0].endpoint !== '/') {
     return (
       <div className="traceContainer">
@@ -168,7 +156,6 @@ const RouteChart = React.memo(() => {
           className={classes.paper}
           graph={graph}
           options={options}
-          // events={events}
           style={{
             fontFamily: 'Roboto',
             boxShadow: '3px 3px 6px 1px rgb(175, 175, 175)',

app/charts/RouteChart.jsx

@@ -14,7 +14,7 @@ const About: React.FC = React.memo(() => {
    * Feel free to change the header for the list of names.
    * 
    */
-  const nameArray: JSX.Element[] = ['Haoyu', 'Edwin', 'Tyler', 'Eisha'].map(name => {
+  const nameArray: JSX.Element[] = ['Haoyu', 'Eisha', 'Edwin', 'Tyler'].map(name => {
     return (
       <span style={currentMode} className="text">
         <p>{`${name}`}</p>
@@ -49,7 +49,7 @@ const About: React.FC = React.memo(() => {
         <p style={currentMode} className="text">
           Snow, Taylor, Tim, Roberto, Nachiket, Tiffany, Bruno, Danny, Vince, Matt, Derek, Kit,
           Grace, Jen, Patty, Stella, Michael, Ronelle, Todd, Greg, Brianna, Brian, Alon, Alan,
-          Ousman, Ben, Chris, Jenae, Tim, Kirk, Jess, William, Alexander, Elisa, Josh, Troy, Gahl,
+          Ousman, Ben, Chris, Jenae, Tim, Kirk, Jess, William, Alexander, Elisa, Josh, Troy, Gahl, 
           Brisa, Kelsi, Lucie, Jeffrey, Justin
         </p>
         <br />

app/components/About.tsx

@@ -1,7 +1,6 @@
  /** From Version 5.2 Team:
  * We only fixed linting issues regarding Notifications.
  * Otherwise, Notifications still does not function properly.
- * Good luck!
  */
 
 /* eslint-disable jsx-a11y/label-has-associated-control */