changed newExam.date string to date datatype

Author: Dhruvrg

controller/exam.js

@@ -3,26 +3,27 @@ import {
   deleteExamById,
   examList,
   updateExamById,
-} from '#services/exam';
-import { logger } from '#util';
+} from "#services/exam";
+import { logger } from "#util";
 
 async function addExam(req, res) {
-  const { date, startTime, duration, infrastructure, supervisor, course } =
-    req.body;
+  const {
+    date, startTime, duration, infrastructure, supervisor, course,
+  } = req.body;
   try {
     const exam = await createExam(
       date,
       startTime,
       duration,
       supervisor,
       infrastructure,
-      course
+      course,
     );
     res.json({ res: `added exam ${exam.id}`, id: exam.id });
   } catch (error) {
-    logger.error('Error while inserting', error);
+    logger.error("Error while inserting", error);
     res.status(500);
-    res.json({ err: 'Error while inserting in DB' });
+    res.json({ err: "Error while inserting in DB" });
   }
 }
 
@@ -33,9 +34,9 @@ async function updateExam(req, res) {
     await updateExamById(id, data);
     res.json({ res: `updated exam with id ${id}` });
   } catch (error) {
-    logger.error('Error while updating', error);
+    logger.error("Error while updating", error);
     res.status(500);
-    res.json({ err: 'Error while updaing in DB' });
+    res.json({ err: "Error while updaing in DB" });
   }
 }
 
@@ -51,8 +52,8 @@ async function deleteExam(req, res) {
     await deleteExamById(id);
     res.json({ res: `Deleted exam with ID ${id}` });
   } catch (error) {
-    logger.error('Error while deleting', error);
-    res.status(500).json({ error: 'Error while deleting from DB' });
+    logger.error("Error while deleting", error);
+    res.status(500).json({ error: "Error while deleting from DB" });
   }
 }
 

models/exam.js

@@ -4,9 +4,21 @@ const examSchema = {
   date: { type: Date, required: true },
   startTime: { type: Date, required: true },
   duration: { type: Number, required: true },
-  supervisor: { type: connector.Schema.Types.ObjectId, ref: "Faculty", required: "true" },
-  infrastructure: { type: connector.Schema.Types.ObjectId, ref: "Infrastructure", required: "true" },
-  course: { type: connector.Schema.Types.ObjectId, ref: "Course", required: "true" },
+  supervisor: {
+    type: connector.Schema.Types.ObjectId,
+    ref: "Faculty",
+    required: "true",
+  },
+  infrastructure: {
+    type: connector.Schema.Types.ObjectId,
+    ref: "Infrastructure",
+    required: "true",
+  },
+  course: {
+    type: connector.Schema.Types.ObjectId,
+    ref: "Course",
+    required: "true",
+  },
 };
 
 const Exam = connector.model("Exam", examSchema);
@@ -23,12 +35,16 @@ async function read(filter, limit = 1) {
 }
 
 async function update(filter, updateObject, options = { multi: true }) {
-  const updateResult = await Exam.updateMany(filter, { $set: updateObject }, options);
+  const updateResult = await Exam.updateMany(
+    filter,
+    { $set: updateObject },
+    options,
+  );
   return updateResult.acknowledged;
 }
 
 async function remove(filter) {
-  const deleteResult = await Exam.deleteMany(filter).exec();
+  const deleteResult = await Exam.deleteMany(filter);
   return deleteResult.acknowledged;
 }
 

routes/exam.js

@@ -1,10 +1,10 @@
-import express from 'express';
-import examController from '#controller/exam';
+import express from "express";
+import examController from "#controller/exam";
 
 const router = express.Router();
-router.post('/add', examController.addExam);
-router.get('/list', examController.getExam);
-router.post('/update/:id', examController.updateExam);
-router.delete('/delete/:id', examController.deleteExam);
+router.post("/add", examController.addExam);
+router.get("/list", examController.getExam);
+router.post("/update/:id", examController.updateExam);
+router.delete("/delete/:id", examController.deleteExam);
 
 export default router;

services/exam.js

