new API

Author: devksingh4

src/api/routes/roomRequests.ts

@@ -43,7 +43,13 @@ const roomRequestRoutes: FastifyPluginAsync = async (fastify, _options) => {
           message: "Could not retrieve username.",
         });
       }
-      const body = { ...request.body, requestId, userId: request.username };
+      const body = {
+        ...request.body,
+        requestId,
+        userId: request.username,
+        "userId#requestId": `${request.username}#${requestId}`,
+        semesterId: request.body.semester,
+      };
       try {
         await fastify.dynamoClient.send(
           new PutItemCommand({

src/common/types/roomRequest.ts

@@ -13,6 +13,33 @@ export const eventThemeOptions = [
   "Spirituality"
 ] as [string, ...string[]];
 
+export function getSemesters() {
+  const currentDate = new Date();
+  const currentYear = currentDate.getFullYear();
+  const currentMonth = currentDate.getMonth() + 1;
+
+  let semesters = [];
+  let currentSemester = '';
+
+  if (currentMonth >= 1 && currentMonth <= 5) {
+    currentSemester = 'Spring';
+  } else if (currentMonth >= 6 && currentMonth <= 12) {
+    currentSemester = 'Fall';
+  }
+
+  if (currentSemester === 'Spring') {
+    semesters.push({ value: `sp${currentYear.toString().slice(-2)}`, label: `Spring ${currentYear}` });
+    semesters.push({ value: `fa${currentYear.toString().slice(-2)}`, label: `Fall ${currentYear}` });
+    semesters.push({ value: `sp${(currentYear + 1).toString().slice(-2)}`, label: `Spring ${currentYear + 1}` });
+  } else if (currentSemester === 'Fall') {
+    semesters.push({ value: `fa${currentYear.toString().slice(-2)}`, label: `Fall ${currentYear}` });
+    semesters.push({ value: `sp${(currentYear + 1).toString().slice(-2)}`, label: `Spring ${currentYear + 1}` });
+    semesters.push({ value: `fa${(currentYear + 1).toString().slice(-2)}`, label: `Fall ${currentYear + 1}` });
+  }
+
+  return semesters;
+}
+
 export const spaceTypeOptions = [
   { value: "campus_classroom", label: "Campus Classroom" },
   { value: "campus_performance", label: "Campus Performance Space *" },
@@ -33,6 +60,7 @@ export enum RoomRequestStatus {
 
 export const roomRequestSchema = z.object({
   host: z.enum(OrganizationList),
+  semester: z.string().regex(/^(fa|sp|su|wi)\d{2}$/, "Invalid semester provided"),
   title: z.string().min(2, "Title must have at least 2 characters"),
   theme: z.enum(eventThemeOptions),
   description: z.string()

src/ui/pages/roomRequest/NewRoomRequest.tsx

@@ -22,6 +22,7 @@ import {
   spaceTypeOptions,
   RoomRequestFormValues,
   RoomRequestPostResponse,
+  getSemesters,
 } from '@common/types/roomRequest';
 import { useNavigate } from 'react-router-dom';
 import { notifications } from '@mantine/notifications';
@@ -142,13 +143,16 @@ const NewRoomRequest: React.FC<NewRoomRequestProps> = ({
   const [isSubmitting, setIsSubmitting] = useState(false);
   const numSteps = 4;
   const navigate = useNavigate();
+  const semesterOptions = getSemesters();
+  const semesterValues = semesterOptions.map((x) => x.value);
 
   const form = useForm<RoomRequestFormValues>({
     enhanceGetInputProps: () => ({ disabled }),
     initialValues: initialValues || {
       host: '',
       title: '',
       theme: '',
+      semester: '',
       description: '',
       hostingMinors: undefined,
       locationType: 'in-person',
@@ -181,6 +185,7 @@ const NewRoomRequest: React.FC<NewRoomRequestProps> = ({
                 ? null
                 : 'Your description is too long.'
               : 'At least 10 words are required.',
+          semester: semesterValues.includes(values.semester) ? null : 'Invalid semester selected.',
         };
       }
 
@@ -331,6 +336,14 @@ const NewRoomRequest: React.FC<NewRoomRequestProps> = ({
     <>
       <Stepper active={active}>
         <Stepper.Step label="Step 1" description="Basic Information">
+          <Select
+            label="Semester"
+            placeholder="Select event semester"
+            withAsterisk
+            searchable
+            data={semesterOptions}
+            {...form.getInputProps('semester')}
+          />
           <Select
             label="Event Host"
             placeholder="Select host organization"