refactor, fix: validate trpc & unsorted semesters bug

src/components/planner/Tiles/SemesterCourseItem.tsx

@@ -237,7 +237,7 @@ const DraggableSemesterCourseItem: FC<DraggableSemesterCourseItemProps> = ({
   const hoverList: [Array<string>, Array<string>, Array<string>] = [[], [], []];
   const prereqData = requirementsData.data?.prereq?.get(course.code);
   const coreqData = requirementsData.data?.coreq?.get(course.code);
-  const coorpreData = requirementsData.data?.coorepre?.get(course.code);
+  const coorpreData = requirementsData.data?.coorpre?.get(course.code);
   if (coreqData) {
     isValid[1] = coreqData.length > 0 ? false : true;
     coreqData.map((data) => {

src/server/trpc/router/courseCache.ts

@@ -12,7 +12,6 @@ class CourseCache {
   private mutex = new Mutex();
 
   public async getCourses(year: number) {
-    const formattedYear = year.toString().slice(-2);
     // Acquire lock before success check so if another request is fetching, we don't fetch again.
     const release = await this.mutex.acquire();
     if (this.coursesByYear.has(year)) {
@@ -24,9 +23,7 @@ class CourseCache {
     console.info(`Fetching courses for year ${year}...`);
     return await platformPrisma.courses
       .findMany({
-        where: {
-          catalog_year: formattedYear,
-        },
+        distinct: ['title', 'course_number', 'subject_prefix'],
       })
       .then((courses) => {
         this.coursesByYear.set(year, courses);

src/server/trpc/router/plan.ts

@@ -1,4 +1,4 @@
-import { Prisma, Semester } from '@prisma/client';
+import { Prisma, PrismaClient, Semester } from '@prisma/client';
 import { TRPCError } from '@trpc/server';
 import { v4 as uuidv4 } from 'uuid';
 import { z } from 'zod';
@@ -13,6 +13,42 @@ import { SemesterCode, computeSemesterCode } from 'prisma/utils';
 
 import { protectedProcedure, router } from '../trpc';
 
+// extracted for reusability for other trpc routes
+export const getPlanFromUserId = async (ctx: { prisma: PrismaClient }, id: string) => {
+  // Fetch current plan
+  const planData = await ctx.prisma.plan.findUnique({
+    where: {
+      id,
+    },
+    select: {
+      name: true,
+      id: true,
+      userId: true,
+      semesters: {
+        include: {
+          courses: true,
+        },
+      },
+      transferCredits: true,
+    },
+  });
+
+  // Make sure semesters are in right orer
+  if (planData && planData.semesters) {
+    planData.semesters = planData.semesters.sort((a, b) =>
+      isEarlierSemester(computeSemesterCode(a), computeSemesterCode(b)) ? -1 : 1,
+    );
+  }
+
+  if (!planData) {
+    throw new TRPCError({
+      code: 'NOT_FOUND',
+      message: 'Plan not found',
+    });
+  }
+  return planData;
+};
+
 export const planRouter = router({
   // Protected route: route uses session user id to find user plans
   getUserPlans: protectedProcedure.query(async ({ ctx }) => {
@@ -36,36 +72,7 @@ export const planRouter = router({
   // Protected route: checks if session user and plan owner have the same id
   getPlanById: protectedProcedure.input(z.string().min(1)).query(async ({ ctx, input }) => {
     // Fetch current plan
-    const planData = await ctx.prisma.plan.findUnique({
-      where: {
-        id: input,
-      },
-      select: {
-        name: true,
-        id: true,
-        userId: true,
-        semesters: {
-          include: {
-            courses: true,
-          },
-        },
-        transferCredits: true,
-      },
-    });
-
-    // Make sure semesters are in right orer
-    if (planData && planData.semesters) {
-      planData.semesters = planData.semesters.sort((a, b) =>
-        isEarlierSemester(computeSemesterCode(a), computeSemesterCode(b)) ? -1 : 1,
-      );
-    }
-
-    if (!planData) {
-      throw new TRPCError({
-        code: 'NOT_FOUND',
-        message: 'Plan not found',
-      });
-    }
+    const planData = await getPlanFromUserId(ctx, input);
 
     if (ctx.session.user.id !== planData.userId) {
       throw new TRPCError({ code: 'FORBIDDEN' });