fixed problem with activity endpoint

Author: TejasNair9977

app.js

@@ -17,6 +17,7 @@ import tutorialRouter from "#routes/tutorial";
 import assignmentRouter from "#routes/assignment";
 import timetableRouter from "#routes/timetable";
 import courseworkRouter from "#routes/coursework";
+import activityRouter from "#routes/activity";
 import moduleRouter from "#routes/module";
 import { identifyUser } from "#middleware/identifyUser";
 import departmentRouter from "#routes/department";
@@ -46,6 +47,7 @@ app.use("/department", departmentRouter);
 app.use("/practical", practicalRouter);
 app.use("/organization", organizationRouter);
 app.use("/student", studentRouter);
+app.use("/activity", activityRouter);
 app.use("/tutorial", tutorialRouter);
 app.use("/assignment", assignmentRouter);
 app.use("/timetable", timetableRouter);

controller/activity.js

@@ -1,11 +1,11 @@
 import {
     createActivity,deleteActivityById, activityList ,updateActivityById,
 }from "#services/activity";
-import { assignmentList } from "#services/assignment";
-import {logger} from "util" ;
+import {logger} from "#util" ;
 
-async function addActivity(res,req) {
+async function addActivity(req,res) {
     const{
+        activityBlueprint,
         startTime,
         duration,
         course,
@@ -17,7 +17,7 @@ async function addActivity(res,req) {
     }=req.body;
     try{
         const newActivity = await createActivity(activityBlueprint,startTime,duration,course,faculty,type,task,group,students);
-        res.json ({res: `added user ${newActivity.id}`});
+        res.json ({res: `added activity ${newActivity.id}`, id: newActivity.id});
     } catch (error){
         logger.error ("Error while inserting",error);
         res.status(500);
@@ -26,8 +26,9 @@ async function addActivity(res,req) {
 }
 
 async function updateActivity(req,res){
+    const { id }=req.params;
     const {
-        id, ...data  
+        ...data  
     }=req.body;
     try {
          await updateActivityById(id,data);
@@ -47,11 +48,11 @@ async function getActivity(req,res){
 
 
 async function deleteActivity(res,req){
-    const { activityId }=req.params;
+    const { id }=req.params;
     try{
-        await deleteActivityById(activityId);
+        await deleteActivityById(id);
 
-        res.json({res:`Deleted activity with ID ${activityId}`});
+        res.json({res:`Deleted activity with ID ${id}`});
     }catch(error){
         logger.error ("Error while deleting",error);
         res.status(500).json({error:"Error while deleting from DB"});

models/activity.js

@@ -27,18 +27,18 @@ const Activity = connector.model("Activity", activitySchema);
 //add a activity to the database
 async function create(activityData){
   const {
-    startTime,duration,course,faculty,type,task,group,students,
+    activityBlueprint, startTime,duration,course,faculty,type,task,group,students,
   }=activityData;
   const activity= new Activity({
-    startTime,duration,course,faculty,type,task,group,students,
+    activityBlueprint, startTime,duration,course,faculty,type,task,group,students,
   });
   const activityDoc =await activity.save();
   return activityDoc;
 }
 
 //Retrieve activity based on a given  filter and limit
 async function read(filter,limit=1){
-  const activity = await Activity.find (filter).limit(limit);
+  const activityDoc = await Activity.find (filter).limit(limit);
   return activityDoc ; 
 }
 

routes/activity.js

@@ -2,9 +2,9 @@ import express from "express";
 import activityController from "#controller/activity";
 
 const router=express.Router();
-router.post ("/add",activityController.addActivity);
+router.post("/add",activityController.addActivity);
 router.get("/list",activityController.getActivity);
-router.post("/update",activityController.updateActivity);
-router.post("/delete",activityController.deleteActivity);
+router.post("/update/:id",activityController.updateActivity);
+router.delete("/delete/:id",activityController.deleteActivity);
 
 export default router;

services/activity.js

@@ -1,11 +1,11 @@
 import Activity from "#models/activity" ;
 import databaseError from "#error/database";
 
-export async function createActivity (startTime,duration,course,faculty,type,task,group,students){
+export async function createActivity (activityBlueprint,startTime,duration,course,faculty,type,task,group,students){
     const newActivity = await Activity.create({
-        startTime,duration,course,faculty,task,type,group,students,
+        activityBlueprint,startTime,duration,course,faculty,task,type,group,students,
     });
-    if (newActivity.title===title){
+    if (newActivity){
         return newActivity;
     }
     throw new databaseError.DataEntryError("actvity");
@@ -24,7 +24,7 @@ export async function activityList(filter){
     return activitylist;
 }
 
-export async function deleteActivityById(activityId){
+export async function deleteActivityById(id){
     const deleted = await Activity.remove({_id:id},data);
     if(deleted){
         return deleted;

test/routes/activity.test.js

@@ -1,4 +1,4 @@
-import {jest} from "@jest/globals" ; //eslint-disable-line-import/no-extraneous-dependencies
+import { jest } from "@jest/globals"; //eslint-disable-line-import/no-extraneous-dependencies
 import request from "supertest";
 import app from "#app";//Update this import based on your app's 
 import connector from "#models/databaseUtil"; //Update this import
@@ -10,108 +10,108 @@ let server;
 let agent;
 
 beforeAll((done) => {
-    server = app.listen(null,() => {
-        agent = request.agent(server);
-        connector.set("debug",false);
-        done();
-    });
+  server = app.listen(null, () => {
+    agent = request.agent(server);
+    connector.set("debug", false);
+    done();
+  });
 });
 
-function cleanUp(callback){
-    activityModel
+function cleanUp(callback) {
+  activityModel
     .remove({
-        startTime:"11:45 AM",
-        duration:2,
-        course:  "64fc3c8bde9fa947ea1f412f",
-        faculty: "64fc3c8bde9fa947ea1f412f",
-        type:"LECTURE",
-        task:"Practical",
-        group: "64fc3c8bde9fa947ea1f412f",
-        students:"xyz",
+      startTime: "2023-06-18T14:11:30Z",
+      duration: 2,
+      course: "64fc3c8bde9fa947ea1f412f",
+      faculty: "64fc3c8bde9fa947ea1f412f",
+      type: "LECTURE",
+      task: ["64fc3c8bde9fa947ea1f412f"],
+      group: "64fc3c8bde9fa947ea1f412f",
+      students: ["64fc3c8bde9fa947ea1f412f"]
     })
-    .then(()=>{
-        connector.disconnect ((DBerr)=>{
-            if (DBerr) console.log("Database disconnect error : ",DBerr);
-            server.close((serverErr)=> {
-                if (serverErr) console.log(serverErr);
-                callback();
-            });
+    .then(() => {
+      connector.disconnect((DBerr) => {
+        if (DBerr) console.log("Database disconnect error : ", DBerr);
+        server.close((serverErr) => {
+          if (serverErr) console.log(serverErr);
+          callback();
         });
+      });
     });
 }
 
 
-    afterAll((done) => {
-        cleanUp(done);
-    });
-
-    describe("Activity API", () => {
-        it("should create activity",async () => {
-            const response = await agent.post ("/activity/add").send({
-        startTime:"11:45 AM",
-        duration:2,
-        course:  "64fc3c8bde9fa947ea1f412f",
-        faculty: "64fc3c8bde9fa947ea1f412f",
-        type:"LECTURE",
-        task:"Practical",
-        group: "64fc3c8bde9fa947ea1f412f",
-        students:"xyz",
-            });
+afterAll((done) => {
+  cleanUp(done);
+});
 
-            expect(response.status).toBe(200);
-            expect(response.body.res).toMatch(/added activity/);
-        });
+describe("Activity API", () => {
+  it("should create activity", async () => {
+    const response = await agent.post("/activity/add").send({
+      activityBlueprint: "5f8778b54b553439ac49a03a",
+      startTime: "2023-06-18T14:11:30Z",
+      duration: 2,
+      course: "5f8778b54b553439ac49a03a",
+      faculty: "5f8778b54b553439ac49a03a",
+      type: "LECTURE",
+      task: ["5f8778b54b553439ac49a03a"],
+      group: "5f8778b54b553439ac49a03a",
+      students: ["5f8778b54b553439ac49a03a"]
+    });
+    
+    expect(response.status).toBe(200);
+    expect(response.body.res).toMatch(/added activity/);
+  });
 
-        describe("after adding activity",()=>{
-            beforeEach(async () => {
-                await agent.post("/activity/add").send({
-        startTime:"11:45 AM",
-        duration:2,
-        course:  "64fc3c8bde9fa947ea1f412f",
+  describe("after adding activity", () => {
+    let id;
+    beforeEach(async () => {
+      id = await agent.post("/activity/add").send({
+        activityBlueprint: "64fc3c8bde9fa947ea1f412f",
+        startTime: "2023-06-18T14:11:30Z",
+        duration: 2,
+        course: "64fc3c8bde9fa947ea1f412f",
         faculty: "64fc3c8bde9fa947ea1f412f",
-        type:"LECTURE",
-        task:"Practical",
+        type: "LECTURE",
+        task: ["64fc3c8bde9fa947ea1f412f"],
         group: "64fc3c8bde9fa947ea1f412f",
-        students:"xyz",
-                });
-            });
+        students: ["64fc3c8bde9fa947ea1f412f"]
+      });
+      id = JSON.parse(id.res.text).id;
+    });
 
-            afterEach(async () => {
-                await activityModel.remove({
-        startTime:"11:45 AM",
-        duration:2,
-        course:  "64fc3c8bde9fa947ea1f412f",
+    afterEach(async () => {
+      await activityModel.remove({
+        activityBlueprint: "64fc3c8bde9fa947ea1f412f",
+        startTime: "2023-06-18T14:11:30Z",
+        duration: 2,
+        course: "64fc3c8bde9fa947ea1f412f",
         faculty: "64fc3c8bde9fa947ea1f412f",
-        type:"LECTURE",
-        task:"Practical",
+        type: "LECTURE",
+        task: ["64fc3c8bde9fa947ea1f412f"],
         group: "64fc3c8bde9fa947ea1f412f",
-        students:"xyz",
-                });
-            });
-
-            it("should read activity", async () => {
-                const response = await agent 
-                .post("/activity/list")
-                .send({startTime:"11:45 AM"});
-                expect(response.status).toBe(200);
-                expect(response.body.res).toBeDefined();
-            });
+        students: ["64fc3c8bde9fa947ea1f412f"]
+      });
+    });
 
-            it("should update activity",async () => {
-                const response =await agent 
-                .post("/activity/update")
-                .send({
-                startTime:"11:45 AM",
-                duration:2,
-                course:  "64fc3c8bde9fa947ea1f412f",
-                faculty: "64fc3c8bde9fa947ea1f412f",
-                type:"LECTURE",
-                task:"Practical",
-                group: "64fc3c8bde9fa947ea1f412f",
-                students:"xyz",});
+    it("should read activity", async () => {
+      const response = await agent
+        .get("/activity/list")
+        .send({ startTime: "2023-06-18T14:11:30Z" });
+      expect(response.status).toBe(200);
+      expect(response.body.res).toBeDefined();
+    });
 
-                expect (response.status).toBe(200);
-                expect(response.body.res).toMatch(/updated activity/);
-            });
+    it("should update activity", async () => {
+      console.log(id)
+      const response = await agent
+        .post(`/activity/update/${id}`)
+        .send({
+          duration: 5,
         });
+
+      expect(response.status).toBe(200);
+      expect(response.body.res).toMatch(/updated activity/);
     });
+  });
+});