fix semesters not sorting correctly bug

Author: ZzRanger

src/server/trpc/router/plan.ts

@@ -2,16 +2,12 @@ import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
 
 import { Semester as PlanSemester } from '@/components/planner/types';
-import {
-  createNewYear,
-  createSemesterCodeRange,
-  isSemesterEarlier,
-  isSemesterLater,
-} from '@/utils/utilFunctions';
+import { createNewYear, createSemesterCodeRange } from '@/utils/utilFunctions';
 
 import { protectedProcedure, router } from '../trpc';
 import { Prisma, SemesterCode, Semester } from '@prisma/client';
 import { ObjectId } from 'bson';
+import { isEarlierSemester } from '@/utils/plannerUtils';
 
 export const planRouter = router({
   // Protected route: route uses session user id to find user plans
@@ -53,6 +49,13 @@ export const planRouter = router({
       },
     });
 
+    // Make sure semesters are in right orer
+    if (planData && planData.semesters) {
+      planData.semesters = planData.semesters.sort((a, b) =>
+        isEarlierSemester(a.code, b.code) ? -1 : 1,
+      );
+    }
+
     if (!planData) {
       throw new TRPCError({
         code: 'NOT_FOUND',

src/server/trpc/router/user.ts

@@ -367,6 +367,9 @@ export const userRouter = router({
                   },
                 },
               },
+              orderBy: {
+                semester: 'asc',
+              },
             },
           },
         });