chore(rethinkdb): TeamInvitation: Phase 3

packages/server/database/rethinkDriver.ts

@@ -1,5 +1,4 @@
 import {MasterPool, r} from 'rethinkdb-ts'
-import {TeamInvitation} from '../postgres/types/index'
 import getRethinkConfig from './getRethinkConfig'
 import {R} from './stricterR'
 import NotificationKickedOut from './types/NotificationKickedOut'
@@ -15,10 +14,6 @@ import NotificationTeamInvitation from './types/NotificationTeamInvitation'
 import Task from './types/Task'
 
 export type RethinkSchema = {
-  NewFeature: {
-    type: any
-    index: ''
-  }
   Notification: {
     type:
       | NotificationTaskInvolves
@@ -44,14 +39,10 @@ export type RethinkSchema = {
       | 'userId'
       | 'integrationHash'
   }
-  TeamInvitation: {
-    type: TeamInvitation
-    index: 'email' | 'teamId' | 'token'
-  }
 }
 
 export type DBType = {
-  [P in keyof RethinkSchema]: RethinkSchema[P]['type']
+  [P in keyof RethinkSchema]: any
 }
 
 export type ParabolR = R<RethinkSchema>

packages/server/dataloader/RethinkDBCache.ts

@@ -51,7 +51,7 @@ export default class RethinkDBCache {
           .table(table)
           .get(id)
           // "always" will return the document whether it has changed or not
-          .update(updater, {returnChanges: 'always'})('changes')(0)('new_val')
+          .update(updater as any, {returnChanges: 'always'})('changes')(0)('new_val')
           .default(null)
       )
     })

packages/server/dataloader/foreignKeyLoaderMakers.ts

@@ -283,8 +283,8 @@ export const massInvitationsByTeamMemberId = foreignKeyLoaderMaker(
   }
 )
 
