update expires at

Author: devksingh4

src/api/functions/auditLog.ts

@@ -5,20 +5,20 @@ import {
 } from "@aws-sdk/client-dynamodb";
 import { marshall } from "@aws-sdk/util-dynamodb";
 import { genericConfig } from "common/config.js";
+import { AUDIT_LOG_RETENTION_DAYS } from "common/constants.js";
 import { AuditLogEntry } from "common/types/logs.js";
 
 type AuditLogParams = {
   dynamoClient?: DynamoDBClient;
   entry: AuditLogEntry;
 };
 
-const RETENTION_DAYS = 365;
-
 function buildMarshalledAuditLogItem(entry: AuditLogEntry) {
   const baseNow = Date.now();
   const timestamp = Math.floor(baseNow / 1000);
   const expireAt =
-    timestamp + Math.floor((RETENTION_DAYS * 24 * 60 * 60 * 1000) / 1000);
+    timestamp +
+    Math.floor((AUDIT_LOG_RETENTION_DAYS * 24 * 60 * 60 * 1000) / 1000);
 
   return marshall(
     {

src/api/routes/roomRequests.ts

@@ -36,6 +36,7 @@ import {
   getDefaultFilteringQuerystring,
   nonEmptyCommaSeparatedStringSchema,
 } from "common/utils.js";
+import { ROOM_RESERVATION_RETENTION_DAYS } from "common/constants.js";
 
 const roomRequestRoutes: FastifyPluginAsync = async (fastify, _options) => {
   await fastify.register(rateLimiter, {
@@ -104,6 +105,9 @@ const roomRequestRoutes: FastifyPluginAsync = async (fastify, _options) => {
             semesterId,
             "createdAt#status": `${createdAt}#${request.body.status}`,
             createdBy: request.username,
+            expiresAt:
+              Math.floor(Date.now() / 1000) +
+              86400 * ROOM_RESERVATION_RETENTION_DAYS,
             ...request.body,
           },
           { removeUndefinedValues: true },
@@ -315,6 +319,9 @@ const roomRequestRoutes: FastifyPluginAsync = async (fastify, _options) => {
         userId: request.username,
         "userId#requestId": `${request.username}#${requestId}`,
         semesterId: request.body.semester,
+        expiresAt:
+          Math.floor(Date.now() / 1000) +
+          86400 * ROOM_RESERVATION_RETENTION_DAYS,
       };
       const logStatement = buildAuditLogTransactPut({
         entry: {
@@ -344,6 +351,9 @@ const roomRequestRoutes: FastifyPluginAsync = async (fastify, _options) => {
                   "createdAt#status": `${createdAt}#${RoomRequestStatus.CREATED}`,
                   createdBy: request.username,
                   status: RoomRequestStatus.CREATED,
+                  expiresAt:
+                    Math.floor(Date.now() / 1000) +
+                    86400 * ROOM_RESERVATION_RETENTION_DAYS,
                   notes: "This request was created by the user.",
                 }),
               },

src/api/routes/stripe.ts

@@ -45,6 +45,7 @@ import { AvailableSQSFunctions, SQSPayload } from "common/types/sqsMessage.js";
 import { SendMessageCommand, SQSClient } from "@aws-sdk/client-sqs";
 import * as z from "zod/v4";
 import { getAllUserEmails } from "common/utils.js";
+import { STRIPE_LINK_RETENTION_DAYS } from "common/constants.js";
 
 const stripeRoutes: FastifyPluginAsync = async (fastify, _options) => {
   await fastify.register(rawbody, {
@@ -250,7 +251,8 @@ const stripeRoutes: FastifyPluginAsync = async (fastify, _options) => {
         },
       });
       // expire deleted links at 90 days
-      const expiresAt = Math.floor(Date.now() / 1000) + 86400 * 90;
+      const expiresAt =
+        Math.floor(Date.now() / 1000) + 86400 * STRIPE_LINK_RETENTION_DAYS;
       const dynamoCommand = new TransactWriteItemsCommand({
         TransactItems: [
           ...(logStatement ? [logStatement] : []),
@@ -669,11 +671,18 @@ Please contact Officer Board with any questions.`,
                           userId: { S: unmarshalledEntry.userId },
                           linkId: { S: paymentLinkId },
                         },
-                        UpdateExpression: "SET active = :new_val",
+                        UpdateExpression:
+                          "SET active = :new_val, expiresAt = :ttl",
                         ConditionExpression: "active = :old_val",
                         ExpressionAttributeValues: {
                           ":new_val": { BOOL: false },
                           ":old_val": { BOOL: true },
+                          ":ttl": {
+                            N: (
+                              Math.floor(Date.now() / 1000) +
+                              86400 * STRIPE_LINK_RETENTION_DAYS
+                            ).toString(),
+                          },
                         },
                       },
                     },

src/common/constants.ts

@@ -0,0 +1,3 @@
+export const STRIPE_LINK_RETENTION_DAYS = 90; // this number of days after the link is deactivated.
+export const AUDIT_LOG_RETENTION_DAYS = 365;
+export const ROOM_RESERVATION_RETENTION_DAYS = 730;

src/ui/pages/stripe/CurrentLinks.tsx

@@ -18,6 +18,7 @@ import { notifications } from "@mantine/notifications";
 import { useAuth } from "@ui/components/AuthContext";
 import pluralize from "pluralize";
 import dayjs from "dayjs";
+import { STRIPE_LINK_RETENTION_DAYS } from "@common/constants";
 
 const HumanFriendlyDate = ({ date }: { date: string | Date }) => {
   return <Text size="sm">{dayjs(date).format("MMMM D, YYYY")}</Text>;
@@ -147,8 +148,7 @@ export const StripeCurrentLinksPanel: React.FC<
       if (result.success > 0) {
         notifications.show({
           title: `Deactivated ${pluralize("link", result.success, true)}!`,
-          message:
-            "Links will be permanently removed from this page after 90 days.",
+          message: `Links will be permanently removed from this page after ${STRIPE_LINK_RETENTION_DAYS} days.`,
           color: "green",
         });
       }

terraform/modules/dynamo/main.tf

@@ -80,6 +80,10 @@ resource "aws_dynamodb_table" "room_requests" {
     hash_key        = "requestId"
     projection_type = "ALL"
   }
+  ttl {
+    attribute_name = "expiresAt"
+    enabled        = true
+  }
 }
 
 
@@ -110,6 +114,10 @@ resource "aws_dynamodb_table" "room_requests_status" {
     range_key       = "requestId"
     projection_type = "ALL"
   }
+  ttl {
+    attribute_name = "expiresAt"
+    enabled        = true
+  }
 }