refactor schemas and logging (#126)

* refactor schemas and logging

* fix tests

* fix URL

* fix function and add unit tests for creating room requests

* add status update unit tests

Author: devksingh4

src/api/routes/roomRequests.ts

@@ -30,6 +30,8 @@ import { SendMessageCommand, SQSClient } from "@aws-sdk/client-sqs";
 import { withRoles, withTags } from "api/components/index.js";
 import { FastifyZodOpenApiTypeProvider } from "fastify-zod-openapi";
 import { z } from "zod";
+import { buildAuditLogTransactPut } from "api/functions/auditLog.js";
+import { Modules } from "common/modules.js";
 
 const roomRequestRoutes: FastifyPluginAsync = async (fastify, _options) => {
   await fastify.register(rateLimiter, {
@@ -93,7 +95,7 @@ const roomRequestRoutes: FastifyPluginAsync = async (fastify, _options) => {
         });
       }
       const createdAt = new Date().toISOString();
-      const command = new PutItemCommand({
+      const itemPut = {
         TableName: genericConfig.RoomRequestsStatusTableName,
         Item: marshall({
           requestId,
@@ -102,9 +104,22 @@ const roomRequestRoutes: FastifyPluginAsync = async (fastify, _options) => {
           createdBy: request.username,
           ...request.body,
         }),
+      };
+      const logPut = buildAuditLogTransactPut({
+        entry: {
+          module: Modules.ROOM_RESERVATIONS,
+          actor: request.username!,
+          target: `${semesterId}/${requestId}`,
+          requestId: request.id,
+          message: `Changed status to "${formatStatus(request.body.status)}".`,
+        },
       });
       try {
-        await fastify.dynamoClient.send(command);
+        await fastify.dynamoClient.send(
+          new TransactWriteItemsCommand({
+            TransactItems: [{ Put: itemPut }, logPut],
+          }),
+        );
       } catch (e) {
         request.log.error(e);
         if (e instanceof BaseError) {
@@ -269,11 +284,22 @@ const roomRequestRoutes: FastifyPluginAsync = async (fastify, _options) => {
       }
       const body = {
         ...request.body,
+        eventStart: request.body.eventStart.toUTCString(),
+        eventEnd: request.body.eventStart.toUTCString(),
         requestId,
         userId: request.username,
         "userId#requestId": `${request.username}#${requestId}`,
         semesterId: request.body.semester,
       };
+      const logPut = buildAuditLogTransactPut({
+        entry: {
+          module: Modules.ROOM_RESERVATIONS,
+          actor: request.username!,
+          target: `${request.body.semester}/${requestId}`,
+          requestId: request.id,
+          message: "Created room reservation request.",
+        },
+      });
       try {
         const createdAt = new Date().toISOString();
         const transactionCommand = new TransactWriteItemsCommand({
@@ -297,6 +323,7 @@ const roomRequestRoutes: FastifyPluginAsync = async (fastify, _options) => {
                 }),
               },
             },
+            logPut,
           ],
         });
         await fastify.dynamoClient.send(transactionCommand);

src/common/modules.ts

@@ -9,6 +9,7 @@ export enum Modules {
   LINKRY = "linkry",
   AUDIT_LOG = "auditLog",
   API_KEY = "apiKey",
+  ROOM_RESERVATIONS = "roomReservations",
 }
 
 
@@ -23,4 +24,5 @@ export const ModulesToHumanName: Record<Modules, string> = {
   [Modules.LINKRY]: "Link Shortener",
   [Modules.AUDIT_LOG]: "Audit Log",
   [Modules.API_KEY]: "API Keys",
+  [Modules.ROOM_RESERVATIONS]: "Room Reservations",
 }

src/common/types/roomRequest.ts

@@ -184,10 +184,10 @@ export const roomRequestSchema = roomRequestBaseSchema
     // Existing fields
     hostingMinors: z.boolean(),
     locationType: z.enum(["in-person", "virtual", "both"]),
-    spaceType: z.string().min(1),
-    specificRoom: z.string().min(1),
-    estimatedAttendees: z.number().positive(),
-    seatsNeeded: z.number().positive(),
+    spaceType: z.optional(z.string().min(1)),
+    specificRoom: z.optional(z.string().min(1)),
+    estimatedAttendees: z.optional(z.number().positive()),
+    seatsNeeded: z.optional(z.number().positive()),
     setupDetails: z.string().min(1).nullable().optional(),
     onCampusPartners: z.string().min(1).nullable(),
     offCampusPartners: z.string().min(1).nullable(),
@@ -266,10 +266,10 @@ export const roomRequestSchema = roomRequestBaseSchema
   )
   .refine(
     (data) => {
-      if (data.setupDetails === undefined && specificRoomSetupRooms.includes(data.spaceType)) {
+      if (data.setupDetails === undefined && specificRoomSetupRooms.includes(data.spaceType || "")) {
         return false;
       }
-      if (data.setupDetails && !specificRoomSetupRooms.includes(data.spaceType)) {
+      if (data.setupDetails && !specificRoomSetupRooms.includes(data.spaceType || "")) {
         return false;
       }
       return true;
@@ -280,33 +280,35 @@ export const roomRequestSchema = roomRequestBaseSchema
     },
   )
   .superRefine((data, ctx) => {
-    // Additional validation for conditional fields based on locationType
-    if (data.locationType === "in-person" || data.locationType === "both") {
-      if (!data.spaceType || data.spaceType.length === 0) {
+    const isPhysicalLocation = data.locationType === "in-person" || data.locationType === "both";
+
+    // Conditional physical location fields
+    if (isPhysicalLocation) {
+      if (!data.spaceType || data.spaceType.trim().length === 0) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
           message: "Please select a space type",
           path: ["spaceType"],
         });
       }
 
-      if (!data.specificRoom || data.specificRoom.length === 0) {
+      if (!data.specificRoom || data.specificRoom.trim().length === 0) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
           message: "Please provide details about the room location",
           path: ["specificRoom"],
         });
       }
 
-      if (!data.estimatedAttendees || data.estimatedAttendees <= 0) {
+      if (data.estimatedAttendees == null || data.estimatedAttendees <= 0) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
           message: "Please provide an estimated number of attendees",
           path: ["estimatedAttendees"],
         });
       }
 
-      if (!data.seatsNeeded || data.seatsNeeded <= 0) {
+      if (data.seatsNeeded == null || data.seatsNeeded <= 0) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
           message: "Please specify how many seats you need",
@@ -357,8 +359,26 @@ export const roomRequestSchema = roomRequestBaseSchema
         path: ["nonIllinoisAttendees"],
       });
     }
+
+    // Setup details logic
+    if (data.setupDetails === undefined && specificRoomSetupRooms.includes(data.spaceType || "")) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Invalid setup details response.",
+        path: ["setupDetails"],
+      });
+    }
+
+    if (data.setupDetails && !specificRoomSetupRooms.includes(data.spaceType || "")) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Invalid setup details response.",
+        path: ["setupDetails"],
+      });
+    }
   });
 
+
 export type RoomRequestFormValues = z.infer<typeof roomRequestSchema>;
 
 export const roomRequestGetResponse = z.object({

src/ui/pages/roomRequest/RoomRequestLanding.page.tsx

@@ -22,7 +22,7 @@ export const ManageRoomRequestsPage: React.FC = () => {
   const createRoomRequest = async (
     payload: RoomRequestFormValues
   ): Promise<RoomRequestPostResponse> => {
-    const response = await api.post(`/api/v1/roomRequests/`, payload);
+    const response = await api.post(`/api/v1/roomRequests`, payload);
     return response.data;
   };