update schemas

Author: devksingh4

src/api/components/index.ts

@@ -1,8 +1,11 @@
 import { AppRoles } from "common/roles.js";
 import { FastifyZodOpenApiSchema } from "fastify-zod-openapi";
 import * as z from "zod/v4";
-import { validateNetId } from "api/functions/validation.js";
 import { CoreOrganizationList } from "@acm-uiuc/js-shared";
+export {
+  illinoisSemesterId as semesterId,
+  illinoisNetId,
+} from "../../common/types/generic.js";
 
 export const ts = z.coerce.number().min(0).optional().meta({
   description:
@@ -17,19 +20,6 @@ export const groupId = z.string().min(1).meta({
   id: "EntraGroupId",
 });
 
-export const illinoisNetId = z
-  .string()
-  .min(3, { message: "NetID must be at least 3 characters." })
-  .max(8, { message: "NetID cannot be more than 8 characters." })
-  .regex(/^[a-zA-Z]{2}[a-zA-Z-]*(?:[2-9]|[1-9][0-9]{1,2})?$/, {
-    message: "NetID is not valid!",
-  })
-  .meta({
-    description: "Valid Illinois NetID",
-    example: "rjjones",
-    id: "IllinoisNetId",
-  });
-
 export const acmCoreOrganization = z
   .enum(CoreOrganizationList as [string, ...string[]])
   .meta({
@@ -38,15 +28,6 @@ export const acmCoreOrganization = z
     examples: ["ACM", "Infrastructure Committee"],
   });
 
-export const semesterId = z
-  .string()
-  .min(1)
-  .meta({
-    description: "Short semester slug for a given semester.",
-    id: "IllinoisSemesterId",
-    examples: ["sp25", "fa24"],
-  });
-
 export function withTags<T extends FastifyZodOpenApiSchema>(
   tags: string[],
   schema: T,

src/common/types/generic.ts

@@ -0,0 +1,26 @@
+import * as z from "zod/v4";
+
+
+export const illinoisSemesterId = z
+  .string()
+  .min(1)
+  .max(4)
+  .regex(/^(fa|sp|su|wi)\d{2}$/)
+  .meta({
+    description: "Short semester slug for a given semester.",
+    id: "IllinoisSemesterId",
+    examples: ["sp25", "fa24"],
+  });
+
+export const illinoisNetId = z
+  .string()
+  .min(3, { message: "NetID must be at least 3 characters." })
+  .max(8, { message: "NetID cannot be more than 8 characters." })
+  .regex(/^[a-zA-Z]{2}[a-zA-Z-]*(?:[2-9]|[1-9][0-9]{1,2})?$/, {
+    message: "NetID is not valid!",
+  })
+  .meta({
+    description: "Valid Illinois NetID. See https://answers.uillinois.edu/illinois/page.php?id=78766 for more information.",
+    example: "rjjones",
+    id: "IllinoisNetId",
+  });

src/common/types/roomRequest.ts

@@ -1,5 +1,6 @@
 import * as z from "zod/v4";
 import { AllOrganizationList } from "@acm-uiuc/js-shared";
+import { illinoisSemesterId } from "./generic.js"
 
 export const eventThemeOptions = [
   "Arts & Music",
@@ -147,9 +148,7 @@ export const roomRequestPostResponse = z.object({
 export const roomRequestBaseSchema = z.object({
   host: z.enum(AllOrganizationList),
   title: z.string().min(2, "Title must have at least 2 characters"),
-  semester: z.
-    string().
-    regex(/^(fa|sp|su|wi)\d{2}$/, "Invalid semester provided")
+  semester: illinoisSemesterId
 });
 export const roomRequestDataSchema = roomRequestBaseSchema.extend({
   eventStart: z.coerce.date({