-export const _pgteamInvitationsByTeamId = foreignKeyLoaderMaker(
-  '_pgteamInvitations',
+export const teamInvitationsByTeamId = foreignKeyLoaderMaker(
+  'teamInvitations',
   'teamId',
   async (teamIds) => {
     return selectTeamInvitations()

packages/server/dataloader/primaryKeyLoaderMakers.ts

@@ -141,6 +141,6 @@ export const newFeatures = primaryKeyLoaderMaker((ids: readonly number[]) => {
   return selectNewFeatures().where('id', 'in', ids).execute()
 })
 
-export const _pgteamInvitations = primaryKeyLoaderMaker((ids: readonly string[]) => {
+export const teamInvitations = primaryKeyLoaderMaker((ids: readonly string[]) => {
   return selectTeamInvitations().where('id', 'in', ids).execute()
 })

packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts

@@ -30,18 +30,3 @@ export const tasksByTeamId = new RethinkForeignKeyLoaderMaker(
       .run()
   }
 )
-
-export const teamInvitationsByTeamId = new RethinkForeignKeyLoaderMaker(
-  'teamInvitations',
-  'teamId',
-  async (teamIds) => {
-    const r = await getRethink()
-    const now = new Date()
-    return r
-      .table('TeamInvitation')
-      .getAll(r.args(teamIds), {index: 'teamId'})
-      .filter({acceptedAt: null})
-      .filter((row: RDatum) => row('expiresAt').ge(now))
-      .run()
-  }
-)

packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts

@@ -5,4 +5,3 @@ import RethinkPrimaryKeyLoaderMaker from './RethinkPrimaryKeyLoaderMaker'
  */
 export const notifications = new RethinkPrimaryKeyLoaderMaker('Notification')
 export const tasks = new RethinkPrimaryKeyLoaderMaker('Task')
-export const teamInvitations = new RethinkPrimaryKeyLoaderMaker('TeamInvitation')

packages/server/graphql/mutations/helpers/handleMassInviteToken.ts

@@ -1,5 +1,4 @@
 import {InvitationTokenError} from 'parabol-client/types/constEnums'
-import getRethink from '../../../database/rethinkDriver'
 import generateUID from '../../../generateUID'
 import getKysely from '../../../postgres/getKysely'
 import {verifyMassInviteToken} from '../../../utils/massInviteToken'
@@ -13,7 +12,6 @@ const handleMassInviteToken = async (
 ) => {
   const validToken = await verifyMassInviteToken(invitationToken, dataLoader)
   if ('error' in validToken) return {error: validToken.error}
-  const r = await getRethink()
   const {teamId, userId: invitedBy, exp: expiresAt, meetingId} = validToken
   if (tms?.includes(teamId)) {
     return {error: InvitationTokenError.ALREADY_ACCEPTED, teamId, meetingId}
@@ -26,14 +24,9 @@ const handleMassInviteToken = async (
     teamId,
     expiresAt,
     email,
-    isMassInvite: true,
-    acceptedAt: null
+    isMassInvite: true
   }
   await getKysely().insertInto('TeamInvitation').values(invitation).execute()
-  await r
-    .table('TeamInvitation')
-    .insert({...invitation, createdAt: new Date()})
-    .run()
   return {invitation}
 }
 

packages/server/graphql/mutations/helpers/handleTeamInviteToken.ts

@@ -1,6 +1,6 @@
 import {InvitationTokenError} from 'parabol-client/types/constEnums'
 import getRethink from '../../../database/rethinkDriver'
-import {TeamInvitation} from '../../../postgres/types'
+import getKysely from '../../../postgres/getKysely'
 
 const handleTeamInviteToken = async (
   invitationToken: string,
@@ -9,12 +9,13 @@ const handleTeamInviteToken = async (
   notificationId?: string
 ) => {
   const r = await getRethink()
-  const invitation = (await r
-    .table('TeamInvitation')
-    .getAll(invitationToken, {index: 'token'})
-    .nth(0)
-    .default(null)
-    .run()) as TeamInvitation
+  const pg = getKysely()
+  const invitation = await pg
+    .selectFrom('TeamInvitation')
+    .selectAll()
+    .where('token', '=', invitationToken)
+    .limit(1)
+    .executeTakeFirst()
   if (!invitation) return {error: InvitationTokenError.NOT_FOUND}
   const {expiresAt} = invitation
   if (expiresAt.getTime() < Date.now()) {

packages/server/graphql/mutations/helpers/inviteToTeamHelper.ts

@@ -39,15 +39,21 @@ const inviteToTeamHelper = async (
   const operationId = dataLoader.share()
   const subOptions = {mutatorId, operationId}
 
-  const [total, pending] = await Promise.all([
-    r.table('TeamInvitation').getAll(teamId, {index: 'teamId'}).count().run(),
-    r
-      .table('TeamInvitation')
-      .getAll(teamId, {index: 'teamId'})
-      .filter({acceptedAt: null})
-      .count()
-      .run()
+  const [totalRes, pendingRes] = await Promise.all([
+    pg
+      .selectFrom('TeamInvitation')
+      .select(({fn}) => fn.count<bigint>('id').as('count'))
+      .where('teamId', '=', teamId)
+      .executeTakeFirstOrThrow(),
+    pg
+      .selectFrom('TeamInvitation')
+      .select(({fn}) => fn.count<bigint>('id').as('count'))
+      .where('teamId', '=', teamId)
+      .where('acceptedAt', 'is', null)
+      .executeTakeFirstOrThrow()
   ])
+  const total = Number(totalRes.count)
+  const pending = Number(pendingRes.count)
   const accepted = total - pending
   // if no one has accepted one of their 100+ invites, don't trust them
   if (accepted === 0 && total + invitees.length >= 100) {
@@ -126,7 +132,6 @@ const inviteToTeamHelper = async (
     createdAt: new Date(),
     acceptedAt: null
   }))
-  await r.table('TeamInvitation').insert(teamInvitationsToInsert).run()
   await pg.insertInto('TeamInvitation').values(teamInvitationsToInsert).execute()
   // remove suggested action, if any
   let removedSuggestedActionId

packages/server/graphql/private/mutations/hardDeleteUser.ts

@@ -91,17 +91,7 @@ const hardDeleteUser: MutationResolvers['hardDeleteUser'] = async (
       .table('Task')
       .getAll(r.args(teamIds), {index: 'teamId'})
       .filter((row: RValue) => row('createdBy').eq(userIdToDelete))
-      .delete(),
-    invitedByTeamInvitation: r
-      .table('TeamInvitation')
-      .getAll(r.args(teamIds), {index: 'teamId'})
-      .filter((row: RValue) => row('invitedBy').eq(userIdToDelete))
-      .delete(),
-    createdByTeamInvitations: r
-      .table('TeamInvitation')
-      .getAll(r.args(teamIds), {index: 'teamId'})
-      .filter((row: RValue) => row('acceptedBy').eq(userIdToDelete))
-      .update({acceptedBy: ''})
+      .delete()
   }).run()
 
   // now postgres, after FKs are added then triggers should take care of children

packages/server/graphql/queries/verifiedInvitation.ts

@@ -3,7 +3,7 @@ import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {InvitationTokenError} from 'parabol-client/types/constEnums'
 import util from 'util'
 import {AuthIdentityTypeEnum} from '../../../client/types/constEnums'
-import getRethink from '../../database/rethinkDriver'
+import getKysely from '../../postgres/getKysely'
 import {getUserByEmail} from '../../postgres/queries/getUsersByEmails'
 import IUser from '../../postgres/types/IUser'
 import getBestInvitationMeeting from '../../utils/getBestInvitationMeeting'
@@ -41,14 +41,15 @@ export default {
   },
   resolve: rateLimit({perMinute: 60, perHour: 1800})(
     async (_source: unknown, {token}, {dataLoader}: GQLContext) => {
-      const r = await getRethink()
+      const pg = getKysely()
       const now = new Date()
-      const teamInvitation = await r
-        .table('TeamInvitation')
-        .getAll(token, {index: 'token'})
-        .nth(0)
-        .default(null)
-        .run()
+      const teamInvitation = await pg
+        .selectFrom('TeamInvitation')
+        .selectAll()
+        .where('token', '=', token)
+        .limit(1)
+        .executeTakeFirst()
+
       if (!teamInvitation) return {errorType: InvitationTokenError.NOT_FOUND}
       const {
         email,

packages/server/safeMutations/acceptTeamInvitation.ts

@@ -63,7 +63,6 @@ const handleFirstAcceptedInvitation = async (
 const acceptTeamInvitation = async (team: Team, userId: string, dataLoader: DataLoaderWorker) => {
   const r = await getRethink()
   const pg = getKysely()
-  const now = new Date()
   const {id: teamId, orgId} = team
   const [user, organizationUser] = await Promise.all([
     dataLoader.get('users').loadNonNull(userId),
@@ -112,16 +111,7 @@ const acceptTeamInvitation = async (team: Team, userId: string, dataLoader: Data
         openDrawer: 'manageTeam'
       })
       .onConflict((oc) => oc.column('id').doUpdateSet({isNotRemoved: true, isLead: false}))
-      .execute(),
-    r
-      .table('TeamInvitation')
-      .getAll(teamId, {index: 'teamId'})
-      .filter({email})
-      .update({
-        acceptedAt: now,
-        acceptedBy: userId
-      })
-      .run()
+      .execute()
   ])
   dataLoader.clearAll(['teamMembers', 'users'])
   if (!organizationUser) {

packages/server/safeMutations/safeArchiveTeam.ts

@@ -1,25 +1,13 @@
 import {sql} from 'kysely'
-import getRethink from '../database/rethinkDriver'
-import {RDatum} from '../database/stricterR'
 import {DataLoaderWorker} from '../graphql/graphql'
 import getKysely from '../postgres/getKysely'
 
 const safeArchiveTeam = async (teamId: string, dataLoader: DataLoaderWorker) => {
-  const r = await getRethink()
   const pg = getKysely()
   const now = new Date()
   const teamMembers = await dataLoader.get('teamMembersByTeamId').load(teamId)
   const userIds = teamMembers.map((tm) => tm.userId)
-  const [rethinkResult, removedSuggestedActions, team] = await Promise.all([
-    r({
-      invitations: r
-        .table('TeamInvitation')
-        .getAll(teamId, {index: 'teamId'})
-        .filter({acceptedAt: null})
-        .update((invitation: RDatum) => ({
-          expiresAt: r.min([invitation('expiresAt'), now])
-        })) as unknown as null
-    }).run(),
+  const [removedSuggestedActions, team] = await Promise.all([
     pg
       .updateTable('SuggestedAction')
       .set({removedAt: now})
@@ -48,7 +36,6 @@ const safeArchiveTeam = async (teamId: string, dataLoader: DataLoaderWorker) =>
   dataLoader.clearAll(['teamMembers', 'users', 'teams'])
   const users = await Promise.all(userIds.map((userId) => dataLoader.get('users').load(userId)))
   return {
-    invitations: rethinkResult.invitations,
     removedSuggestedActionIds: removedSuggestedActions.map(({id}) => id),
     team: team ?? null,
     users