read from external membership v2 table

Author: devksingh4

src/api/functions/membership.ts

@@ -30,12 +30,14 @@ export async function checkExternalMembership(
   const { Items } = await dynamoClient.send(
     new QueryCommand({
       TableName: genericConfig.ExternalMembershipTableName,
-      KeyConditionExpression: "#pk = :pk",
+      KeyConditionExpression: "#pk = :pk and #sk = :sk",
       ExpressionAttributeNames: {
-        "#pk": "netid_list",
+        "#pk": "netId",
+        "#sk": "memberList",
       },
       ExpressionAttributeValues: marshall({
-        ":pk": `${netId}_${list}`,
+        ":pk": netId,
+        ":sk": list,
       }),
     }),
   );

src/common/config.ts

@@ -85,7 +85,7 @@ const genericConfig: GenericConfigType = {
   IAMTablePrefix: "infra-core-api-iam",
   ProtectedEntraIDGroups: [infraChairsGroupId, officersGroupId],
   MembershipTableName: "infra-core-api-membership-provisioning",
-  ExternalMembershipTableName: "infra-core-api-membership-external",
+  ExternalMembershipTableName: "infra-core-api-membership-external-v2",
   RoomRequestsTableName: "infra-core-api-room-requests",
   RoomRequestsStatusTableName: "infra-core-api-room-requests-status",
   AuditLogTable: "infra-core-api-audit-log",

tests/unit/membership.test.ts

@@ -80,15 +80,24 @@ describe("Test membership routes", async () => {
     ddbMock.on(QueryCommand).callsFake((command) => {
       if (command.TableName === genericConfig.ExternalMembershipTableName) {
         const requestedEmail = command.ExpressionAttributeValues[":pk"].S;
+        const requestedList = command.ExpressionAttributeValues[":sk"].S;
+        const requestedKey = `${requestedEmail}_${requestedList}`;
         const mockMembershipData = {
-          eadon2_built: { netid_list: "eadon2_built" },
-          yourm4_wcs: { netid_list: "yourm4_wcs" },
+          eadon2_built: { netId: "eadon2", list: "built" },
+          yourm4_wcs: { netId: "yourm4", list: "wcs" },
         };
 
         return Promise.resolve({
-          Items: mockMembershipData[requestedEmail]
-            ? [marshall(mockMembershipData[requestedEmail])]
-            : [],
+          Items:
+            requestedKey in mockMembershipData
+              ? [
+                  marshall(
+                    mockMembershipData[
+                      requestedKey as keyof typeof mockMembershipData
+                    ],
+                  ),
+                ]
+              : [],
         });
       }
       return Promise.reject(new Error("Table not mocked"));