Merge branch 'multitenancy' into develop

Author: Peyton-McKee

src/backend/src/prisma-query-args/design-reviews.query-args.ts

@@ -14,6 +14,7 @@ export const getDesignReviewQueryArgs = (organizationId: string) =>
       deniedMembers: getUserQueryArgs(organizationId),
       attendees: getUserQueryArgs(organizationId),
       userDeleted: getUserQueryArgs(organizationId),
-      wbsElement: true
+      wbsElement: true,
+      notificationSlackThreads: true,
     }
   });

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

@@ -141,15 +141,18 @@ export default class ChangeRequestsService {
         accepted,
         dateReviewed: new Date()
       },
-      include: { activationChangeRequest: true, wbsElement: { include: { workPackage: true } } }
+      include: {
+        activationChangeRequest: true,
+        notificationSlackThreads: true,
+        wbsElement: { include: { workPackage: true } }
+      }
     });
 
     // send the creator of the cr a slack notification that their cr was reviewed
     await sendCRSubmitterReviewedNotification(foundCR);
 
     // send a reply to a CR's notifications of its updated status
-    const relevantThreads = await prisma.message_Info.findMany({ where: { changeRequestId: foundCR.crId } });
-    await sendSlackCRStatusToThread(relevantThreads, foundCR.crId, accepted);
+    await sendSlackCRStatusToThread(updated.notificationSlackThreads, foundCR.crId, accepted);
 
     return updated.crId;
   }

src/backend/src/services/design-reviews.services.ts

@@ -306,7 +306,6 @@ export default class DesignReviewsService {
     // actually try to update the design review
     const updatedDesignReview = await prisma.design_Review.update({
       where: { designReviewId },
-      ...getDesignReviewQueryArgs(organizationId),
       data: {
         designReviewId,
         dateScheduled,
@@ -327,12 +326,12 @@ export default class DesignReviewsService {
         attendees: {
           set: updatedAttendees
         }
-      }
+      },
+      ...getDesignReviewQueryArgs(organizationId)
     });
 
     if (status === Design_Review_Status.SCHEDULED) {
-      const relevantThreads = await prisma.message_Info.findMany({ where: {} });
-      await sendDRScheduledSlackNotif(relevantThreads, updatedDesignReview);
+      await sendDRScheduledSlackNotif(updatedDesignReview.notificationSlackThreads, updatedDesignReview);
     }
 
     return designReviewTransformer(updatedDesignReview);
@@ -397,8 +396,7 @@ export default class DesignReviewsService {
         }
       });
 
-      const relevantThreads = await prisma.message_Info.findMany({ where: { designReviewId: designReview.designReviewId } });
-      await sendDRUserConfirmationToThread(relevantThreads, submitter);
+      await sendDRUserConfirmationToThread(updatedDesignReview.notificationSlackThreads, submitter);
 
       // If all required attendees have confirmed their schedule, mark design review as confirmed
       if (areUsersinList(designReview.requiredMembers, updatedDesignReview.confirmedMembers)) {