@@ -1,13 +1,13 @@
-import Exam from '#models/exam';
-import databaseError from '#error/database';
+import Exam from "#models/exam";
+import databaseError from "#error/database";
 
 export async function createExam(
   date,
   startTime,
   duration,
   supervisor,
   infrastructure,
-  course
+  course,
 ) {
   const newExam = await Exam.create({
     date,
@@ -17,18 +17,18 @@ export async function createExam(
     infrastructure,
     course,
   });
-  if (newExam.date === date) {
+  if (Date(newExam.date) === Date(date)) {
     return newExam;
   }
-  throw new databaseError.DataEntryError('exam');
+  throw new databaseError.DataEntryError("exam");
 }
 
 export async function updateExamById(id, data) {
   const updated = await Exam.update({ _id: id }, data);
   if (updated) {
     return updated;
   }
-  throw new databaseError.DataEntryError('exam');
+  throw new databaseError.DataEntryError("exam");
 }
 
 export async function examList(filter) {
@@ -41,5 +41,5 @@ export async function deleteExamById(examId) {
   if (deleted) {
     return deleted;
   }
-  throw new databaseError.DataDeleteError('exam');
+  throw new databaseError.DataDeleteError("exam");
 }

test/routes/exam.test.js

@@ -1,30 +1,30 @@
-import { jest } from '@jest/globals'; // eslint-disable-line import/no-extraneous-dependencies
-import request from 'supertest';
-import app from '#app';
-import connector from '#models/databaseUtil';
-import examModel from '#models/exam';
+import { jest } from "@jest/globals"; // eslint-disable-line import/no-extraneous-dependencies
+import request from "supertest";
+import app from "#app";
+import connector from "#models/databaseUtil";
+import examModel from "#models/exam";
 
-jest.mock('#util');
+jest.mock("#util");
 
 let server;
 let agent;
 
 beforeAll((done) => {
   server = app.listen(null, () => {
     agent = request.agent(server);
-    connector.set('debug', false);
+    connector.set("debug", false);
     done();
   });
 });
 
 function cleanUp(callback) {
   examModel
     .remove({
-      id: '3200594e2b7b532006c073aa',
+      supervisor: "60a0e7e9a09c3f001c834e07",
     })
     .then(() => {
       connector.disconnect((DBerr) => {
-        if (DBerr) console.log('Database disconnect error: ', DBerr);
+        if (DBerr) console.log("Database disconnect error: ", DBerr);
         server.close((serverErr) => {
           if (serverErr) console.log(serverErr);
           callback();
@@ -37,54 +37,52 @@ afterAll((done) => {
   cleanUp(done);
 });
 
-describe('exam API', () => {
-  it('should create exam', async () => {
-    const response = await agent.post('/exam/add').send({
-      date: '2023-08-20T14:10:30Z',
-      startTime: '2023-05-18T14:10:30Z',
+describe("exam API", () => {
+  it("should create exam", async () => {
+    const response = await agent.post("/exam/add").send({
+      date: "2023-06-18T14:11:30Z",
+      startTime: "2023-06-18T14:11:30Z",
       duration: 5,
-      supervisor: '4500594e2b7b532006c073cv',
-      infrastructure: '8500594e2b7b532006c073uj',
-      course: '2500594e2b7b532006c073bb',
+      supervisor: ["5f8778b54b553439ac49a03a"],
+      infrastructure: ["5f8778b54b553439ac49a03a"],
+      course: ["5f8778b54b553439ac49a03a"],
     });
-    expect(response.headers['content-type']).toMatch(/json/);
+    expect(response.headers["content-type"]).toMatch(/json/);
     expect(response.status).toBe(200);
     expect(response.body.res).toMatch(/added exam/);
   });
 
-  describe('after adding exam', () => {
+  describe("after adding exam", () => {
     let id;
     beforeEach(async () => {
-      id = await agent.post('/exam/add').send({
-        date: '2023-08-20T14:10:30Z',
-        startTime: '2023-05-18T14:10:30Z',
+      id = await agent.post("/exam/add").send({
+        date: "2023-06-18T14:11:30Z",
+        startTime: "2023-06-18T14:11:30Z",
         duration: 5,
-        supervisor: '4500594e2b7b532006c073cv',
-        infrastructure: '8500594e2b7b532006c073uj',
-        course: '2500594e2b7b532006c073bb',
+        supervisor: "64453a62c8f2146f2f34c73a",
+        infrastructure: "64453a62c8f2146f2f34c73a",
+        course: "64453a62c8f2146f2f34c73a",
       });
       id = JSON.parse(id.res.text).id;
     });
 
     afterEach(async () => {
-      await examModel.remove({
-        id: '3200594e2b7b532006c073aa',
-      });
+      await examModel.remove({ supervisor: "64453a62c8f2146f2f34c73a" });
     });
 
-    it('should read exam', async () => {
+    it("should read exam", async () => {
       const response = await agent
-        .get('/exam/list')
-        .send({ supervisor: '4500594e2b7b532006c073cv' });
+        .get("/exam/list")
+        .send({ supervisor: "64453a62c8f2146f2f34c73a" });
       expect(response.status).toBe(200);
       expect(response.body.res).toBeDefined();
     });
 
-    it('should update exam', async () => {
+    it("should update exam", async () => {
       const response = await agent
         .post(`/exam/update/${id}`)
-        .send({ duration: 5 }, { duration: 10 });
-      expect(response.headers['content-type']).toMatch(/json/);
+        .send({ duration: 10 });
+      expect(response.headers["content-type"]).toMatch(/json/);
       expect(response.status).toBe(200);
       expect(response.body.res).toMatch(/updated exam/);
     });