fixed update endpoints, fixed testcases

Author: TejasNair9977

controller/accreditation.js

@@ -10,17 +10,17 @@ async function addAccreditation(req, res) {
   try {
     // eslint-disable-next-line max-len
     const accreditation = await addNewAccreditation(name, agencyName, dateofAccreditation, dateofExpiry);
-    res.json({ res: `added accreditation ${accreditation.name}` });
+    res.json({ res: `added accreditation ${accreditation.name}`, id:accreditation.id });
   } catch (error) {
     logger.error("Error while inserting", error);
     res.status(500);
     res.json({ err: "Error while inserting in DB" });
   }
 }
 async function deleteAccreditation(req, res) {
-  const { accredationId } = req.params;
+  const { id } = req.params;
   try {
-    await deleteAccreditationById(accredationId);
+    await deleteAccreditationById(id);
     res.json({ res: "Accreditation deleted successfully" });
   } catch (error) {
     logger.error("Error while deleting", error);
@@ -30,13 +30,14 @@ async function deleteAccreditation(req, res) {
 }
 
 async function updateAccreditation(req, res) {
+  const { id } = req.params;
   const {
-    id, ...data
+    ...data
   } = req.body;
 
   try {
     await updateAccreditationById(id, data);
-    res.json({ res: "accreditation updated" });
+    res.json({ res: `${id} accreditation updated` });
   } catch (error) {
     logger.error("Error while inserting", error);
     res.status(500);

controller/assignment.js

@@ -9,7 +9,7 @@ async function addAssignment(req, res) {
   } = req.body;
   try {
     const newAssignment = await createAssignment(no, title, type, marks);
-    res.json({ res: `added user ${newAssignment.id}` });
+    res.json({ res: `added user ${newAssignment.id}`, id: newAssignment.id });
   } catch (error) {
     logger.error("Error while inserting", error);
     res.status(500);
@@ -18,8 +18,9 @@ async function addAssignment(req, res) {
 }
 
 async function updateAssignment(req, res) {
+  const { id } = req.params;
   const {
-    id, ...data
+    ...data
   } = req.body;
   try {
     await updateAssignmentById(id, data);
@@ -38,11 +39,11 @@ async function getAssignment(req, res) {
 }
 
 async function deleteAssignment(req, res) {
-  const { assignmentId } = req.params;
+  const { id } = req.params;
   try {
-    await deleteAssignmentById(assignmentId);
+    await deleteAssignmentById(id);
 
-    res.json({ res: `Deleted assignment with ID ${assignmentId}` });
+    res.json({ res: `Deleted assignment with ID ${id}` });
   } catch (error) {
     logger.error("Error while deleting", error);
     res.status(500).json({ error: "Error while deleting from DB" });

controller/coursework.js

@@ -17,7 +17,7 @@ async function addCoursework(req, res) {
     const newCoursework = await createCoursework({
       student, type, course, task, objectID, activity, marks,
     });
-    res.json({ res: `Added Coursework with ID ${newCoursework.id}` });
+    res.json({ res: `Added Coursework with ID ${newCoursework.id}`, id: newCoursework.id});
   } catch (error) {
     logger.error("Error while inserting Coursework", error);
     res.status(500);
@@ -27,8 +27,9 @@ async function addCoursework(req, res) {
 
 // Controller function to update a Coursework entity
 async function updateCoursework(req, res) {
+  const { id } = req.params;
   const {
-    id, ...data
+    ...data
   } = req.body;
   try {
     await updateCourseworkById(id, data);
@@ -49,10 +50,10 @@ async function getCoursework(req, res) {
 
 // Controller function to delete a Coursework entity
 async function deleteCoursework(req, res) {
-  const { courseworkId } = req.params;
+  const { id } = req.params;
   try {
-    await deleteCourseworkById(courseworkId);
-    res.json({ res: `Deleted Coursework with ID ${courseworkId}` });
+    await deleteCourseworkById(id);
+    res.json({ res: `Deleted Coursework with ID ${id}` });
   } catch (error) {
     logger.error("Error while deleting Coursework", error);
     res.status(500).json({ error: "Error while deleting Coursework from DB" });

controller/department.js

@@ -22,6 +22,7 @@ async function addDepartment(req, res) {
     );
     res.json({
       res: `added Department successfully ${department.name}`,
+      id: department.id,
     });
   } catch (error) {
     logger.error("Error while inserting", error);
@@ -58,8 +59,9 @@ async function showdepartments(req, res) {
 }
 
 async function updatedDepartment(req, res) {
+  const { id } = req.params;
   const {
-    id, ...data
+    ...data
   } = req.body;
   try {
     await updateDepartmentbyid(id, data);

controller/infrastructure.js

@@ -9,7 +9,7 @@ async function addInfrastructure(req, res) {
   } = req.body;
   try {
     const newInfrastructure = await createInfrastructure(name, type, wing, floor, capacity);
-    res.json({ res: `added infrastructure ${newInfrastructure.id}` });
+    res.json({ res: `added infrastructure ${newInfrastructure.id}`, id:newInfrastructure.id });
   } catch (error) {
     logger.error("Error while inserting", error);
     res.status(500);
@@ -18,8 +18,9 @@ async function addInfrastructure(req, res) {
 }
 
 async function updateInfrastructure(req, res) {
+  const { id } = req.params;
   const {
-    id, ...data
+    ...data
   } = req.body;
   try {
     await updateInfrastructureById(id, data);
@@ -38,11 +39,11 @@ async function getInfrastructure(req, res) {
 }
 
 async function deleteInfrastructure(req, res) {
-  const { infrastructureId } = req.params;
+  const { id } = req.params;
   try {
-    await deleteInfrastructureById(infrastructureId);
+    await deleteInfrastructureById(id);
 
-    res.json({ res: `Deleted infrastructure with ID ${infrastructureId}` });
+    res.json({ res: `Deleted infrastructure with ID ${id}` });
   } catch (error) {
     logger.error("Error while deleting", error);
     res.status(500).json({ error: "Error while deleting from DB" });

controller/organization.js

@@ -9,17 +9,17 @@ async function addOrganization(req, res) {
   } = req.body;
   try {
     const organization = await addNewOrganization(parent, startDate, name, accreditation);
-    res.json({ res: `added organization${organization.name}` });
+    res.json({ res: `added organization${organization.name}`, id:organization.id });
   } catch (error) {
     logger.error("Error while inserting", error);
     res.status(500);
     res.json({ err: "Error while inserting in DB" });
   }
 }
 async function deleteOrganization(req, res) {
-  const { organizationId } = req.params;
+  const { id } = req.params;
   try {
-    await deleteOrganizationById(organizationId);
+    await deleteOrganizationById(id);
     res.json({ res: "Organization deleted successfully" });
   } catch (error) {
     logger.error("Error while deleting", error);
@@ -29,8 +29,9 @@ async function deleteOrganization(req, res) {
 }
 
 async function updateOrganization(req, res) {
+  const { id } = req.params;
   const {
-    id, ...data
+    ...data
   } = req.body;
 
   try {

controller/practical.js

@@ -17,7 +17,7 @@ async function addPractical(req, res) {
     const newPractical = await createPractical({
       no, title, type, hours, cognitiveLevels,
     });
-    res.json({ res: `Added Practical with ID ${newPractical.id}` });
+    res.json({ res: `Added Practical with ID ${newPractical.id}`, id: newPractical.id });
   } catch (error) {
     logger.error("Error while inserting Practical", error);
     res.status(500);
@@ -27,8 +27,9 @@ async function addPractical(req, res) {
 
 // Controller function to update a Practical entity
 async function updatePractical(req, res) {
+  const { id } = req.params;
   const {
-    id, ...data
+    ...data
   } = req.body;
   try {
     await updatePracticalById(id, data);
@@ -49,10 +50,10 @@ async function getPractical(req, res) {
 
 // Controller function to delete a Practical entity
 async function deletePractical(req, res) {
-  const { practicalId } = req.params;
+  const { id } = req.params;
   try {
-    await deletePracticalById(practicalId);
-    res.json({ res: `Deleted Practical with ID ${practicalId}` });
+    await deletePracticalById(id);
+    res.json({ res: `Deleted Practical with ID ${id}` });
   } catch (error) {
     logger.error("Error while deleting Practical", error);
     res.status(500).json({ error: "Error while deleting Practical from DB" });

controller/student.js

@@ -17,7 +17,7 @@ async function addStudent(req, res) {
       rollNo,
       coursesOpted,
     );
-    res.json({ res: `added user ${newStudent.id}` });
+    res.json({ res: `added user ${newStudent.id}`, id: newStudent.id });
   } catch (error) {
     logger.error("Error while inserting", error);
     res.status(500);
@@ -26,8 +26,9 @@ async function addStudent(req, res) {
 }
 
 async function updateStudent(req, res) {
+  const { id } = req.params;
   const {
-    id, ...data
+    ...data
   } = req.body;
   try {
     await updateStudentById(id, data);
@@ -46,11 +47,11 @@ async function getStudent(req, res) {
 }
 
 async function deleteStudent(req, res) {
-  const { StudentId } = req.params;
+  const { id } = req.params;
   try {
-    await deleteStudentById(StudentId);
+    await deleteStudentById(id);
 
-    res.json({ res: `Deleted Student with ID ${StudentId}` });
+    res.json({ res: `Deleted Student with ID ${id}` });
   } catch (error) {
     logger.error("Error while deleting", error);
     res.status(500).json({ error: "Error while deleting from DB" });

controller/timetable.js

@@ -27,7 +27,7 @@ async function addTimetable(req, res) {
       teabreakStartTime,
       teabreakDuration,
     );
-    res.json({ res: `added timetable for: ${newTimetable.startDate} to ${newTimetable.endDate}` });
+    res.json({ res: `added timetable for: ${newTimetable.startDate} to ${newTimetable.endDate}`, id: newTimetable.id });
   } catch (error) {
     logger.error("Error while inserting", error);
     res.status(500);
@@ -36,8 +36,9 @@ async function addTimetable(req, res) {
 }
 
 async function updateTimetable(req, res) {
+  const { id } = req.params;
   const {
-    id, ...data
+    ...data
   } = req.body;
   try {
     await updateTimetableById(id, data);
@@ -56,10 +57,10 @@ async function getTimetable(req, res) {
 }
 
 async function deleteTimetable(req, res) {
-  const { timetableId } = req.params;
+  const { id } = req.params;
   try {
-    await deleteTimetableById(timetableId);
-    res.json({ res: `Deleted timetable with ID ${timetableId}` });
+    await deleteTimetableById(id);
+    res.json({ res: `Deleted timetable with ID ${id}` });
   } catch (error) {
     logger.error("Error while deleting", error);
     res.status(500).json({ error: "Error while deleting from DB" });

controller/tutorial.js

@@ -10,17 +10,17 @@ async function addTutorial(req, res) {
   try {
     // eslint-disable-next-line max-len
     const tutorial = await addNewTutorial(no, title, hours, cognitiveLevel);
-    res.json({ res: `added tutorial ${tutorial.name}` });
+    res.json({ res: `added tutorial ${tutorial.name}`, id: tutorial.id });
   } catch (error) {
     logger.error("Error while inserting", error);
     res.status(500);
     res.json({ err: "Error while inserting in DB" });
   }
 }
 async function deleteTutorial(req, res) {
-  const { tutorialId } = req.params;
+  const { id } = req.params;
   try {
-    await deleteTutorialById(tutorialId);
+    await deleteTutorialById(id);
     res.json({ res: "Tutorial deleted successfully" });
   } catch (error) {
     logger.error("Error while deleting", error);
@@ -30,8 +30,9 @@ async function deleteTutorial(req, res) {
 }
 
 async function updateTutorial(req, res) {
+  const { id } = req.params;
   const {
-    id, ...data
+    ...data
   } = req.body;
 
   try {