feat: Add GraphQL notification settings for MS Teams and Mattermost

codegen.json

@@ -161,6 +161,7 @@
           "SetDefaultSlackChannelSuccess": "./types/SetDefaultSlackChannelSuccess#SetDefaultSlackChannelSuccessSource",
           "SetMeetingSettingsPayload": "../types/SetMeetingSettingsPayload#SetMeetingSettingsPayloadSource",
           "SetNotificationStatusPayload": "./types/SetNotificationStatusPayload#SetNotificationStatusPayloadSource",
+          "SetNotificationSettingSuccess": "./types/SetNotificationSettingSuccess#SetNotificationSettingSuccessSource",
           "SetOrgUserRoleSuccess": "./types/SetOrgUserRoleSuccess#SetOrgUserRoleSuccessSource",
           "SetSlackNotificationPayload": "./types/SetSlackNotificationPayload#SetSlackNotificationPayloadSource",
           "ShareTopicSuccess": "./types/ShareTopicSuccess#ShareTopicSuccessSource",

packages/client/modules/teamDashboard/components/ProviderRow/MattermostProviderRow.tsx

@@ -52,7 +52,7 @@ const MattermostProviderRow = (props: Props) => {
   const {mattermost} = integrations
   const {auth} = mattermost
 
-  if (window.__ACTION__.mattermostDisabled) return null
+  if (window.__ACTION__.mattermostGlobal || window.__ACTION__.mattermostDisabled) return null
 
   return (
     <>

packages/client/shared/gqlIds/TeamMemberIntegrationAuthId.ts

@@ -1,8 +1,8 @@
 const TeamMemberIntegrationAuthId = {
-  join: (service: string, teamId: string, userId: string) => `${service}:${teamId}:${userId}`,
-  split: (id: string) => {
-    const [service, teamId, userId] = id.split(':')
-    return {service, teamId, userId}
+  join: (dbId: number) => `TeamMemberIntegrationAuth:${dbId}`,
+  split: (gqlId: string) => {
+    const [_, id] = gqlId.split(':')
+    return Number.parseInt(id!)!
   }
 }
 

packages/client/types/modules.d.ts

@@ -32,6 +32,7 @@ interface Window {
     google: string
     googleAnalytics: string
     mattermostDisabled: boolean | undefined
+    mattermostGlobal: boolean | undefined
     msTeamsDisabled: boolean | undefined
     publicPath: string
     sentry: string

packages/server/dataloader/azureDevOpsLoaders.ts

@@ -138,11 +138,13 @@ export const freshAzureDevOpsAuth = (
     async (keys) => {
       const results = await Promise.allSettled(
         keys.map(async ({userId, teamId}) => {
-          const azureDevOpsAuthToRefresh = await parent.get('teamMemberIntegrationAuths').load({
-            service: 'azureDevOps',
-            teamId,
-            userId
-          })
+          const azureDevOpsAuthToRefresh = await parent
+            .get('teamMemberIntegrationAuthsByServiceTeamAndUserId')
+            .load({
+              service: 'azureDevOps',
+              teamId,
+              userId
+            })
           if (azureDevOpsAuthToRefresh === null) {
             return null
           }

packages/server/dataloader/gcalLoaders.ts

@@ -10,11 +10,13 @@ export const freshGcalAuth = (parent: RootDataLoader) => {
     async (keys) => {
       const results = await Promise.allSettled(
         keys.map(async ({teamId, userId}) => {
-          const gcalAuth = await parent.get('teamMemberIntegrationAuths').load({
-            service: 'gcal',
-            teamId,
-            userId
-          })
+          const gcalAuth = await parent
+            .get('teamMemberIntegrationAuthsByServiceTeamAndUserId')
+            .load({
+              service: 'gcal',
+              teamId,
+              userId
+            })
           if (!gcalAuth) return null
           const {expiresAt} = gcalAuth
           const now = new Date()

packages/server/dataloader/gitlabLoaders.ts

@@ -10,11 +10,13 @@ export const freshGitlabAuth = (parent: RootDataLoader) => {
     async (keys) => {
       const results = await Promise.allSettled(
         keys.map(async ({teamId, userId}) => {
-          const gitlabAuth = await parent.get('teamMemberIntegrationAuths').load({
-            service: 'gitlab',
-            teamId,
-            userId
-          })
+          const gitlabAuth = await parent
+            .get('teamMemberIntegrationAuthsByServiceTeamAndUserId')
+            .load({
+              service: 'gitlab',
+              teamId,
+              userId
+            })
           if (!gitlabAuth) return null
           const {expiresAt} = gitlabAuth
           const now = new Date()

packages/server/dataloader/integrationAuthLoaders.ts

@@ -1,20 +1,18 @@
 import DataLoader from 'dataloader'
-import TeamMemberIntegrationAuthId from '../../client/shared/gqlIds/TeamMemberIntegrationAuthId'
 import errorFilter from '../graphql/errorFilter'
 import isValid from '../graphql/isValid'
 import getKysely from '../postgres/getKysely'
-import {IGetBestTeamIntegrationAuthQueryResult} from '../postgres/queries/generated/getBestTeamIntegrationAuthQuery'
 import {IntegrationProviderServiceEnum} from '../postgres/queries/generated/getIntegrationProvidersByIdsQuery'
-import getBestTeamIntegrationAuth from '../postgres/queries/getBestTeamIntegrationAuth'
 import getIntegrationProvidersByIds, {
   TIntegrationProvider
 } from '../postgres/queries/getIntegrationProvidersByIds'
 import {selectSlackNotifications, selectTeamMemberIntegrationAuth} from '../postgres/select'
 import {SlackAuth, SlackNotification, TeamMemberIntegrationAuth} from '../postgres/types'
+import {NotificationSettings} from '../postgres/types/pg'
 import NullableDataLoader from './NullableDataLoader'
 import RootDataLoader from './RootDataLoader'
 
-interface TeamMemberIntegrationAuthPrimaryKey {
+interface TeamMemberIntegrationAuthServiceTeamUserKey {
   service: IntegrationProviderServiceEnum
   teamId: string
   userId: string
@@ -32,7 +30,7 @@ const teamMemberIntegrationAuthCacheKeyFn = ({
   service,
   teamId,
   userId
-}: TeamMemberIntegrationAuthPrimaryKey) => TeamMemberIntegrationAuthId.join(service, teamId, userId)
+}: TeamMemberIntegrationAuthServiceTeamUserKey) => `${service}-${teamId}-${userId}`
 
 export const integrationProviders = (parent: RootDataLoader) => {
   return new NullableDataLoader<number, TIntegrationProvider, string>(
@@ -87,40 +85,9 @@ export const sharedIntegrationProviders = (parent: RootDataLoader) => {
   )
 }
 
-export const bestTeamIntegrationProviders = (parent: RootDataLoader) => {
-  return new DataLoader<TeamMemberIntegrationAuthPrimaryKey, TIntegrationProvider | null, string>(
-    async (keys) => {
-      // given token params, get the best team token
-      const bestTeamIntegrationAuths = (
-        await parent.get('bestTeamIntegrationAuths').loadMany(keys)
-      ).filter(isValid)
-      // dedupe providerIds
-      const providerIds = Array.from(
-        new Set(bestTeamIntegrationAuths.map((token) => token.providerId))
-      )
-      // get the providers for each token
-      const integrationProviders = (
-        await parent.get('integrationProviders').loadMany(providerIds)
-      ).filter(isValid)
-      return keys.map((key) => {
-        const token = bestTeamIntegrationAuths.find(
-          ({service, teamId}) => service === key.service && teamId === key.teamId
-        )
-        if (!token) return null
-        const provider = integrationProviders.find(({id}) => id === token.providerId)
-        return provider ?? null
-      })
-    },
-    {
-      ...parent.dataLoaderOptions,
-      cacheKeyFn: teamMemberIntegrationAuthCacheKeyFn
-    }
-  )
-}
-
-export const teamMemberIntegrationAuths = (parent: RootDataLoader) => {
+export const teamMemberIntegrationAuthsByServiceTeamAndUserId = (parent: RootDataLoader) => {
   return new DataLoader<
-    TeamMemberIntegrationAuthPrimaryKey,
+    TeamMemberIntegrationAuthServiceTeamUserKey,
     TeamMemberIntegrationAuth | null,
     string
   >(
@@ -150,29 +117,6 @@ export const teamMemberIntegrationAuths = (parent: RootDataLoader) => {
   )
 }
 
-export const bestTeamIntegrationAuths = (parent: RootDataLoader) => {
-  return new DataLoader<
-    TeamMemberIntegrationAuthPrimaryKey,
-    IGetBestTeamIntegrationAuthQueryResult | null,
-    string
-  >(
-    async (keys) => {
-      // TODO check the teamMemberIntegrationAuths loader first, it probably exists there & then we don't have to hit the DB
-      const results = await Promise.allSettled(
-        keys.map(async ({service, teamId, userId}) =>
-          getBestTeamIntegrationAuth(service, teamId, userId)
-        )
-      )
-      const vals = results.map((result) => (result.status === 'fulfilled' ? result.value : null))
-      return vals
-    },
-    {
-      ...parent.dataLoaderOptions,
-      cacheKeyFn: teamMemberIntegrationAuthCacheKeyFn
-    }
-  )
-}
-
 interface TeamNotificationEvent {
   teamId: string
   event: SlackNotification['event']
@@ -220,21 +164,25 @@ export const slackNotificationsByTeamIdAndEvent = (parent: RootDataLoader) => {
   })
 }
 
-export const teamMemberIntegrationAuthsByTeamId = (parent: RootDataLoader) => {
+export const teamMemberIntegrationAuthsByTeamIdAndEvent = (parent: RootDataLoader) => {
   return new DataLoader<
-    {teamId: string; service: IntegrationProviderServiceEnum},
+    {teamId: string; service: IntegrationProviderServiceEnum; event: SlackNotification['event']},
     TeamMemberIntegrationAuth[],
     string
   >(
     async (keys) => {
       const pg = getKysely()
-      const teamIds = keys.map(({teamId}) => teamId)
-      const services = keys.map(({service}) => service)
       const res = (await pg
         .selectFrom('TeamMemberIntegrationAuth')
+        .innerJoin('NotificationSettings', 'authId', 'TeamMemberIntegrationAuth.id')
         .selectAll()
-        .where(({eb}) => eb('teamId', 'in', teamIds))
-        .where(({eb}) => eb('service', 'in', services))
+        .where(({eb, refTuple, tuple}) =>
+          eb(
+            refTuple('teamId', 'service', 'event'),
+            'in',
+            keys.map(({teamId, service, event}) => tuple(teamId, service, event))
+          )
+        )
         .execute()) as unknown as TeamMemberIntegrationAuth[]
 
       return keys.map((key) =>
@@ -247,3 +195,21 @@ export const teamMemberIntegrationAuthsByTeamId = (parent: RootDataLoader) => {
     }
   )
 }
+
+export const notificationSettingsByAuthId = (parent: RootDataLoader) => {
+  return new DataLoader<number, NotificationSettings['event'][], string>(
+    async (keys) => {
+      const pg = getKysely()
+      const res = await pg
+        .selectFrom('NotificationSettings')
+        .selectAll()
+        .where(({eb}) => eb('authId', 'in', keys))
+        .execute()
+
+      return keys.map((key) => res.filter(({authId}) => authId === key).map(({event}) => event))
+    },
+    {
+      ...parent.dataLoaderOptions
+    }
+  )
+}

packages/server/dataloader/jiraServerLoaders.ts

@@ -65,7 +65,7 @@ export const jiraServerIssue = (parent: RootDataLoader) => {
       const results = await Promise.allSettled(
         keys.map(async ({teamId, userId, issueId}) => {
           const auth = await parent
-            .get('teamMemberIntegrationAuths')
+            .get('teamMemberIntegrationAuthsByServiceTeamAndUserId')
             .load({service: 'jiraServer', teamId, userId})
 
           if (!auth) {
@@ -110,7 +110,7 @@ export const allJiraServerProjects = (parent: RootDataLoader) => {
     return Promise.all(
       keys.map(async ({userId, teamId}) => {
         const auth = await parent
-          .get('teamMemberIntegrationAuths')
+          .get('teamMemberIntegrationAuthsByServiceTeamAndUserId')
           .load({service: 'jiraServer', teamId, userId})
         if (!auth) return []
         const provider = await parent.get('integrationProviders').loadNonNull(auth.providerId)
@@ -140,7 +140,7 @@ export const jiraServerFieldTypes = (parent: RootDataLoader) =>
       return Promise.all(
         keys.map(async ({teamId, userId, projectId, issueType}) => {
           const auth = await parent
-            .get('teamMemberIntegrationAuths')
+            .get('teamMemberIntegrationAuthsByServiceTeamAndUserId')
             .load({service: 'jiraServer', teamId, userId})
 
           if (!auth) {

packages/server/dataloader/primaryKeyLoaderMakers.ts

@@ -156,3 +156,11 @@ export const tasks = primaryKeyLoaderMaker((ids: readonly string[]) => {
 export const notifications = primaryKeyLoaderMaker((ids: readonly string[]) => {
   return selectNotifications().where('id', 'in', ids).execute()
 })
+
+export const teamMemberIntegrationAuths = primaryKeyLoaderMaker((ids: readonly number[]) => {
+  return getKysely()
+    .selectFrom('TeamMemberIntegrationAuth')
+    .selectAll()
+    .where('id', 'in', ids)
+    .execute()
+})

packages/server/graphql/mutations/helpers/notifications/MSTeamsNotifier.ts

@@ -7,6 +7,7 @@ import {IntegrationProviderMSTeams as IIntegrationProviderMSTeams} from '../../.
 import {SlackNotification, Team} from '../../../../postgres/types'
 import IUser from '../../../../postgres/types/IUser'
 import {AnyMeeting, MeetingTypeEnum} from '../../../../postgres/types/Meeting'
+import {NotificationSettings} from '../../../../postgres/types/pg'
 import MSTeamsServerManager from '../../../../utils/MSTeamsServerManager'
 import {analytics} from '../../../../utils/analytics/analytics'
 import sendToSentry from '../../../../utils/sendToSentry'
@@ -333,20 +334,28 @@ export const MSTeamsNotificationHelper: NotificationIntegrationHelper<MSTeamsNot
   }
 })
 
-async function getMSTeams(dataLoader: DataLoaderWorker, teamId: string, userId: string) {
-  const [provider, user] = await Promise.all([
-    dataLoader.get('bestTeamIntegrationProviders').load({service: 'msTeams', teamId, userId}),
+async function getMSTeams(
+  dataLoader: DataLoaderWorker,
+  teamId: string,
+  userId: string,
+  event: NotificationSettings['event']
+) {
+  const [auths, user] = await Promise.all([
+    dataLoader
+      .get('teamMemberIntegrationAuthsByTeamIdAndEvent')
+      .load({service: 'msTeams', teamId, event}),
     dataLoader.get('users').loadNonNull(userId)
   ])
-  return provider && provider.teamId
-    ? [
-        MSTeamsNotificationHelper({
-          ...(provider as IntegrationProviderMSTeams),
-          userId,
-          email: user.email
-        })
-      ]
-    : []
+  return Promise.all(
+    auths.map(async (auth) => {
+      const provider = await dataLoader.get('integrationProviders').loadNonNull(auth.providerId)
+      return MSTeamsNotificationHelper({
+        ...(provider as IntegrationProviderMSTeams),
+        userId,
+        email: user.email
+      })
+    })
+  )
 }
 
 export const MSTeamsNotifier = createNotifier(getMSTeams)