merge main conflicts

Author: eeen17

cloudformation/iam.yml

@@ -72,6 +72,14 @@ Resources:
               - Fn::Sub: arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-stripe-links
               - Fn::Sub: arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-membership-provisioning
               - Fn::Sub: arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-membership-external
+              - Fn::Sub: arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-room-requests
+              - Fn::Sub: arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-room-requests-status
+              # Index accesses
+              - Fn::Sub: arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-stripe-links/index/*
+              - Fn::Sub: arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-events/index/*
+              - Fn::Sub: arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-merchstore-purchase-history/index/*
+              - Fn::Sub: arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-room-requests/index/*
+              - Fn::Sub: arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-room-requests-status/index/*
 
           - Sid: DynamoDBCacheAccess
             Effect: Allow
@@ -94,15 +102,6 @@ Resources:
             Resource:
               - Fn::Sub: arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-rate-limiter
 
-          - Sid: DynamoDBIndexAccess
-            Effect: Allow
-            Action:
-              - dynamodb:Query
-            Resource:
-              - Fn::Sub: arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-stripe-links/index/*
-              - Fn::Sub: arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-events/index/*
-              - Fn::Sub: arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-merchstore-purchase-history/index/*
-
           - Sid: DynamoDBStreamAccess
             Effect: Allow
             Action:
@@ -211,6 +210,19 @@ Resources:
                   ForAllValues:StringLike:
                     ses:Recipients:
                       - "*@illinois.edu"
+        - PolicyName: ses-notifications
+          PolicyDocument:
+            Version: "2012-10-17"
+            Statement:
+              - Action:
+                  - ses:SendEmail
+                  - ses:SendRawEmail
+                Effect: Allow
+                Resource: "*"
+                Condition:
+                  StringEquals:
+                    ses:FromAddress:
+                      Fn::Sub: "notifications@${SesEmailDomain}"
         - PolicyName: ses-sales
           PolicyDocument:
             Version: "2012-10-17"

cloudformation/main.yml

@@ -307,6 +307,70 @@ Resources:
         - AttributeName: netid_list
           KeyType: HASH
 
+  RoomRequestsTable:
+    Type: "AWS::DynamoDB::Table"
+    DeletionPolicy: "Retain"
+    UpdateReplacePolicy: "Retain"
+    Properties:
+      BillingMode: "PAY_PER_REQUEST"
+      TableName: infra-core-api-room-requests
+      DeletionProtectionEnabled: true
+      PointInTimeRecoverySpecification:
+        PointInTimeRecoveryEnabled: !If [IsProd, true, false]
+      AttributeDefinitions:
+        - AttributeName: userId#requestId
+          AttributeType: S
+        - AttributeName: requestId
+          AttributeType: S
+        - AttributeName: semesterId
+          AttributeType: S
+      KeySchema:
+        - AttributeName: semesterId
+          KeyType: HASH
+        - AttributeName: userId#requestId
+          KeyType: RANGE
+      GlobalSecondaryIndexes:
+        - IndexName: RequestIdIndex
+          KeySchema:
+            - AttributeName: requestId
+              KeyType: HASH
+          Projection:
+            ProjectionType: ALL
+
+  RoomRequestUpdatesTable:
+    Type: "AWS::DynamoDB::Table"
+    DeletionPolicy: "Retain"
+    UpdateReplacePolicy: "Retain"
+    Properties:
+      BillingMode: "PAY_PER_REQUEST"
+      TableName: infra-core-api-room-requests-status
+      DeletionProtectionEnabled: true
+      PointInTimeRecoverySpecification:
+        PointInTimeRecoveryEnabled: !If [IsProd, true, false]
+      AttributeDefinitions:
+        - AttributeName: requestId
+          AttributeType: S
+        - AttributeName: semesterId
+          AttributeType: S
+        - AttributeName: createdAt#status
+          AttributeType: S
+      KeySchema:
+        - AttributeName: requestId
+          KeyType: HASH
+        - AttributeName: createdAt#status
+          KeyType: RANGE
+      GlobalSecondaryIndexes:
+        - IndexName: SemesterId
+          KeySchema:
+            - AttributeName: semesterId
+              KeyType: HASH
+            - AttributeName: requestId
+              KeyType: RANGE
+          Projection:
+            ProjectionType: ALL
+
+
+
   IamGroupRolesTable:
     Type: "AWS::DynamoDB::Table"
     DeletionPolicy: "Retain"

src/api/index.ts

@@ -27,6 +27,7 @@ import stripeRoutes from "./routes/stripe.js";
 import membershipPlugin from "./routes/membership.js";
 import path from "path"; // eslint-disable-line import/no-nodejs-modules
 import sigleadRoutes from "./routes/siglead.js";
+import roomRequestRoutes from "./routes/roomRequests.js";
 
 dotenv.config();
 
@@ -135,6 +136,7 @@ async function init(prettyPrint: boolean = false) {
       api.register(mobileWalletRoute, { prefix: "/mobileWallet" });
       api.register(stripeRoutes, { prefix: "/stripe" });
       api.register(sigleadRoutes, { prefix: "/siglead" });
+      api.register(roomRequestRoutes, { prefix: "/roomRequests" });
       if (app.runEnvironment === "dev") {
         api.register(vendingPlugin, { prefix: "/vending" });
       }