add: pagination and fetch contributions on date intervals

sandeshkhadka · Apr 19, 2024 · 1c9debf · 1c9debf
1 parent 5e9057b
commit 1c9debf
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 6 deletions.
diff --git a/src/handlers/contribution.ts b/src/handlers/contribution.ts
@@ -1,12 +1,12 @@
 import { NextFunction, Request, Response } from "express";
 import prisma from "../db.js";
 import CustomError from "../modules/errors.js";
-
 export async function approveContribution(
   req: Request,
   res: Response,
   next: NextFunction,
 ) {
+  // const userId = req.user!.id;
   const username: string = req.user!.username;
   const contributionId: string = req.params.id;
 
@@ -90,11 +90,15 @@ export async function getContributions(
   res: Response,
   next: NextFunction,
 ) {
+  const page = req.body.page;
+  const offset = (parseInt(page) - 1) * PAGE_SIZE;
   try {
     const contributions = await prisma.contribution.findMany({
       orderBy: {
         createdAt: "desc",
       },
+      skip: offset,
+      take: PAGE_SIZE,
     });
 
     res.status(200);
@@ -129,7 +133,38 @@ export async function getContributionById(
     }
   }
 }
+export async function getContributionByDate(
+  req: Request,
+  res: Response,
+  next: NextFunction,
+) {
+  const startDate = new Date(req.body.startDate).toISOString();
+  const endDate = new Date(req.body.endDate).toISOString();
+  try {
+    const contributions = await prisma.contribution.findMany({
+      where: {
+        createdAt: {
+          gte: startDate,
+          lte: endDate,
+        },
+      },
+    });
 
+    res.status(200);
+    res.json({ contributions });
+  } catch (err) {
+    if (err instanceof CustomError) {
+      next(err);
+    } else {
+      next(
+        new CustomError(
+          `Could not get contribution with within ${startDate} and ${endDate}`,
+          500,
+        ),
+      );
+    }
+  }
+}
 export async function updateContibutions(
   req: Request,
   res: Response,

diff --git a/src/handlers/task.ts b/src/handlers/task.ts
@@ -41,8 +41,13 @@ export async function getTasks(
   res: Response,
   next: NextFunction,
 ) {
+  const page = req.body.page;
+  const offset = (parseInt(page) - 1) * PAGE_SIZE;
   try {
-    const tasks = await prisma.routineTask.findMany();
+    const tasks = await prisma.routineTask.findMany({
+      take: PAGE_SIZE,
+      skip: offset,
+    });
 
     res.status(200);
     res.json({ tasks });

diff --git a/src/index.d.ts b/src/index.d.ts
@@ -1,5 +1,6 @@
 import { User } from "./modules/auth.ts";
 declare global {
+  const PAGE_SIZE = 10;
   namespace Express {
     export interface Request {
       user?: User;

diff --git a/src/router.ts b/src/router.ts
@@ -12,6 +12,7 @@ import {
   approveContribution,
   createContribution,
   deleteContribuion,
+  getContributionByDate,
   getContributionById,
   getContributions,
   updateContibutions,
@@ -39,8 +40,13 @@ const ContributionTypes = [
 ];
 const router = Router();
 router.use(errHandler);
-router.get("/task", getTasks);
-router.get("/contribution", getContributions);
+router.post(
+  "/task",
+  body("page").exists().notEmpty().isNumeric(),
+  assertAllFieldsPresent,
+  getTasks,
+);
+
 router.get("/users", getAllUsers);
 router.get("/rehydrate", rehydrate);
 router.get("/task/:id", getTaskById);
@@ -49,16 +55,28 @@ router.get("/dashboard/contribution/distribution", getContributionDistribution);
 router.get("/dashboard/task/pending", getPendingTasks);
 
 router.get("/profile_picture/id/:id", getProfilePicture);
+router.post(
+  "/bydate/contributions",
+  body("startDate").exists().notEmpty().isDate(),
+  body("endDate").exists().notEmpty().isDate(),
+  getContributionByDate,
+);
 
 router.post(
-  "/task",
+  "/create/task",
   body("name").exists().notEmpty(),
   body("assignToId").exists().notEmpty(),
   assertAllFieldsPresent,
   createTask,
 );
 router.post(
-  "/contribution",
+  "/contributions",
+  body("page").exists().notEmpty().isNumeric(),
+  assertAllFieldsPresent,
+  getContributions,
+);
+router.post(
+  "/create/contribution",
   body(["name", "type", "amount"]).exists(),
   body("type").isIn(ContributionTypes),
   body("amount").isNumeric(),