changed to pull latest 4 months of events (#374)

ubc-biztech · Aug 7, 2024 · 5cc5a06 · 5cc5a06
1 parent 3c30bca
commit 5cc5a06
Showing 1 changed file with 21 additions and 14 deletions.
diff --git a/services/events/handler.js b/services/events/handler.js
@@ -137,13 +137,24 @@ export const del = async (event, ctx, callback) => {
   }
 };
 
-// /events
+// TODO: Implement better way to optimize this query
 export const getAll = async (event, ctx, callback) => {
   try {
+    const fourMonthsAgo = new Date();
+    fourMonthsAgo.setMonth(fourMonthsAgo.getMonth() - 4);
+    const fourMonthsAgoTimestamp = fourMonthsAgo.getTime();
+
     let filterExpression = {
+      FilterExpression: "#createdAt >= :fourMonthsAgo",
+      ExpressionAttributeNames: {
+        "#createdAt": "createdAt"
+      },
+      ExpressionAttributeValues: {
+        ":fourMonthsAgo": fourMonthsAgoTimestamp
+      }
     };
 
-    //Set up query by year if exists
+    // Add year filter if it exists
     if (
       event &&
       event.queryStringParameters &&
@@ -156,20 +167,15 @@ export const getAll = async (event, ctx, callback) => {
           event.queryStringParameters
         );
 
-      filterExpression = {
-        FilterExpression: "#vyear = :query",
-        ExpressionAttributeNames: {
-          "#vyear": "year"
-        },
-        ExpressionAttributeValues: {
-          ":query": year
-        }
-      };
+      filterExpression.FilterExpression += " AND #vyear = :year";
+      filterExpression.ExpressionAttributeNames["#vyear"] = "year";
+      filterExpression.ExpressionAttributeValues[":year"] = year;
     }
 
     // scan
     let events = await db.scan(EVENTS_TABLE, filterExpression);
 
+    // Filter by ID if provided
     if (
       event &&
       event.queryStringParameters &&
@@ -181,11 +187,12 @@ export const getAll = async (event, ctx, callback) => {
     }
 
     // get event counts
-    for (event of events) {
-      event.counts = await eventHelpers.getEventCounts(
-        event.id, event.year
+    for (const eventItem of events) {
+      eventItem.counts = await eventHelpers.getEventCounts(
+        eventItem.id, eventItem.year
       );
     }
+
     // sort the events by startDate
     events.sort(alphabeticalComparer("startDate"));