add query parameter for upcoming events only

Author: devksingh4

package.json

@@ -45,6 +45,7 @@
     "fastify-plugin": "^4.5.1",
     "jsonwebtoken": "^9.0.2",
     "jwks-rsa": "^3.1.0",
+    "moment-timezone": "^0.5.45",
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.2",
     "zod-validation-error": "^3.3.1"

src/config.ts

@@ -13,6 +13,7 @@ type ConfigType = {
 type GenericConfigType = {
   DynamoTableName: string;
   ConfigSecretName: string;
+  UpcomingEventThresholdSeconds: number;
 };
 
 type EnvironmentConfigType = {
@@ -22,6 +23,7 @@ type EnvironmentConfigType = {
 const genericConfig: GenericConfigType = {
   DynamoTableName: "infra-events-api-records",
   ConfigSecretName: "infra-events-api-config",
+  UpcomingEventThresholdSeconds: 1800 // 30 mins
 } as const;
 
 const environmentConfig: EnvironmentConfigType = {

src/plugins/errorHandler.ts

@@ -28,11 +28,11 @@ const errorHandlerPlugin = fp(async (fastify) => {
         );
       } else if (err instanceof Error) {
         request.log.error(
-          { errName: err.name },
+          { errName: err.name, errMessage: err.message },
           "Native unhandled error: response sent to client.",
         );
       } else {
-        request.log.error("Native unhandled error: response sent to client.");
+        request.log.error(`Native unhandled error: response sent to client`);
       }
       if (!finalErr) {
         finalErr = new InternalServerError();

src/routes/events.ts

@@ -1,4 +1,4 @@
-import { FastifyPluginAsync } from "fastify";
+import { FastifyPluginAsync, FastifyRequest } from "fastify";
 import { AppRoles } from "../roles.js";
 import { z } from "zod";
 import { zodToJsonSchema } from "zod-to-json-schema";
@@ -8,10 +8,11 @@ import {
   PutItemCommand,
   ScanCommand,
 } from "@aws-sdk/client-dynamodb";
+import { genericConfig } from "../config.js";
 import { marshall, unmarshall } from "@aws-sdk/util-dynamodb";
-import config from "../config.js";
 import { DatabaseFetchError, DatabaseInsertError } from "../errors/index.js";
 import { randomUUID } from "crypto";
+import moment from 'moment-timezone';
 
 // POST
 
@@ -37,8 +38,10 @@ const requestBodySchema = baseBodySchema
     message: "repeats is required when repeatEnds is defined",
   });
 
+
 type EventPostRequest = z.infer<typeof requestBodySchema>;
 
+
 const responseJsonSchema = zodToJsonSchema(
   z.object({
     id: z.string(),
@@ -50,6 +53,14 @@ const responseJsonSchema = zodToJsonSchema(
 const getResponseBodySchema = z.array(requestBodySchema);
 const getResponseJsonSchema = zodToJsonSchema(getResponseBodySchema);
 
+
+const getQueryParams = z.object({
+  upcomingOnly: z.boolean().default(false),
+})
+type EventsGetQueryParams =  z.infer<typeof getQueryParams>;
+const getQueryParamsJsonSchema = zodToJsonSchema(getResponseBodySchema);
+
+
 const dynamoClient = new DynamoDBClient({
   region: process.env.AWS_REGION || "us-east-1",
 });
@@ -75,7 +86,7 @@ const eventsPlugin: FastifyPluginAsync = async (fastify, _options) => {
           randomUUID().toString();
         await dynamoClient.send(
           new PutItemCommand({
-            TableName: config.DYNAMO_TABLE_NAME,
+            TableName: genericConfig.DynamoTableName,
             Item: marshall({
               ...request.body,
               id: entryUUID,
@@ -97,20 +108,48 @@ const eventsPlugin: FastifyPluginAsync = async (fastify, _options) => {
       }
     },
   );
-  fastify.get<{ Body: undefined }>(
+  type EventsGetRequest = {Body: undefined, Querystring?: EventsGetQueryParams}
+  fastify.get<EventsGetRequest>( 
     "/",
     {
       schema: {
+        querystring: {
+          upcomingOnly: { type: 'boolean' },
+        },
         response: { 200: getResponseJsonSchema },
       },
     },
-    async (request, reply) => {
+    async (request: FastifyRequest<EventsGetRequest>, reply) => {
+      const upcomingOnly = request.query?.upcomingOnly || false;
       try {
         const response = await dynamoClient.send(
-          new ScanCommand({ TableName: config.DYNAMO_TABLE_NAME }),
+          new ScanCommand({ TableName: genericConfig.DynamoTableName }),
         );
         const items = response.Items?.map((item) => unmarshall(item));
-        reply.send(getResponseBodySchema.parse(items));
+        const currentTimeChicago = moment().tz("America/Chicago");
+        let parsedItems = getResponseBodySchema.parse(items);
+        if (upcomingOnly) {
+          parsedItems = parsedItems.filter(item => {
+            try {
+              if (!item.repeatEnds || item.repeatEnds === 'never') {
+                return true;
+              }
+              if (!item.repeats) {
+                const end = item.end || item.start;
+                const momentEnds = moment.tz(end, "America/Chicago")
+                const diffTime = currentTimeChicago.diff(momentEnds);
+                return Boolean(diffTime <= genericConfig.UpcomingEventThresholdSeconds)
+              }
+              const momentRepeatEnds = moment.tz(item.repeatEnds, "America/Chicago")
+              const diffTime = currentTimeChicago.diff(momentRepeatEnds);
+              return Boolean(diffTime <= genericConfig.UpcomingEventThresholdSeconds);
+            } catch (e) {
+              request.log.warn(`Could not compute upcoming event status for event ${item.title}!`)
+              return false;
+            }
+          })
+        }
+        reply.send(parsedItems);
       } catch (e: unknown) {
         if (e instanceof Error) {
           request.log.error("Failed to get from DynamoDB: " + e.toString());

yarn.lock

@@ -3653,6 +3653,18 @@ mnemonist@0.39.6:
   dependencies:
     obliterator "^2.0.1"
 
+moment-timezone@^0.5.45:
+  version "0.5.45"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c"
+  integrity sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==
+  dependencies:
+    moment "^2.29.4"
+
+moment@^2.29.4:
+  version "2.30.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
+  integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
+
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"