bring in latest develop and fix conflicts

Enterprise-CMCS · Dec 11, 2024 · 78e514f · 78e514f
2 parents c827c39 + 35fbd00
commit 78e514f
Show file tree

Hide file tree

Showing 13 changed files with 284 additions and 112 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -59,6 +59,8 @@ jobs:
       name: ${{ startsWith(github.ref_name, 'snyk-') && 'snyk' || github.ref_name }}
       url: "https://onemac.cms.gov"
     steps:
+      - name: Check GITHUB_REF
+        run: echo "GITHUB_REF is $GITHUB_REF"
       - name: set branch_name
         run: echo "branch_name=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
       - name: Check branch name is a legal serverless stage name

diff --git a/services/app-api/getDetail.js b/services/app-api/getDetail.js
@@ -87,7 +87,7 @@ export const getDetails = async (event) => {
     if (!userRoleObj.isCMSUser && result.Item.reviewTeam)
       delete result.Item.reviewTeam;
 
-    result.Item.actions = getActionsForPackage(
+    result.Item.actions = await getActionsForPackage(
       result.Item.componentType,
       originalStatus,
       !!result.Item.latestRaiResponseTimestamp,

diff --git a/services/app-api/getMyPackages.js b/services/app-api/getMyPackages.js
@@ -19,106 +19,102 @@ export const getMyPackages = async (email, group) => {
   if (!email) return RESPONSE_CODE.USER_NOT_FOUND;
   if (!group) return RESPONSE_CODE.DATA_MISSING;
 
-  return getUser(email)
-    .then((user) => {
-      if (!user) throw RESPONSE_CODE.USER_NOT_AUTHORIZED;
+  try {
+    const user = await getUser(email);
+    if (!user) throw RESPONSE_CODE.USER_NOT_AUTHORIZED;
 
-      const userRoleObj = getUserRoleObj(user.roleList);
-      const territoryList = getActiveTerritories(user.roleList);
-      const statusMap = userRoleObj.isCMSUser
-        ? cmsStatusUIMap
-        : stateStatusUIMap;
+    const userRoleObj = getUserRoleObj(user.roleList);
+    const territoryList = getActiveTerritories(user.roleList);
+    const statusMap = userRoleObj.isCMSUser ? cmsStatusUIMap : stateStatusUIMap;
 
-      if (
-        !userRoleObj.canAccessDashboard ||
-        (Array.isArray(territoryList) && territoryList.length === 0)
-      ) {
-        throw RESPONSE_CODE.USER_NOT_AUTHORIZED;
-      }
+    if (
+      !userRoleObj.canAccessDashboard ||
+      (Array.isArray(territoryList) && territoryList.length === 0)
+    ) {
+      throw RESPONSE_CODE.USER_NOT_AUTHORIZED;
+    }
 
-      const baseParams = {
-        TableName: process.env.oneMacTableName,
-        IndexName: "GSI1",
-        ExclusiveStartKey: null,
-        ScanIndexForward: false,
-        ProjectionExpression:
-          "componentId,componentType,currentStatus,submissionTimestamp,latestRaiResponseTimestamp,lastActivityTimestamp,submitterName,submitterEmail,waiverAuthority, cpocName, reviewTeam, subStatus, finalDispositionDate",
-      };
-      const grouppk = "OneMAC#" + group;
-      let paramList = [];
-      if (territoryList[0] !== "N/A") {
-        paramList = territoryList.map((territory) => {
-          return {
-            ...baseParams,
-            KeyConditionExpression: "GSI1pk = :pk AND begins_with(GSI1sk,:t1)",
-            ExpressionAttributeValues: {
-              ":pk": grouppk,
-              ":t1": territory,
-            },
-          };
-        });
-      } else {
-        paramList = [
-          {
-            ...baseParams,
-            KeyConditionExpression: "GSI1pk = :pk",
-            ExpressionAttributeValues: {
-              ":pk": grouppk,
-            },
+    const baseParams = {
+      TableName: process.env.oneMacTableName,
+      IndexName: "GSI1",
+      ExclusiveStartKey: null,
+      ScanIndexForward: false,
+      ProjectionExpression:
+        "componentId,componentType,currentStatus,submissionTimestamp,latestRaiResponseTimestamp,lastActivityTimestamp,submitterName,submitterEmail,waiverAuthority, cpocName, reviewTeam, subStatus, finalDispositionDate",
+    };
+    const grouppk = "OneMAC#" + group;
+    let paramList = [];
+    if (territoryList[0] !== "N/A") {
+      paramList = territoryList.map((territory) => {
+        return {
+          ...baseParams,
+          KeyConditionExpression: "GSI1pk = :pk AND begins_with(GSI1sk,:t1)",
+          ExpressionAttributeValues: {
+            ":pk": grouppk,
+            ":t1": territory,
           },
-        ];
-      }
+        };
+      });
+    } else {
+      paramList = [
+        {
+          ...baseParams,
+          KeyConditionExpression: "GSI1pk = :pk",
+          ExpressionAttributeValues: {
+            ":pk": grouppk,
+          },
+        },
+      ];
+    }
 
-      return Promise.all(
-        paramList.map(async (params) => {
-          const promiseItems = [];
-          do {
-            const results = await dynamoDb.query(params);
-            results.Items.map((oneItem) => {
-              oneItem.actions = getActionsForPackage(
-                oneItem.componentType,
-                oneItem.currentStatus,
-                !!oneItem.latestRaiResponseTimestamp,
-                oneItem.subStatus,
-                userRoleObj,
-                "package"
-              );
-              if (oneItem.waiverAuthority)
-                oneItem.temporaryExtensionType = oneItem.waiverAuthority.slice(
-                  0,
-                  7
-                );
+    // Using a for...of loop to ensure async operations are awaited correctly
+    const allItems = [];
+    for (const params of paramList) {
+      const promiseItems = [];
+      do {
+        const results = await dynamoDb.query(params);
+        for (const oneItem of results.Items) {
+          oneItem.actions = await getActionsForPackage(
+            oneItem.componentType,
+            oneItem.currentStatus,
+            !!oneItem.latestRaiResponseTimestamp,
+            oneItem.subStatus,
+            userRoleObj,
+            "package"
+          );
+          if (oneItem.waiverAuthority)
+            oneItem.temporaryExtensionType = oneItem.waiverAuthority.slice(
+              0,
+              7
+            );
 
-              if (statusMap[oneItem.subStatus]) {
-                oneItem.subStatus = statusMap[oneItem.subStatus];
-              }
+          if (statusMap[oneItem.subStatus]) {
+            oneItem.subStatus = statusMap[oneItem.subStatus];
+          }
 
-              if (!statusMap[oneItem.currentStatus])
-                console.log(
-                  "%s status of %s not mapped!",
-                  oneItem.pk,
-                  oneItem.currentStatus
-                );
-              else {
-                oneItem.currentStatus = statusMap[oneItem.currentStatus];
-                if (
-                  oneItem.currentStatus !== Workflow.ONEMAC_STATUS.INACTIVATED
-                )
-                  promiseItems.push(oneItem);
-              }
-            });
-            params.ExclusiveStartKey = results.LastEvaluatedKey;
-          } while (params.ExclusiveStartKey);
-          return promiseItems;
-        })
-      ).then((values) => {
-        return values.flat();
-      });
-    })
-    .catch((error) => {
-      console.log("error is: ", error);
-      return error;
-    });
+          if (!statusMap[oneItem.currentStatus])
+            console.log(
+              "%s status of %s not mapped!",
+              oneItem.pk,
+              oneItem.currentStatus
+            );
+          else {
+            oneItem.currentStatus = statusMap[oneItem.currentStatus];
+            if (oneItem.currentStatus !== Workflow.ONEMAC_STATUS.INACTIVATED)
+              promiseItems.push(oneItem);
+          }
+        }
+        params.ExclusiveStartKey = results.LastEvaluatedKey;
+      } while (params.ExclusiveStartKey);
+
+      allItems.push(...promiseItems);
+    }
+
+    return allItems; // Flattened list of all items
+  } catch (error) {
+    console.log("error is: ", error);
+    return error;
+  }
 };
 
 // get the approver list for a rols and possibly a territory

diff --git a/services/app-api/package-lock.json b/services/app-api/package-lock.json
diff --git a/services/app-api/package.json b/services/app-api/package.json
@@ -14,8 +14,8 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.5",
-    "aws-sdk-client-mock": "^0.5.6",
     "aws-sdk": "^2.752.0",
+    "aws-sdk-client-mock": "^0.5.6",
     "esbuild": "^0.19.4",
     "esbuild-jest": "^0.5.0",
     "jest": "^29.7.0",
@@ -28,6 +28,7 @@
     "xstate": "^4.26.0"
   },
   "dependencies": {
+    "@launchdarkly/node-server-sdk": "^9.7.2",
     "cmscommonlib": "file:../common",
     "date-fns": "^2.16.1",
     "dynamodb-local": "^0.0.32",

diff --git a/services/app-api/serverless.yml b/services/app-api/serverless.yml
@@ -33,6 +33,7 @@ custom:
   applicationEndpoint: ${cf:ui-${self:custom.stage}.ApplicationEndpointUrl, "onemac.cms.gov"}
   attachmentsBucket: ${cf:uploads-${self:custom.stage}.AttachmentsBucketName}
   attachmentsBucketArn: ${cf:uploads-${self:custom.stage}.AttachmentsBucketArn}
+  launchDarklySdkKey: ${ssm:/configuration/${self:custom.stage}/launchdarkly/sdkkey, ssm:/configuration/default/launchdarkly/sdkkey}
   warmupEnabled:
     production: true
     development: false
@@ -87,6 +88,7 @@ provider:
     applicationEndpoint: ${self:custom.applicationEndpoint}
     attachmentsBucket: ${self:custom.attachmentsBucket}
     configurationSetName: 'email-${self:custom.stage}-configuration'
+    launchDarklySdkKey: ${self:custom.launchDarklySdkKey}
   tracing:
     apiGateway: true
     lambda: true