@studious-lms/server 1.2.52 → 1.3.0

package/src/routers/agenda.ts

@@ -1,8 +1,7 @@
 import { z } from "zod";
 import { createTRPCRouter, protectedProcedure } from "../trpc.js";
-import { prisma } from "../lib/prisma.js";
 import { TRPCError } from "@trpc/server";
-import { addDays, addMonths, subMonths, startOfDay, endOfDay } from "date-fns";
+import { getAgenda } from "../services/agenda.js";
 
 export const agendaRouter = createTRPCRouter({
   get: protectedProcedure
@@ -17,68 +16,6 @@ export const agendaRouter = createTRPCRouter({
         });
       }
 
-      // Expand query range to 6 months (3 months before and after the reference date)
-      // to allow calendar navigation and ensure newly created events are visible
-      const referenceDate = new Date(input.weekStart);
-      const rangeStart = startOfDay(subMonths(referenceDate, 3));
-      const rangeEnd = endOfDay(addMonths(referenceDate, 3));
-
-      const [personalEvents, classEvents] = await Promise.all([
-        // Get personal events
-        prisma.event.findMany({
-          where: {
-            userId: ctx.user.id,
-            startTime: {
-              gte: rangeStart,
-              lte: rangeEnd,
-            },
-            class: {
-              is: null,
-            },
-          },
-          include: {
-            assignmentsAttached: true,
-            class: true,
-          },
-        }),
-        // Get class events
-        prisma.event.findMany({
-          where: {
-            class: {
-              OR: [
-                {
-                  teachers: {
-                    some: {
-                      id: ctx.user.id,
-                    },
-                  },
-                },
-                {
-                  students: {
-                    some: {
-                      id: ctx.user.id,
-                    },
-                  },
-                },
-              ],
-            },
-            startTime: {
-              gte: rangeStart,
-              lte: rangeEnd,
-            },
-          },
-          include: {
-            assignmentsAttached: true,
-            class: true,
-          },
-        }),
-      ]);
-
-      return {
-        events: {
-          personal: personalEvents,
-          class: classEvents,
-        },
-      };
+      return getAgenda(ctx.user.id, input.weekStart);
     }),
-}); 
+});