Use user settings when publishing web push events

Author: mikebroberts

src/app/domain/user/userNotifyable.ts

@@ -0,0 +1,40 @@
+import { AppState } from '../../environment/AppState'
+import { GithubUserId, GithubWorkflowKey } from '../types/GithubKeys'
+import { calculateUserSettings } from './calculatedUserSettings'
+import { getUserSettings } from './persistedUserSettings'
+import { getWorkflowsForUser } from './userVisible'
+import { logger } from '../../util/logging'
+
+export async function filterWorkflowNotifyEnabled(
+  appState: AppState,
+  userIds: GithubUserId[],
+  workflow: GithubWorkflowKey
+): Promise<GithubUserId[]> {
+  const enabledUserIds = []
+  for (const userId of userIds) {
+    if (await getWorkflowNotifyEnabledForUser(appState, userId, workflow)) {
+      enabledUserIds.push(userId)
+    }
+  }
+  return enabledUserIds
+}
+
+export async function getWorkflowNotifyEnabledForUser(
+  appState: AppState,
+  userId: GithubUserId,
+  workflow: GithubWorkflowKey
+) {
+  const userSettings = calculateUserSettings(
+    await getUserSettings(appState, userId),
+    await getWorkflowsForUser(appState, userId)
+  )
+  const yesNotify = userSettings.github.accounts
+    .get(workflow.ownerId)
+    ?.repos.get(workflow.repoId)
+    ?.workflows.get(workflow.workflowId)?.notify
+  if (yesNotify === undefined) {
+    logger.warn(`No calculated user notify setting for workflow`, { workflow, userSettings })
+    return false
+  }
+  return yesNotify
+}

src/app/domain/webPush/cicadaEventWebPushPublisher.ts

@@ -10,6 +10,7 @@ import {
 } from '../github/githubWorkflowRunEvent'
 import { isCicadaEventBridgeDetail } from '../../outboundInterfaces/eventBridgeBus'
 import { CicadaWebNotification } from '../../outboundInterfaces/webPushWrapper'
+import { filterWorkflowNotifyEnabled } from '../user/userNotifyable'
 
 // TOEventually - these are going to create a lot of queries for subscription lookup for large organizations
 // May be better to have one table / index for this.
@@ -24,10 +25,12 @@ export async function handleNewWorkflowRunEvent(appState: AppState, eventDetail:
   }
 
   const workflowRunEvent = eventDetail.data
+  const userIds = await getRelatedMemberIdsForRunEvent(appState, workflowRunEvent)
+  const notifyEnabledUserIds = await filterWorkflowNotifyEnabled(appState, userIds, workflowRunEvent)
 
   await publishToSubscriptionsForUsers(
     appState,
-    await getRelatedMemberIdsForRunEvent(appState, workflowRunEvent),
+    notifyEnabledUserIds,
     generateRunEventNotification(workflowRunEvent)
   )
 }
@@ -45,7 +48,7 @@ export function generateRunEventNotification(
   }
 }
 
-// TOEventually - add this back when notification preferences added
+// TOEventually - add this back now that notification preferences added, maybe
 // export async function handleNewPush(appState: AppState, eventDetail: unknown) {
 //   if (!isCicadaEventBridgeDetail(eventDetail) || !isGithubPush(eventDetail.data)) {
 //     logger.error(

src/cdk/stacks/main/userFacingWeb.ts

@@ -80,7 +80,12 @@ function defineWebPushPublisher(scope: Construct, props: UserFacingWebEndpointsP
   const lambdaFunction = new CicadaFunction(
     scope,
     cicadaFunctionProps(props, 'webPushPublisher', {
-      tablesReadAccess: ['web-push-subscriptions', 'github-account-memberships']
+      tablesReadAccess: [
+        'web-push-subscriptions',
+        'github-account-memberships',
+        'github-latest-workflow-runs',
+        'user-settings'
+      ]
     })
   )
   new Rule(scope, 'WebPushPublisherRule', {