update functions

Author: devksingh4

src/api/routes/roomRequests.ts

@@ -239,6 +239,9 @@ const roomRequestRoutes: FastifyPluginAsync = async (fastify, _options) => {
         });
       }
       const items = response.Items.map((x) => {
+        if (!request.query.select.includes("status")) {
+          return unmarshall(x);
+        }
         const item = unmarshall(x) as {
           host: string;
           title: string;
@@ -418,20 +421,29 @@ const roomRequestRoutes: FastifyPluginAsync = async (fastify, _options) => {
               example: "sp25",
             }),
           }),
+          querystring: z.object(
+            getDefaultFilteringQuerystring({
+              defaultSelect: ["requestId", "title"],
+            }),
+          ),
         }),
       ),
       onRequest: fastify.authorizeFromSchema,
     },
     async (request, reply) => {
       const requestId = request.params.requestId;
       const semesterId = request.params.semesterId;
+      const { ProjectionExpression, ExpressionAttributeNames } =
+        generateProjectionParams({ userFields: request.query.select });
       let command;
       if (request.userRoles?.has(AppRoles.BYPASS_OBJECT_LEVEL_AUTH)) {
         command = new QueryCommand({
           TableName: genericConfig.RoomRequestsTableName,
           IndexName: "RequestIdIndex",
           KeyConditionExpression: "requestId = :requestId",
           FilterExpression: "semesterId = :semesterId",
+          ProjectionExpression,
+          ExpressionAttributeNames,
           ExpressionAttributeValues: {
             ":requestId": { S: requestId },
             ":semesterId": { S: semesterId },
@@ -441,6 +453,7 @@ const roomRequestRoutes: FastifyPluginAsync = async (fastify, _options) => {
       } else {
         command = new QueryCommand({
           TableName: genericConfig.RoomRequestsTableName,
+          ProjectionExpression,
           KeyConditionExpression:
             "semesterId = :semesterId AND #userIdRequestId = :userRequestId",
           ExpressionAttributeValues: {
@@ -449,6 +462,7 @@ const roomRequestRoutes: FastifyPluginAsync = async (fastify, _options) => {
           },
           ExpressionAttributeNames: {
             "#userIdRequestId": "userId#requestId",
+            ...ExpressionAttributeNames,
           },
           Limit: 1,
         });

src/common/utils.ts

@@ -37,18 +37,20 @@ export const generateProjectionParams = ({ userFields }: GenerateProjectionParam
 };
 
 
-export const nonEmptyCommaSeparatedStringSchema = z.preprocess(
-  (val) => String(val).split(',').map(item => item.trim()),
-  z.array(z.string()).nonempty()
-);
+export const nonEmptyCommaSeparatedStringSchema = z
+  .string({ invalid_type_error: "Filter expression must be a string." })
+  .min(1, { message: "Filter expression must be at least 1 character long." })
+  .transform((val) => val.split(',').map(item => item.trim()))
+  .pipe(z.array(z.string()).nonempty());
 
-type GettDefaultFilteringQuerystringInput = {
+type GetDefaultFilteringQuerystringInput = {
   defaultSelect: string[];
 }
-export const getDefaultFilteringQuerystring = ({ defaultSelect }: GettDefaultFilteringQuerystringInput) => {
+export const getDefaultFilteringQuerystring = ({ defaultSelect }: GetDefaultFilteringQuerystringInput) => {
   return {
     select: z.optional(nonEmptyCommaSeparatedStringSchema).default(defaultSelect.join(',')).openapi({
       description: "Comma-seperated list of attributes to return",
+      ...(defaultSelect.length === 0 ? { default: "<ALL ATTRIBUTES>" } : {}),
     })
   }
 }