test button for azure api

Author: eeen17

src/api/functions/entraId.ts

@@ -29,7 +29,7 @@ import { SecretsManagerClient } from "@aws-sdk/client-secrets-manager";
 import { DynamoDBClient } from "@aws-sdk/client-dynamodb";
 import { checkPaidMembershipFromTable } from "./membership.js";
 
-function validateGroupId(groupId: string): boolean {
+export function validateGroupId(groupId: string): boolean {
   const groupIdPattern = /^[a-zA-Z0-9-]+$/; // Adjust the pattern as needed
   return groupIdPattern.test(groupId);
 }

src/api/functions/siglead.ts

@@ -1,12 +1,14 @@
 import {
   AttributeValue,
   DynamoDBClient,
+  GetItemCommand,
   PutItemCommand,
   PutItemCommandInput,
   QueryCommand,
   ScanCommand,
 } from "@aws-sdk/client-dynamodb";
 import { unmarshall } from "@aws-sdk/util-dynamodb";
+import { DatabaseInsertError } from "common/errors/index.js";
 import { OrganizationList, orgIds2Name } from "common/orgs.js";
 import {
   DynamoDBItem,
@@ -113,7 +115,7 @@ export async function fetchSigCounts(
   return countsArray;
 }
 
-export async function addMemberToSig(
+export async function addMemberToSigDynamo(
   sigMemberTableName: string,
   sigMemberUpdateRequest: SigMemberUpdateRecord,
   dynamoClient: DynamoDBClient,
@@ -122,12 +124,50 @@ export async function addMemberToSig(
   Object.entries(sigMemberUpdateRequest).forEach(([k, v]) => {
     item[k] = { S: v };
   });
-  const input: PutItemCommandInput = {
+
+  // put into table
+  const put = new PutItemCommand({
     Item: item,
     ReturnConsumedCapacity: "TOTAL",
     TableName: sigMemberTableName,
-  };
-  // console.log(input);
-  const put = new PutItemCommand(input);
-  const response = await dynamoClient.send(put);
+  });
+  try {
+    const response = await dynamoClient.send(put);
+    console.log(response);
+  } catch (e) {
+    console.error("Put to dynamo db went wrong.");
+    throw e;
+  }
+
+  // fetch from db and check if fetched item update time = input item update time
+  const validatePutQuery = new GetItemCommand({
+    TableName: sigMemberTableName,
+    Key: {
+      sigGroupId: { S: sigMemberUpdateRequest.sigGroupId },
+      email: { S: sigMemberUpdateRequest.email },
+    },
+    ProjectionExpression: "updatedAt",
+  });
+
+  try {
+    const response = await dynamoClient.send(validatePutQuery);
+    const item = response.Item;
+
+    if (!item || !item.updatedAt?.S) {
+      throw new Error("Item not found or missing 'updatedAt'");
+    }
+
+    if (item.updatedAt.S !== sigMemberUpdateRequest.updatedAt) {
+      throw new DatabaseInsertError({
+        message: "The member exists, but was updated by someone else!",
+      });
+    }
+  } catch (e) {
+    console.error("Validate DynamoDB get went wrong.", e);
+    throw e;
+  }
+}
+
+export async function addMemberToSigEntra() {
+  // uuid validation not implemented yet
 }

src/api/routes/siglead.ts

@@ -11,7 +11,7 @@ import {
   SigMemberUpdateRecord,
 } from "common/types/siglead.js";
 import {
-  addMemberToSig,
+  addMemberToSigDynamo,
   fetchMemberRecords,
   fetchSigCounts,
   fetchSigDetail,
@@ -127,7 +127,7 @@ const sigleadRoutes: FastifyPluginAsync = async (fastify, _options) => {
       "/addMember",
       async (request, reply) => {
         try {
-          await addMemberToSig(
+          await addMemberToSigDynamo(
             genericConfig.SigleadDynamoSigMemberTableName,
             request.body,
             fastify.dynamoClient,

src/common/types/siglead.ts

@@ -33,10 +33,6 @@ export type SigMemberUpdateRecord = {
   updatedAt: string;
 }
 
-export type SigMemberUpdateRequest = {
-  
-}
-
 export type DynamoDBItem = {
   Item: {
     [key: string]: {

src/common/utils.ts

@@ -29,7 +29,7 @@ const reservedCharsRegex = /[:\/?#\[\]@!$&'()*+,;=]/g;
  * @returns {string} - The transformed organization name, ready for use as a URL.
  */
 export function transformSigLeadToURI(org: string) {
-  console.log(`org\t${org}`)
+  // console.log(`org\t${org}`)
   org = org
     // change not reserved chars to spaces
     .trim()

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

@@ -219,6 +219,13 @@ export const AddMemberToSigPage: FC = () => {
     await api.post(`/api/v1/siglead/addMember`, data);
   }
 
+  async function testAddGroup() {
+    await api.patch(
+      `/api/v1/iam/groups/:e37a2420-1030-48da-9d17-f7e201b446e1`,
+      { add: ["d115c8cb-2520-4ba4-bc36-dd55af69c590"], remove: [] },
+    );
+  }
+
   return (
     <AuthGuard
       resourceDef={{ service: "core", validRoles: [AppRoles.SIGLEAD_MANAGER] }}
@@ -252,6 +259,9 @@ export const AddMemberToSigPage: FC = () => {
         {/* <button type="submit" onSubmit={handleSubmit}>Submit</button> */}
         <button type="submit">Submit</button>
       </form>
+      <button type="button" onClick={testAddGroup}>
+        Test
+      </button>
     </AuthGuard>
   );
 };