api for dynamodb addMember done

* siglead management screen fix choppy nav
* moved id -> name record into commons
* created add member post route
* implemented backend add member to dynamodb
* still need to check if member already exists and add to azure

Author: eeen17

src/api/functions/siglead.ts

@@ -1,16 +1,22 @@
 import {
+  AttributeValue,
   DynamoDBClient,
+  PutItemCommand,
+  PutItemCommandInput,
   QueryCommand,
   ScanCommand,
 } from "@aws-sdk/client-dynamodb";
 import { unmarshall } from "@aws-sdk/util-dynamodb";
-import { OrganizationList } from "common/orgs.js";
+import { OrganizationList, orgIds2Name } from "common/orgs.js";
 import {
+  DynamoDBItem,
   SigDetailRecord,
   SigMemberCount,
   SigMemberRecord,
+  SigMemberUpdateRecord,
 } from "common/types/siglead.js";
 import { transformSigLeadToURI } from "common/utils.js";
+import { KeyObject } from "crypto";
 import { string } from "zod";
 
 export async function fetchMemberRecords(
@@ -84,32 +90,44 @@ export async function fetchSigCounts(
 
   const result = await dynamoClient.send(scan);
 
-  const ids2Name: Record<string, string> = {};
-  OrganizationList.forEach((org) => {
-    const sigid = transformSigLeadToURI(org);
-    ids2Name[sigid] = org;
-  });
-
   const counts: Record<string, number> = {};
+  // Object.entries(orgIds2Name).forEach(([id, _]) => {
+  //   counts[id] = 0;
+  // });
+
   (result.Items || []).forEach((item) => {
     const sigGroupId = item.sigGroupId?.S;
     if (sigGroupId) {
       counts[sigGroupId] = (counts[sigGroupId] || 0) + 1;
     }
   });
 
-  const joined: Record<string, [string, number]> = {};
-  Object.keys(counts).forEach((sigid) => {
-    joined[sigid] = [ids2Name[sigid], counts[sigid]];
-  });
-
-  const countsArray: SigMemberCount[] = Object.entries(joined).map(
-    ([sigid, [signame, count]]) => ({
-      sigid,
-      signame,
+  const countsArray: SigMemberCount[] = Object.entries(counts).map(
+    ([id, count]) => ({
+      sigid: id,
+      signame: orgIds2Name[id],
       count,
     }),
   );
   console.log(countsArray);
   return countsArray;
 }
+
+export async function addMemberToSig(
+  sigMemberTableName: string,
+  sigMemberUpdateRequest: SigMemberUpdateRecord,
+  dynamoClient: DynamoDBClient,
+) {
+  const item: Record<string, AttributeValue> = {};
+  Object.entries(sigMemberUpdateRequest).forEach(([k, v]) => {
+    item[k] = { S: v };
+  });
+  const input: PutItemCommandInput = {
+    Item: item,
+    ReturnConsumedCapacity: "TOTAL",
+    TableName: sigMemberTableName,
+  };
+  // console.log(input);
+  const put = new PutItemCommand(input);
+  const response = await dynamoClient.send(put);
+}

src/api/routes/siglead.ts

@@ -8,13 +8,16 @@ import {
   SigleadGetRequest,
   SigMemberCount,
   SigMemberRecord,
+  SigMemberUpdateRecord,
 } from "common/types/siglead.js";
 import {
+  addMemberToSig,
   fetchMemberRecords,
   fetchSigCounts,
   fetchSigDetail,
 } from "api/functions/siglead.js";
 import { intersection } from "api/plugins/auth.js";
+import { request } from "http";
 
 const sigleadRoutes: FastifyPluginAsync = async (fastify, _options) => {
   const limitedRoutes: FastifyPluginAsync = async (fastify) => {
@@ -97,36 +100,47 @@ const sigleadRoutes: FastifyPluginAsync = async (fastify, _options) => {
     );
 
     // fetch sig count
-    fastify.get<SigleadGetRequest>(
-      "/sigcount",
-      {
-        onRequest: async (request, reply) => {
-          /*await fastify.authorize(request, reply, [
-              AppRoles.LINKS_MANAGER,
-              AppRoles.LINKS_ADMIN,
-            ]);*/
-        },
-      },
+    fastify.get<SigleadGetRequest>("/sigcount", async (request, reply) => {
+      // First try-catch: Fetch owner records
+      let sigMemCounts: SigMemberCount[];
+      try {
+        sigMemCounts = await fetchSigCounts(
+          genericConfig.SigleadDynamoSigMemberTableName,
+          fastify.dynamoClient,
+        );
+      } catch (error) {
+        request.log.error(
+          `Failed to fetch sig member counts record: ${error instanceof Error ? error.toString() : "Unknown error"}`,
+        );
+        throw new DatabaseFetchError({
+          message:
+            "Failed to fetch sig member counts record from Dynamo table.",
+        });
+      }
+
+      // Send the response
+      reply.code(200).send(sigMemCounts);
+    });
+
+    // add member
+    fastify.post<{ Body: SigMemberUpdateRecord }>(
+      "/addMember",
       async (request, reply) => {
-        // First try-catch: Fetch owner records
-        let sigMemCounts: SigMemberCount[];
         try {
-          sigMemCounts = await fetchSigCounts(
+          await addMemberToSig(
             genericConfig.SigleadDynamoSigMemberTableName,
+            request.body,
             fastify.dynamoClient,
           );
         } catch (error) {
           request.log.error(
-            `Failed to fetch sig member counts record: ${error instanceof Error ? error.toString() : "Unknown error"}`,
+            `Failed to add member: ${error instanceof Error ? error.toString() : "Unknown error"}`,
           );
           throw new DatabaseFetchError({
-            message:
-              "Failed to fetch sig member counts record from Dynamo table.",
+            message: "Failed to add sig member record to Dynamo table.",
           });
         }
-
-        // Send the response
-        reply.code(200).send(sigMemCounts);
+        reply.code(200);
       },
     );
   };

src/common/orgs.ts

@@ -1,3 +1,5 @@
+import { transformSigLeadToURI } from "./utils.js";
+
 export const SIGList = [
   "SIGPwny",
   "SIGCHI",
@@ -28,3 +30,10 @@ export const CommitteeList = [
   "Marketing Committee",
 ] as [string, ...string[]];
 export const OrganizationList = ["ACM", ...SIGList, ...CommitteeList] as [string, ...string[]];
+
+const orgIds2Name: Record<string, string> = {};
+OrganizationList.forEach((org) => {
+  const sigid = transformSigLeadToURI(org);
+  orgIds2Name[sigid] = org;
+});
+export { orgIds2Name };

src/common/types/siglead.ts

@@ -21,4 +21,28 @@ export type SigMemberCount = {
   sigid: string;
   signame: string;
   count: number;
-};
+};
+
+export type SigMemberUpdateRecord = {
+  sigGroupId: string;
+  email: string;
+  id: string;
+  memberName: string;
+  designation: string;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export type SigMemberUpdateRequest = {
+  
+}
+
+export type DynamoDBItem = {
+  Item: {
+    [key: string]: {
+      [key: string]: string;
+    };
+  };
+  ReturnConsumedCapacity: string;
+  TableName: string;
+}

src/common/utils.ts

@@ -56,4 +56,16 @@ export function transformSigLeadToURI(org: string) {
     .replace(/-{2,}/g, "-");
 
   return org === "-" ? "" : org;
+}
+
+export function getTimeInFormat() {
+  const date = new Date();
+  const year = date.getUTCFullYear();
+  const month = String(date.getUTCMonth() + 1).padStart(2, '0');
+  const day = String(date.getUTCDate()).padStart(2, '0');
+  const hours = String(date.getUTCHours()).padStart(2, '0');
+  const minutes = String(date.getUTCMinutes()).padStart(2, '0');
+  const seconds = String(date.getUTCSeconds()).padStart(2, '0');
+
+  return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}Z`;
 }

src/ui/Router.tsx

@@ -25,7 +25,10 @@ import { ManageProfilePage } from "./pages/profile/ManageProfile.page";
 import { ManageStripeLinksPage } from "./pages/stripe/ViewLinks.page";
 import { ManageRoomRequestsPage } from "./pages/roomRequest/RoomRequestLanding.page";
 import { ManageSigLeadsPage } from "./pages/siglead/ManageSigLeads.page";
-import { ViewSigLeadPage } from "./pages/siglead/ViewSigLead.page";
+import {
+  AddMemberToSigPage,
+  ViewSigLeadPage,
+} from "./pages/siglead/ViewSigLead.page";
 import { ViewRoomRequest } from "./pages/roomRequest/ViewRoomRequest.page";
 import { ViewLogsPage } from "./pages/logs/ViewLogs.page";
 import { TermsOfService } from "./pages/tos/TermsOfService.page";
@@ -197,6 +200,10 @@ const authenticatedRouter = createBrowserRouter([
     path: "/siglead-management/:sigId",
     element: <ViewSigLeadPage />,
   },
+  {
+    path: "/siglead-management/:sigId/addMember",
+    element: <AddMemberToSigPage />,
+  },
   {
     path: "/roomRequests",
     element: <ManageRoomRequestsPage />,

src/ui/pages/siglead/SigScreenComponents.tsx

@@ -2,10 +2,12 @@ import React, { useEffect, useMemo, useState } from "react";
 import { OrganizationList } from "@common/orgs";
 import { NavLink, Paper } from "@mantine/core";
 import { IconUsersGroup } from "@tabler/icons-react";
-import { useLocation } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
 import { SigMemberCount } from "@common/types/siglead";
 
 const renderSigLink = (sigMemCount: SigMemberCount, index: number) => {
+  const navigate = useNavigate();
+
   const color =
     "light-dark(var(--mantine-color-black), var(--mantine-color-white))";
   const size = "18px";
@@ -14,7 +16,7 @@ const renderSigLink = (sigMemCount: SigMemberCount, index: number) => {
   const count = sigMemCount.count;
   return (
     <NavLink
-      href={`${useLocation().pathname}/${id}`}
+      onClick={() => navigate(`./${id}`)}
       active={index % 2 === 0}
       label={name}
       color="var(--mantine-color-blue-light)"

src/ui/pages/siglead/ViewSigLead.page.tsx

@@ -18,14 +18,20 @@ import { DateTimePicker } from "@mantine/dates";
 import { useForm, zodResolver } from "@mantine/form";
 import { notifications } from "@mantine/notifications";
 import dayjs from "dayjs";
-import React, { useEffect, useState } from "react";
+import React, { FC, useEffect, useState } from "react";
 import { useNavigate, useParams } from "react-router-dom";
 import { z } from "zod";
 import { AuthGuard } from "@ui/components/AuthGuard";
 import { getRunEnvironmentConfig } from "@ui/config";
 import { useApi } from "@ui/util/api";
 import { AppRoles } from "@common/roles";
-import { SigDetailRecord, SigMemberRecord } from "@common/types/siglead.js";
+import {
+  SigDetailRecord,
+  SigMemberRecord,
+  SigMemberUpdateRecord,
+} from "@common/types/siglead.js";
+import { getTimeInFormat } from "@common/utils";
+import { orgIds2Name } from "@common/orgs";
 
 export const ViewSigLeadPage: React.FC = () => {
   const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
@@ -162,7 +168,9 @@ export const ViewSigLeadPage: React.FC = () => {
             <Stack>
               <Button variant="white">Member Count: {sigMembers.length}</Button>
 
-              <Button>Add Member</Button>
+              <Button onClick={() => navigate("./addMember")}>
+                Add Member
+              </Button>
               <Button
                 onClick={() => navigate("../siglead-management")}
                 variant="outline"
@@ -191,3 +199,59 @@ export const ViewSigLeadPage: React.FC = () => {
     </AuthGuard>
   );
 };
+
+export const AddMemberToSigPage: FC = () => {
+  const { sigId } = useParams();
+  const api = useApi("core");
+
+  async function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+    const formData = new FormData(event.currentTarget);
+    // console.log(formData)
+    const data = Object.fromEntries(
+      formData.entries(),
+    ) as SigMemberUpdateRecord;
+    data.designation = "M";
+    data.sigGroupId = sigId || "";
+    data.createdAt = getTimeInFormat();
+    data.updatedAt = data.createdAt;
+    // console.log(data)
+    await api.post(`/api/v1/siglead/addMember`, data);
+  }
+
+  return (
+    <AuthGuard
+      resourceDef={{ service: "core", validRoles: [AppRoles.SIGLEAD_MANAGER] }}
+    >
+      <h1>Add Member to {orgIds2Name[sigId || "acm"]}</h1>
+      <form id="form" onSubmit={handleSubmit}>
+        <label htmlFor="email">email: </label>
+        <input
+          type="email"
+          name="email"
+          id="email"
+          placeholder="[email protected]"
+        />
+        <br />
+        <label htmlFor="id">uuid: </label>
+        <input
+          type="text"
+          name="id"
+          id="id"
+          placeholder="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+        />
+        <br />
+        <label htmlFor="memberName">name: </label>
+        <input
+          type="text"
+          name="memberName"
+          id="memberName"
+          placeholder="John Doe"
+        />
+        <br />
+        {/* <button type="submit" onSubmit={handleSubmit}>Submit</button> */}
+        <button type="submit">Submit</button>
+      </form>
+    </AuthGuard>
+  );
+};