Merge branch 'main' into haiderr510-patch-2

Author: francisli

src/backend/routers/case_manager.test.ts

@@ -61,10 +61,10 @@ test("getMyStudentsAndIepInfo - student does not have IEP", async (t) => {
     .executeTakeFirstOrThrow();
 
   const myStudents = await trpc.case_manager.getMyStudentsAndIepInfo.query();
-  t.is(myStudents.length, 1);
-  t.is(myStudents[0].student_id, student.student_id);
-  t.is(myStudents[0].iep_id, null);
-  t.is(myStudents[0].end_date, null);
+  t.is(myStudents.records.length, 1);
+  t.is(myStudents.records[0].student_id, student.student_id);
+  t.is(myStudents.records[0].iep_id, null);
+  t.is(myStudents.records[0].end_date, null);
 });
 
 test("getMyStudentsAndIepInfo - student has IEP", async (t) => {
@@ -81,8 +81,8 @@ test("getMyStudentsAndIepInfo - student has IEP", async (t) => {
 
   const myStudentsBefore =
     await trpc.case_manager.getMyStudentsAndIepInfo.query();
-  t.is(myStudentsBefore[0].iep_id, null);
-  t.is(myStudentsBefore[0].end_date, null);
+  t.is(myStudentsBefore.records[0].iep_id, null);
+  t.is(myStudentsBefore.records[0].end_date, null);
 
   const iep = await trpc.student.addIep.mutate({
     student_id: seed.student.student_id,
@@ -92,8 +92,8 @@ test("getMyStudentsAndIepInfo - student has IEP", async (t) => {
 
   const myStudentsAfter =
     await trpc.case_manager.getMyStudentsAndIepInfo.query();
-  t.is(myStudentsAfter[0].iep_id, iep.iep_id);
-  t.deepEqual(myStudentsAfter[0].end_date, iep.end_date);
+  t.is(myStudentsAfter.records[0].iep_id, iep.iep_id);
+  t.deepEqual(myStudentsAfter.records[0].end_date, iep.end_date);
 });
 
 test("getMyStudentsAndIepInfo - paras do not have access", async (t) => {
@@ -375,7 +375,7 @@ test("getMyParas", async (t) => {
   });
 
   let myParas = await trpc.case_manager.getMyParas.query();
-  t.is(myParas.length, 0);
+  t.is(myParas.records.length, 0);
 
   await db
     .insertInto("paras_assigned_to_case_manager")
@@ -386,7 +386,7 @@ test("getMyParas", async (t) => {
     .execute();
 
   myParas = await trpc.case_manager.getMyParas.query();
-  t.is(myParas.length, 1);
+  t.is(myParas.records.length, 1);
 });
 
 test("getMyParas - paras do not have access", async (t) => {
@@ -409,7 +409,7 @@ test("addStaff", async (t) => {
   });
 
   const parasBeforeAdd = await trpc.case_manager.getMyParas.query();
-  t.is(parasBeforeAdd.length, 0);
+  t.is(parasBeforeAdd.records.length, 0);
 
   const newParaData = {
     first_name: "Staffy",
@@ -420,9 +420,9 @@ test("addStaff", async (t) => {
   await trpc.case_manager.addStaff.mutate(newParaData);
 
   const parasAfterAdd = await trpc.case_manager.getMyParas.query();
-  t.is(parasAfterAdd.length, 1);
+  t.is(parasAfterAdd.records.length, 1);
 
-  const createdPara = parasAfterAdd[0];
+  const createdPara = parasAfterAdd.records[0];
   t.is(createdPara.first_name, newParaData.first_name);
   t.is(createdPara.last_name, newParaData.last_name);
   t.is(createdPara.email, newParaData.email);
@@ -452,14 +452,14 @@ test("addPara", async (t) => {
   });
 
   let myParas = await trpc.case_manager.getMyParas.query();
-  t.is(myParas.length, 0);
+  t.is(myParas.records.length, 0);
 
   await trpc.case_manager.addPara.mutate({
     para_id: seed.para.user_id,
   });
 
   myParas = await trpc.case_manager.getMyParas.query();
-  t.is(myParas.length, 1);
+  t.is(myParas.records.length, 1);
 });
 
 test("addPara - paras do not have access", async (t) => {
@@ -492,14 +492,14 @@ test("removePara", async (t) => {
     .execute();
 
   let myParas = await trpc.case_manager.getMyParas.query();
-  t.is(myParas.length, 1);
+  t.is(myParas.records.length, 1);
 
   await trpc.case_manager.removePara.mutate({
     para_id: seed.para.user_id,
   });
 
   myParas = await trpc.case_manager.getMyParas.query();
-  t.is(myParas.length, 0);
+  t.is(myParas.records.length, 0);
 });
 
 test("removePara - paras do not have access", async (t) => {

src/backend/routers/case_manager.ts

@@ -28,6 +28,8 @@ export const case_manager = router({
     .input(
       z
         .object({
+          page: z.number().min(1).optional(),
+          pageSize: z.number().min(1).optional(),
           search: z.string().optional(),
           sort: z.string().optional(),
           sortAsc: z.coerce.boolean().optional(),
@@ -36,15 +38,28 @@ export const case_manager = router({
     )
     .query(async (req) => {
       const { userId } = req.ctx.auth;
-      const { search, sort, sortAsc = true } = req.input ?? {};
+      const {
+        search,
+        sort,
+        sortAsc = true,
+        page = 1,
+        pageSize = 25,
+      } = req.input ?? {};
 
       let query = req.ctx.db
-        .selectFrom("iep")
-        .fullJoin("student", (join) =>
+        .selectFrom("student")
+        .leftJoin("iep", (join) =>
           join.onRef("student.student_id", "=", "iep.student_id")
         )
+        .select([
+          "student.student_id as student_id",
+          "first_name",
+          "last_name",
+          "student.grade as grade",
+          "iep.iep_id as iep_id",
+          "iep.end_date as end_date",
+        ])
         .where("assigned_case_manager_id", "=", userId);
-
       if (search) {
         query = query.where((eb) =>
           eb.or([
@@ -53,16 +68,9 @@ export const case_manager = router({
           ])
         );
       }
-
-      const result = await query
-        .select([
-          "student.student_id as student_id",
-          "first_name",
-          "last_name",
-          "student.grade as grade",
-          "iep.iep_id as iep_id",
-          "iep.end_date as end_date",
-        ])
+      query = query
+        .limit(pageSize)
+        .offset((page - 1) * pageSize)
         .orderBy(
           (eb) => {
             switch (sort) {
@@ -77,10 +85,31 @@ export const case_manager = router({
             }
           },
           sortAsc ? "asc" : "desc"
-        )
-        .execute();
+        );
+
+      let countQuery = req.ctx.db
+        .selectFrom("student")
+        .select(req.ctx.db.fn.countAll().as("count"))
+        .where("assigned_case_manager_id", "=", userId);
+      if (search) {
+        countQuery = countQuery.where((eb) =>
+          eb.or([
+            eb("student.first_name", "ilike", `%${search}%`),
+            eb("student.last_name", "ilike", `%${search}%`),
+          ])
+        );
+      }
+
+      const [records, totalCount] = await Promise.all([
+        query.execute(),
+        countQuery.executeTakeFirst(),
+      ]);
 
-      return result;
+      return {
+        records,
+        totalCount: Number(totalCount?.count ?? 0),
+        totalPages: Math.ceil(Number(totalCount?.count ?? 0) / pageSize),
+      };
     }),
 
   /**
@@ -193,6 +222,8 @@ export const case_manager = router({
     .input(
       z
         .object({
+          page: z.number().min(1).optional(),
+          pageSize: z.number().min(1).optional(),
           search: z.string().optional(),
           sort: z.string().optional(),
           sortAsc: z.coerce.boolean().optional(),
@@ -201,10 +232,17 @@ export const case_manager = router({
     )
     .query(async (req) => {
       const { userId } = req.ctx.auth;
-      const { search, sort, sortAsc = true } = req.input ?? {};
+      const {
+        page = 1,
+        pageSize = 25,
+        search,
+        sort,
+        sortAsc = true,
+      } = req.input ?? {};
 
       let query = req.ctx.db
         .selectFrom("user")
+        .selectAll()
         .innerJoin(
           "paras_assigned_to_case_manager",
           "user.user_id",
@@ -221,9 +259,7 @@ export const case_manager = router({
           ])
         );
       }
-
-      const result = await query
-        .selectAll()
+      query = query
         .orderBy(
           (eb) => {
             switch (sort) {
@@ -237,9 +273,38 @@ export const case_manager = router({
           },
           sortAsc ? "asc" : "desc"
         )
-        .execute();
+        .limit(pageSize)
+        .offset((page - 1) * pageSize);
+
+      let countQuery = req.ctx.db
+        .selectFrom("user")
+        .select(req.ctx.db.fn.countAll().as("count"))
+        .innerJoin(
+          "paras_assigned_to_case_manager",
+          "user.user_id",
+          "paras_assigned_to_case_manager.para_id"
+        )
+        .where("paras_assigned_to_case_manager.case_manager_id", "=", userId);
+      if (search) {
+        countQuery = countQuery.where((eb) =>
+          eb.or([
+            eb("user.first_name", "ilike", `%${search}%`),
+            eb("user.last_name", "ilike", `%${search}%`),
+            eb("user.email", "ilike", `%${search}%`),
+          ])
+        );
+      }
+
+      const [records, totalCount] = await Promise.all([
+        query.execute(),
+        countQuery.executeTakeFirst(),
+      ]);
 
-      return result;
+      return {
+        records,
+        totalCount: Number(totalCount?.count ?? 0),
+        totalPages: Math.ceil(Number(totalCount?.count ?? 0) / pageSize),
+      };
     }),
 
   /**

src/components/benchmarks/BenchmarkAssignmentModal.tsx

@@ -177,8 +177,8 @@ export const BenchmarkAssignmentModal = (
               }}
             >
               <List sx={{ p: 0 }} className={$benchmark.staffListItemText}>
-                {myParas
-                  ?.filter((para): para is ParaProps => para !== undefined)
+                {myParas?.records
+                  .filter((para): para is ParaProps => para !== undefined)
                   .map((para) => (
                     <ListItem
                       key={para.user_id}

src/components/design_system/button/Button.module.css

@@ -14,14 +14,14 @@
 
 .button--small {
   border-radius: 0.5rem;
-  font-size: var(--base-size);
+  font-size: 1rem;
   line-height: 1.25;
   padding: 0.4375rem 0.4375rem;
 }
 
 .button--large {
   border-radius: 0.5rem;
-  font-size: var(--base-size);
+  font-size: 1rem;
   line-height: 1.5;
   padding: 0.4375rem 1.4375rem;
 }