#1592 Fix Cr Bug

Author: Peyton-McKee

src/backend/src/services/change-requests.services.ts

@@ -579,12 +579,20 @@ export default class ChangeRequestsService {
     const project = createdCR.wbsElement.workPackage?.project || createdCR.wbsElement.project;
     const teams = project?.teams;
     if (teams && teams.length > 0) {
-      teams.forEach(async (team) => {
+      const completion: Promise<void>[] = teams.map(async (team) => {
         const slackMsg =
           `${type} CR submitted by ${submitter.firstName} ${submitter.lastName} ` +
           `for the ${project.wbsElement.name} project`;
-        await sendSlackChangeRequestNotification(team, slackMsg, createdCR.crId);
+        try {
+          await sendSlackChangeRequestNotification(team, slackMsg, createdCR.crId);
+        } catch (error) {
+          if (error instanceof Error) {
+            throw new HttpException(511, `Failed to send slack notification for CR: ${createdCR.crId}`);
+          }
+        }
       });
+
+      await Promise.all(completion);
     }
 
     return createdCR.crId;

src/frontend/src/pages/CreateChangeRequestPage/CreateChangeRequest.tsx

@@ -44,31 +44,46 @@ const CreateChangeRequest: React.FC<CreateChangeRequestProps> = () => {
 
   const { userId } = auth.user;
 
+  const addProposedSolutions = async (crId: number) => {
+    proposedSolutions.forEach(async (ps) => {
+      const { description, timelineImpact, scopeImpact, budgetImpact } = ps;
+
+      await cpsMutateAsync({
+        crId,
+        submitterId: userId,
+        description,
+        timelineImpact,
+        scopeImpact,
+        budgetImpact
+      });
+    });
+  };
+
   const handleConfirm = async (data: FormInput) => {
+    let crId: number;
     try {
       const cr = await mutateAsync({
         ...data,
         wbsNum: validateWBS(wbsNum)
       });
-      const crId = parseInt(cr.message);
-      proposedSolutions.forEach(async (ps) => {
-        const { description, timelineImpact, scopeImpact, budgetImpact } = ps;
-
-        await cpsMutateAsync({
-          crId,
-          submitterId: userId,
-          description,
-          timelineImpact,
-          scopeImpact,
-          budgetImpact
-        });
-      });
-
-      history.push(routes.CHANGE_REQUESTS);
+      crId = parseInt(cr.message);
     } catch (e) {
       if (e instanceof Error) {
+        if (e.message.startsWith('Failed to send slack notification for CR: ')) {
+          const splitMessage = e.message.split(': ');
+          crId = parseInt(splitMessage[1]);
+          try {
+            await addProposedSolutions(crId);
+          } catch (e) {
+            if (e instanceof Error) {
+              toast.error(e.message);
+            }
+          }
+        }
         toast.error(e.message);
       }
+    } finally {
+      history.push(routes.CHANGE_REQUESTS);
     }
   };