Merge pull request #410 from tcet-opensource/400-pagination-to-models

400 applying pagination to all models

README.md

@@ -37,9 +37,9 @@ node -e "console.log(require('crypto').randomBytes(256).toString('base64'));
 You don't need to assign values to these parameters in double or single quotes, just write directly, .env automatically converts it into quoted string.   
 
 Once you are done with this, install the packages through `npm ci` which stands for clean install.
-Also, you need to run 'setup.js' file. You can do that by running following command in your terminal
+Also you need to run the following command to check for you eslint and jest testcases:
 ```
-node setup.js
+npm run prepare
 ```
 And finally, run the server with `npm run serverstart` or `npm run serverstartWin` depending on your operating system.
 

controller/accreditation.js

@@ -1,16 +1,25 @@
 import {
-  addNewAccreditation, deleteAccreditationById, updateAccreditationById, getAccreditations,
+  addNewAccreditation,
+  deleteAccreditationById,
+  updateAccreditationById,
+  getAccreditations,
 } from "#services/accreditation";
 import { logger } from "#util";
 
 async function addAccreditation(req, res) {
-  const {
-    name, agencyName, dateofAccreditation, dateofExpiry,
-  } = req.body;
+  const { name, agencyName, dateofAccreditation, dateofExpiry } = req.body;
   try {
     // eslint-disable-next-line max-len
-    const accreditation = await addNewAccreditation(name, agencyName, dateofAccreditation, dateofExpiry);
-    res.json({ res: `added accreditation ${accreditation.name}`, id: accreditation.id });
+    const accreditation = await addNewAccreditation(
+      name,
+      agencyName,
+      dateofAccreditation,
+      dateofExpiry,
+    );
+    res.json({
+      res: `added accreditation ${accreditation.name}`,
+      id: accreditation.id,
+    });
   } catch (error) {
     logger.error("Error while inserting", error);
     res.status(500);
@@ -31,9 +40,7 @@ async function deleteAccreditation(req, res) {
 
 async function updateAccreditation(req, res) {
   const { id } = req.params;
-  const {
-    ...data
-  } = req.body;
+  const { ...data } = req.body;
 
   try {
     await updateAccreditationById(id, data);
@@ -47,7 +54,9 @@ async function updateAccreditation(req, res) {
 
 async function showAccreditation(req, res) {
   try {
-    const accreditation = await getAccreditations(req.query);
+    const filter = req.body;
+    const { limit, page } = req.query;
+    const accreditation = await getAccreditations(filter, limit, page);
     return res.json({ res: accreditation });
   } catch (error) {
     logger.error("Error while fetching", error);
@@ -57,5 +66,8 @@ async function showAccreditation(req, res) {
 }
 
 export default {
-  addAccreditation, updateAccreditation, deleteAccreditation, showAccreditation,
+  addAccreditation,
+  updateAccreditation,
+  deleteAccreditation,
+  showAccreditation,
 };

controller/activity.js

@@ -1,64 +1,86 @@
 import {
-    createActivity,deleteActivityById, activityList ,updateActivityById,
-}from "#services/activity";
-import {logger} from "#util" ;
+  createActivity,
+  deleteActivityById,
+  activityList,
+  updateActivityById,
+} from "#services/activity";
+import { logger } from "#util";
 
-async function addActivity(req,res) {
-    const{
-        activityBlueprint,
-        startTime,
-        duration,
-        course,
-        faculty,
-        type,
-        task,
-        group,
-        students,
-    }=req.body;
-    try{
-        const newActivity = await createActivity(activityBlueprint,startTime,duration,course,faculty,type,task,group,students);
-        res.json ({res: `added activity ${newActivity.id}`, id: newActivity.id});
-    } catch (error){
-        logger.error ("Error while inserting",error);
-        res.status(500);
-        res.json({err:"Error while inserting in DB"});
-    }
+async function addActivity(req, res) {
+  const {
+    activityBlueprint,
+    startTime,
+    duration,
+    course,
+    faculty,
+    type,
+    task,
+    group,
+    students,
+  } = req.body;
+  try {
+    const newActivity = await createActivity(
+      activityBlueprint,
+      startTime,
+      duration,
+      course,
+      faculty,
+      type,
+      task,
+      group,
+      students,
+    );
+    return res.json({
+      res: `added activity ${newActivity.id}`,
+      id: newActivity.id,
+    });
+  } catch (error) {
+    logger.error("Error while inserting", error);
+    res.status(500);
+    return res.json({ err: "Error while inserting in DB" });
+  }
 }
 
-async function updateActivity(req,res){
-    const { id }=req.params;
-    const {
-        ...data  
-    }=req.body;
-    try {
-         await updateActivityById(id,data);
-        res.json({res:`updated activity with id ${id}`});
-    }catch (error){
-        logger.error("Error while updating",error);
-        res.status(500);
-        res.json({err:"Error while updating in DB"});
-    }
+async function updateActivity(req, res) {
+  const { id } = req.params;
+  const { ...data } = req.body;
+  try {
+    await updateActivityById(id, data);
+    return res.json({ res: `updated activity with id ${id}` });
+  } catch (error) {
+    logger.error("Error while updating", error);
+    res.status(500);
+    return res.json({ err: "Error while updating in DB" });
+  }
 }
 
-async function getActivity(req,res){
-    const filter = req.query;
-    const activitylist =await activityList(filter);
-    res.json({res:activitylist});
+async function getActivity(req, res) {
+  try {
+    const filter = req.body;
+    const { limit, page } = req.query;
+    const activitylist = await activityList(filter, limit, page);
+    return res.json({ res: activitylist });
+  } catch (error) {
+    logger.error("Error while fetching", error);
+    res.status(500);
+    return res.json({ err: "Error while fetching the data" });
+  }
 }
 
-
-async function deleteActivity(res,req){
-    const { id }=req.params;
-    try{
-        await deleteActivityById(id);
-
-        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"});
-    }
+async function deleteActivity(res, req) {
+  const { id } = req.params;
+  try {
+    await deleteActivityById(id);
+    return res.json({ res: `Deleted activity with ID ${id}` });
+  } catch (error) {
+    logger.error("Error while deleting", error);
+    return res.status(500).json({ error: "Error while deleting from DB" });
+  }
 }
 
 export default {
-    addActivity, deleteActivity ,getActivity ,updateActivity,
-};
+  addActivity,
+  deleteActivity,
+  getActivity,
+  updateActivity,
+};

controller/assignment.js

@@ -1,15 +1,19 @@
 import {
-  createAssignment, deleteAssignmentById, assignmentList, updateAssignmentById,
+  createAssignment,
+  deleteAssignmentById,
+  assignmentList,
+  updateAssignmentById,
 } from "#services/assignment";
 import { logger } from "#util";
 
 async function addAssignment(req, res) {
-  const {
-    no, title, type, marks,
-  } = req.body;
+  const { no, title, type, marks } = req.body;
   try {
     const newAssignment = await createAssignment(no, title, type, marks);
-    res.json({ res: `added assignment ${newAssignment.id}`, id: newAssignment.id });
+    res.json({
+      res: `added assignment ${newAssignment.id}`,
+      id: newAssignment.id,
+    });
   } catch (error) {
     logger.error("Error while inserting", error);
     res.status(500);
@@ -19,9 +23,7 @@ async function addAssignment(req, res) {
 
 async function updateAssignment(req, res) {
   const { id } = req.params;
-  const {
-    ...data
-  } = req.body;
+  const { ...data } = req.body;
   try {
     await updateAssignmentById(id, data);
     res.json({ res: `updated assignment ${id}` });
@@ -33,22 +35,31 @@ async function updateAssignment(req, res) {
 }
 
 async function getAssignment(req, res) {
-  const filter = req.query;
-  const assingmentlist = await assignmentList(filter);
-  res.json({ res: assingmentlist });
+  try {
+    const filter = req.body;
+    const { limit, page } = req.query;
+    const assingmentlist = await assignmentList(filter, limit, page);
+    return res.json({ res: assingmentlist });
+  } catch (error) {
+    logger.error("Error while fetching", error);
+    res.status(500);
+    return res.json({ err: "Error while fetching the data" });
+  }
 }
 
 async function deleteAssignment(req, res) {
   const { id } = req.params;
   try {
     await deleteAssignmentById(id);
-
-    res.json({ res: `Deleted assignment with ID ${id}` });
+    return 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" });
+    return res.status(500).json({ error: "Error while deleting from DB" });
   }
 }
 export default {
-  addAssignment, deleteAssignment, getAssignment, updateAssignment,
+  addAssignment,
+  deleteAssignment,
+  getAssignment,
+  updateAssignment,
 };