chore(release): Test and deploy to Production v7.51.2 (#10366)

Signed-off-by: Matt Krick <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com> Co-authored-by: Nick O'Ferrall <[email protected]> Co-authored-by: Georg Bremer <[email protected]> Co-authored-by: Matt Krick <[email protected]> Co-authored-by: Rafael Romero <[email protected]> Co-authored-by: Rafa <[email protected]> Co-authored-by: Jordan Husney <[email protected]> Co-authored-by: Bruce Tian <[email protected]> Co-authored-by: Terry Acker <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: snyk-bot <[email protected]> Co-authored-by: GitHub Action <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Dale Bumblis <[email protected]> Co-authored-by: github-actions <[email protected]>
ParabolInc · Oct 17, 2024 · fd4c17d · fd4c17d
1 parent cedc8ea
commit fd4c17d
Show file tree

Hide file tree

Showing 34 changed files with 411 additions and 37 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.51.1"
+  ".": "7.51.2"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.51.2](https://github.com/ParabolInc/parabol/compare/v7.51.1...v7.51.2) (2024-10-17)
+
+
+### Changed
+
+* **rethinkdb:** Notification: Phase 1 ([#10350](https://github.com/ParabolInc/parabol/issues/10350)) ([3964c7c](https://github.com/ParabolInc/parabol/commit/3964c7c9d639bf28f3ae90c780c66f3c999ae0cd))
+
 ## [7.51.1](https://github.com/ParabolInc/parabol/compare/v7.51.0...v7.51.1) (2024-10-17)
 
 

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <[email protected]> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.51.1",
+  "version": "7.51.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"

diff --git a/packages/chronos/package.json b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.51.1",
+  "version": "7.51.2",
   "description": "A cron job scheduler",
   "author": "Matt Krick <[email protected]>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.51.1"
+    "parabol-server": "7.51.2"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <[email protected]> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.51.1",
+  "version": "7.51.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"

diff --git a/packages/embedder/package.json b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.51.1",
+  "version": "7.51.2",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <[email protected]>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",

diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.51.1",
+  "version": "7.51.2",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <[email protected]>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -26,8 +26,8 @@
   },
   "dependencies": {
     "dd-trace": "^5.0.0",
-    "parabol-client": "7.51.1",
-    "parabol-server": "7.51.1",
+    "parabol-client": "7.51.2",
+    "parabol-server": "7.51.2",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <[email protected]> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.51.1",
+  "version": "7.51.2",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/packages/server/billing/helpers/removeTeamsLimitObjects.ts b/packages/server/billing/helpers/removeTeamsLimitObjects.ts
@@ -12,6 +12,13 @@ const removeTeamsLimitObjects = async (orgId: string, dataLoader: DataLoaderWork
   // Remove team limits jobs and existing notifications
   const [, updateNotificationsChanges] = await Promise.all([
     pg
+      .with('NotificationUpdate', (qb) =>
+        qb
+          .updateTable('Notification')
+          .set({status: 'CLICKED'})
+          .where('orgId', '=', orgId)
+          .where('type', 'in', removeNotificationTypes)
+      )
       .deleteFrom('ScheduledJob')
       .where('orgId', '=', orgId)
       .where('type', 'in', removeJobTypes)

diff --git a/packages/server/billing/helpers/teamLimitsCheck.ts b/packages/server/billing/helpers/teamLimitsCheck.ts
@@ -47,6 +47,7 @@ const sendWebsiteNotifications = async (
   userIds: string[],
   dataLoader: DataLoaderWorker
 ) => {
+  const pg = getKysely()
   const {id: orgId, name: orgName, picture: orgPicture} = organization
   const operationId = dataLoader.share()
   const subOptions = {operationId}
@@ -60,7 +61,7 @@ const sendWebsiteNotifications = async (
   })
 
   await r.table('Notification').insert(notificationsToInsert).run()
-
+  await pg.insertInto('Notification').values(notificationsToInsert).execute()
   notificationsToInsert.forEach((notification) => {
     publishNotification(notification, subOptions)
   })

diff --git a/packages/server/database/types/NotificationPaymentRejected.ts b/packages/server/database/types/NotificationPaymentRejected.ts
@@ -10,14 +10,14 @@ interface Input {
 export default class NotificationPaymentRejected extends Notification {
   readonly type = 'PAYMENT_REJECTED'
   orgId: string
-  last4: string
+  last4: number
   brand: string
 
   constructor(input: Input) {
     const {orgId, last4, brand, userId} = input
     super({userId, type: 'PAYMENT_REJECTED'})
     this.orgId = orgId
-    this.last4 = String(last4)
+    this.last4 = Number(last4)
     this.brand = brand
   }
 }
diff --git a/packages/server/database/types/processTeamsLimitsJob.ts b/packages/server/database/types/processTeamsLimitsJob.ts
@@ -46,7 +46,7 @@ const processTeamsLimitsJob = async (job: ScheduledTeamLimitsJob, dataLoader: Da
     })
 
     await r.table('Notification').insert(notificationsToInsert).run()
-
+    await getKysely().insertInto('Notification').values(notificationsToInsert).execute()
     const operationId = dataLoader.share()
     const subOptions = {operationId}
     notificationsToInsert.forEach((notification) => {

diff --git a/packages/server/graphql/mutations/archiveTeam.ts b/packages/server/graphql/mutations/archiveTeam.ts
@@ -4,6 +4,7 @@ import TeamMemberId from '../../../client/shared/gqlIds/TeamMemberId'
 import {maybeRemoveRestrictions} from '../../billing/helpers/teamLimitsCheck'
 import getRethink from '../../database/rethinkDriver'
 import NotificationTeamArchived from '../../database/types/NotificationTeamArchived'
+import getKysely from '../../postgres/getKysely'
 import removeMeetingTemplatesForTeam from '../../postgres/queries/removeMeetingTemplatesForTeam'
 import safeArchiveTeam from '../../safeMutations/safeArchiveTeam'
 import {analytics} from '../../utils/analytics/analytics'
@@ -30,6 +31,7 @@ export default {
     {teamId}: {teamId: string},
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) {
+    const pg = getKysely()
     const r = await getRethink()
     const operationId = dataLoader.share()
     const subOptions = {operationId, mutatorId}
@@ -70,6 +72,7 @@ export default {
 
     if (notifications.length) {
       await r.table('Notification').insert(notifications).run()
+      await pg.insertInto('Notification').values(notifications).execute()
     }
 
     const data = {

diff --git a/packages/server/graphql/mutations/createTask.ts b/packages/server/graphql/mutations/createTask.ts
@@ -68,6 +68,7 @@ const handleAddTaskNotifications = async (
   teamId: string,
   subOptions: SubOptions
 ) => {
+  const pg = getKysely()
   const r = await getRethink()
   const {id: taskId, content, tags, userId} = task
   const usersIdsToIgnore = await getUsersToIgnore(viewerId, teamId)
@@ -107,8 +108,8 @@ const handleAddTaskNotifications = async (
   const data = {taskId, notifications: notificationsToAdd}
 
   if (notificationsToAdd.length) {
-    // don't await to speed up task creation
-    r.table('Notification').insert(notificationsToAdd).run()
+    await r.table('Notification').insert(notificationsToAdd).run()
+    await pg.insertInto('Notification').values(notificationsToAdd).execute()
     notificationsToAdd.forEach((notification) => {
       publish(
         SubscriptionChannel.NOTIFICATION,

diff --git a/packages/server/graphql/mutations/helpers/inviteToTeamHelper.ts b/packages/server/graphql/mutations/helpers/inviteToTeamHelper.ts
@@ -154,6 +154,7 @@ const inviteToTeamHelper = async (
   })
   if (notificationsToInsert.length > 0) {
     await r.table('Notification').insert(notificationsToInsert).run()
+    await pg.insertInto('Notification').values(notificationsToInsert).execute()
   }
 
   const bestMeeting = await getBestInvitationMeeting(teamId, meetingId ?? undefined, dataLoader)

diff --git a/packages/server/graphql/mutations/helpers/notifications/SlackNotifier.ts b/packages/server/graphql/mutations/helpers/notifications/SlackNotifier.ts
@@ -6,14 +6,14 @@ import {phaseLabelLookup} from 'parabol-client/utils/meetings/lookups'
 import TeamPromptResponseId from '../../../../../client/shared/gqlIds/TeamPromptResponseId'
 import {ErrorResponse, PostMessageResponse} from '../../../../../client/utils/SlackManager'
 import appOrigin from '../../../../appOrigin'
-import {RethinkSchema} from '../../../../database/rethinkDriver'
 import SlackAuth from '../../../../database/types/SlackAuth'
 import {SlackNotificationAuth} from '../../../../dataloader/integrationAuthLoaders'
 import getKysely from '../../../../postgres/getKysely'
 import {getTeamPromptResponsesByMeetingId} from '../../../../postgres/queries/getTeamPromptResponsesByMeetingIds'
 import {SlackNotification, Team, TeamPromptResponse} from '../../../../postgres/types'
 import User from '../../../../postgres/types/IUser'
 import {AnyMeeting, MeetingTypeEnum} from '../../../../postgres/types/Meeting'
+import {AnyNotification} from '../../../../postgres/types/Notification'
 import SlackServerManager from '../../../../utils/SlackServerManager'
 import {analytics} from '../../../../utils/analytics/analytics'
 import {toEpochSeconds} from '../../../../utils/epochTime'
@@ -245,7 +245,7 @@ const addStandupResponsesToThread = async (
 
 const getSlackMessageForNotification = async (
   dataLoader: DataLoaderWorker,
-  notification: RethinkSchema['Notification']['type'],
+  notification: AnyNotification,
   meeting: AnyMeeting,
   userId: string
 ) => {
@@ -277,6 +277,7 @@ const getSlackMessageForNotification = async (
       buttonText: 'See the discussion'
     }
   } else if (notification.type === 'RESPONSE_MENTIONED') {
+    // Notification Phase 3 do not split the responseId
     const responseId = TeamPromptResponseId.split(notification.responseId)
     const response = await dataLoader.get('teamPromptResponses').loadNonNull(responseId)
     const author = await dataLoader.get('users').loadNonNull(response.userId)

diff --git a/packages/server/graphql/mutations/helpers/publishChangeNotifications.ts b/packages/server/graphql/mutations/helpers/publishChangeNotifications.ts
@@ -2,6 +2,7 @@ import {ASSIGNEE, MENTIONEE} from 'parabol-client/utils/constants'
 import getTypeFromEntityMap from 'parabol-client/utils/draftjs/getTypeFromEntityMap'
 import getRethink from '../../../database/rethinkDriver'
 import NotificationTaskInvolves from '../../../database/types/NotificationTaskInvolves'
+import getKysely from '../../../postgres/getKysely'
 import {Task} from '../../../postgres/types'
 import {analytics} from '../../../utils/analytics/analytics'
 
@@ -11,6 +12,7 @@ const publishChangeNotifications = async (
   changeUser: {id: string; email: string},
   usersToIgnore: string[]
 ) => {
+  const pg = getKysely()
   const r = await getRethink()
   const changeAuthorId = `${changeUser.id}::${task.teamId}`
   const {entityMap: oldEntityMap, blocks: oldBlocks} = JSON.parse(oldTask.content)
@@ -84,6 +86,7 @@ const publishChangeNotifications = async (
   // update changes in the db
   if (notificationsToAdd.length) {
     await r.table('Notification').insert(notificationsToAdd).run()
+    await pg.insertInto('Notification').values(notificationsToAdd).execute()
   }
   return {notificationsToAdd}
 }

diff --git a/packages/server/graphql/mutations/helpers/removeTeamMember.ts b/packages/server/graphql/mutations/helpers/removeTeamMember.ts
@@ -104,6 +104,7 @@ const removeTeamMember = async (
     const notification = new NotificationKickedOut({teamId, userId, evictorUserId})
     notificationId = notification.id
     await r.table('Notification').insert(notification).run()
+    await pg.insertInto('Notification').values(notification).execute()
   }
 
   const archivedTaskIds = await archiveTasksForDB(integratedTasksToArchive)

diff --git a/packages/server/graphql/mutations/moveTeamToOrg.ts b/packages/server/graphql/mutations/moveTeamToOrg.ts
@@ -4,8 +4,6 @@ import adjustUserCount from '../../billing/helpers/adjustUserCount'
 import getRethink from '../../database/rethinkDriver'
 import {RDatum} from '../../database/stricterR'
 import getKysely from '../../postgres/getKysely'
-import updateMeetingTemplateOrgId from '../../postgres/queries/updateMeetingTemplateOrgId'
-import updateTeamByTeamId from '../../postgres/queries/updateTeamByTeamId'
 import safeArchiveEmptyStarterOrganization from '../../safeMutations/safeArchiveEmptyStarterOrganization'
 import {Logger} from '../../utils/Logger'
 import {getUserId, isSuperUser} from '../../utils/authorization'
@@ -96,8 +94,21 @@ const moveToOrg = async (
       .filter((notification: RDatum) => notification('orgId').default(null).ne(null))
       .update({orgId})
       .run(),
-    updateMeetingTemplateOrgId(currentOrgId, orgId),
-    updateTeamByTeamId(updates, teamId)
+    pg
+      .with('NotificationUpdate', (qb) =>
+        qb
+          .updateTable('Notification')
+          .set({orgId})
+          .where('teamId', '=', teamId)
+          .where('orgId', 'is not', null)
+      )
+      .with('MeetingTemplateUpdate', (qb) =>
+        qb.updateTable('MeetingTemplate').set({orgId}).where('orgId', '=', currentOrgId)
+      )
+      .updateTable('Team')
+      .set(updates)
+      .where('id', '=', teamId)
+      .execute()
   ])
   dataLoader.clearAll('teams')
   // if no teams remain on the org, remove it

diff --git a/packages/server/graphql/mutations/setNotificationStatus.ts b/packages/server/graphql/mutations/setNotificationStatus.ts
@@ -1,6 +1,7 @@
 import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getRethink from '../../database/rethinkDriver'
+import getKysely from '../../postgres/getKysely'
 import {getUserId} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
@@ -27,6 +28,7 @@ export default {
     {notificationId, status}: {notificationId: string; status: NotificationStatusEnumType},
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) {
+    const pg = getKysely()
     const r = await getRethink()
     const operationId = dataLoader.share()
     const subOptions = {mutatorId, operationId}
@@ -41,6 +43,7 @@ export default {
 
     // RESOLUTION
     await r.table('Notification').get(notificationId).update({status}).run()
+    await pg.updateTable('Notification').set({status}).where('id', '=', notificationId).execute()
     // mutate dataloader cache
     notification.status = status
 

diff --git a/packages/server/graphql/private/mutations/__tests__/intranetJobsQuery.test.js b/packages/server/graphql/private/mutations/__tests__/intranetJobsQuery.test.js
@@ -4,6 +4,7 @@ import MockDB from '../../../../__tests__/setup/MockDB'
 import {__anHourAgo, __now, __overADayAgo} from '../../../../__tests__/setup/mockTimes'
 import getRethink from '../../../../database/rethinkDriver'
 import {sendBatchEmail} from '../../../../email/sendEmail'
+import getKysely from '../../../../postgres/getKysely'
 import sendBatchNotificationEmails from '../sendBatchNotificationEmails'
 
 // Manage side-effects
@@ -20,6 +21,7 @@ describe('sendBatchNotificationEmails', () => {
     // global DB state, there's no getting around this.
     const r = await getRethink()
     await r.table('Notification').delete()
+    await sql`TRUNCATE TABLE "Notification"`.execute(getKysely())
   })
 
   it('requires the superuser role', async () => {

diff --git a/packages/server/graphql/private/mutations/runScheduledJobs.ts b/packages/server/graphql/private/mutations/runScheduledJobs.ts
@@ -33,8 +33,10 @@ const processMeetingStageTimeLimits = async (
     meetingId,
     userId: facilitatorUserId!
   })
+  const pg = getKysely()
   const r = await getRethink()
   await r.table('Notification').insert(notification).run()
+  await pg.insertInto('Notification').values(notification).execute()
   publish(SubscriptionChannel.NOTIFICATION, facilitatorUserId!, 'MeetingStageTimeLimitPayload', {
     notification
   })

diff --git a/packages/server/graphql/private/mutations/stripeFailPayment.ts b/packages/server/graphql/private/mutations/stripeFailPayment.ts
@@ -3,6 +3,7 @@ import Stripe from 'stripe'
 import terminateSubscription from '../../../billing/helpers/terminateSubscription'
 import getRethink from '../../../database/rethinkDriver'
 import NotificationPaymentRejected from '../../../database/types/NotificationPaymentRejected'
+import getKysely from '../../../postgres/getKysely'
 import {isSuperUser} from '../../../utils/authorization'
 import publish from '../../../utils/publish'
 import {getStripeManager} from '../../../utils/stripe'
@@ -25,6 +26,7 @@ const stripeFailPayment: MutationResolvers['stripeFailPayment'] = async (
     throw new Error('Don’t be rude.')
   }
 
+  const pg = getKysely()
   const r = await getRethink()
   const manager = getStripeManager()
 
@@ -103,6 +105,7 @@ const stripeFailPayment: MutationResolvers['stripeFailPayment'] = async (
   await r({
     insert: r.table('Notification').insert(notifications)
   }).run()
+  await pg.insertInto('Notification').values(notifications).execute()
 
   notifications.forEach((notification) => {
     const data = {orgId, notificationId: notification.id}

diff --git a/packages/server/graphql/public/mutations/addComment.ts b/packages/server/graphql/public/mutations/addComment.ts
@@ -73,6 +73,7 @@ const addComment: MutationResolvers['addComment'] = async (
   {comment},
   {authToken, dataLoader, socketId: mutatorId}
 ) => {
+  const pg = getKysely()
   const r = await getRethink()
   const viewerId = getUserId(authToken)
   const operationId = dataLoader.share()
@@ -130,6 +131,7 @@ const addComment: MutationResolvers['addComment'] = async (
       })
 
       await r.table('Notification').insert(notification).run()
+      await pg.insertInto('Notification').values(notification).execute()
 
       IntegrationNotifier.sendNotificationToUser?.(dataLoader, notification.id, notification.userId)
       publishNotification(notification, subOptions)
@@ -146,6 +148,7 @@ const addComment: MutationResolvers['addComment'] = async (
 
   if (notificationsToAdd.length) {
     await r.table('Notification').insert(notificationsToAdd).run()
+    await pg.insertInto('Notification').values(notificationsToAdd).execute()
     notificationsToAdd.forEach((notification) => {
       publishNotification(notification, subOptions)
     })