chore(rethinkdb): SuggestedAction: Phase 3

codegen.json

@@ -77,6 +77,7 @@
           "Comment": "../../database/types/Comment#default as CommentDB",
           "Company": "./types/Company#CompanySource",
           "CreateGcalEventInput": "./types/CreateGcalEventInput#default",
+          "CreateGcalEventInput": "./types/CreateGcalEventInput#default",
           "CreateImposterTokenPayload": "./types/CreateImposterTokenPayload#CreateImposterTokenPayloadSource",
           "CreateStripeSubscriptionSuccess": "./types/CreateStripeSubscriptionSuccess#CreateStripeSubscriptionSuccessSource",
           "CreateTaskPayload": "./types/CreateTaskPayload#CreateTaskPayloadSource",
@@ -112,6 +113,7 @@
           "NotifyTeamArchived": "../../database/types/NotificationTeamArchived#default",
           "Organization": "./types/Organization#OrganizationSource",
           "TemplateScaleValue": "./types/TemplateScaleValue#TemplateScaleValueSource as TemplateScaleValueSourceDB",
+          "SuggestedAction": "../../postgres/types/index#SuggestedAction as SuggestedActionDB",
           "TemplateScale": "../../postgres/types/index#TemplateScale as TemplateScaleDB",
           "TemplateScaleRef": "../../postgres/types/index#TemplateScaleRef as TemplateScaleRefDB",
           "OrganizationUser": "../../postgres/types/index#OrganizationUser as OrganizationUserDB",

packages/client/modules/email/components/MeetingSummaryEmailRootSSR.tsx

@@ -9,7 +9,7 @@ import MeetingSummaryEmail from './SummaryEmail/MeetingSummaryEmail/MeetingSumma
 const query = graphql`
   query MeetingSummaryEmailRootSSRQuery($meetingId: ID!) {
     viewer {
-      newMeeting(meetingId: $meetingId) {
+      meeting(meetingId: $meetingId) {
         meetingType
         team {
           id
@@ -42,9 +42,9 @@ const MeetingSummaryEmailRootSSR = (props: Props) => {
   // viewer will be null on initial SSR render
   if (!data?.viewer) return null
   const {viewer} = data
-  const {newMeeting} = viewer
-  if (!newMeeting) return null
-  const {team} = newMeeting
+  const {meeting} = viewer
+  if (!meeting) return null
+  const {team} = meeting
   const {id: teamId} = team
   const options = {searchParams: meetingSummaryUrlParams}
   const referrerUrl = makeAppURL(appOrigin, `new-summary/${meetingId}`, options)
@@ -53,7 +53,7 @@ const MeetingSummaryEmailRootSSR = (props: Props) => {
   const emailCSVUrl = makeAppURL(appOrigin, `new-summary/${meetingId}/csv`, options)
   return (
     <MeetingSummaryEmail
-      meeting={newMeeting}
+      meeting={meeting}
       referrer={'email'}
       teamDashUrl={teamDashUrl}
       meetingUrl={meetingUrl}

packages/client/modules/email/components/SummaryEmail/ExportToCSV.tsx

@@ -23,7 +23,7 @@ interface Props extends WithMutationProps {
 const query = graphql`
   query ExportToCSVQuery($meetingId: ID!) {
     viewer {
-      newMeeting(meetingId: $meetingId) {
+      meeting(meetingId: $meetingId) {
         meetingType
         team {
           name
@@ -116,7 +116,7 @@ const query = graphql`
   }
 `
 
-type Meeting = NonNullable<NonNullable<ExportToCSVQuery['response']['viewer']>['newMeeting']>
+type Meeting = NonNullable<NonNullable<ExportToCSVQuery['response']['viewer']>['meeting']>
 type ExportableTypeName = 'Task' | 'Reflection' | 'Comment' | 'Reply'
 
 interface CSVPokerRow {
@@ -326,7 +326,7 @@ const ExportToCSV = (props: Props) => {
     onCompleted()
     if (!data) return
     const {viewer} = data
-    const {newMeeting} = viewer
+    const {meeting: newMeeting} = viewer
     if (!newMeeting) return
     const rows = getRows(newMeeting)
     if (rows.length === 0) return

packages/client/modules/summary/components/NewMeetingSummary.tsx

@@ -26,7 +26,7 @@ const query = graphql`
     ...DashTopBar_query
     viewer {
       ...DashSidebar_viewer
-      newMeeting(meetingId: $meetingId) {
+      meeting(meetingId: $meetingId) {
         ...MeetingSummaryEmail_meeting
         ...MeetingLockedOverlay_meeting
         id
@@ -49,7 +49,7 @@ const NewMeetingSummary = (props: Props) => {
   const {urlAction, queryRef} = props
   const data = usePreloadedQuery<NewMeetingSummaryQuery>(query, queryRef)
   const {viewer} = data
-  const {newMeeting, teams} = viewer
+  const {meeting: newMeeting, teams} = viewer
   const activeMeetings = teams.flatMap((team) => team.activeMeetings).filter(Boolean)
   const {history} = useRouter()
   useEffect(() => {

packages/server/__tests__/autoJoin.test.ts

@@ -1,6 +1,6 @@
 import faker from 'faker'
-import getRethink from '../database/rethinkDriver'
 import createEmailVerification from '../email/createEmailVerification'
+import getKysely from '../postgres/getKysely'
 import {getUserTeams, sendIntranet, sendPublic} from './common'
 
 const signUpVerified = async (email: string) => {
@@ -23,12 +23,14 @@ const signUpVerified = async (email: string) => {
   // manually generate verification token so also the founder can be verified
   await createEmailVerification({email, password})
 
-  const r = await getRethink()
-  const verificationToken = await r
-    .table('EmailVerification')
-    .getAll(email, {index: 'email'})
-    .nth(0)('token')
-    .run()
+  const pg = getKysely()
+  const verificationToken = (
+    await pg
+      .selectFrom('EmailVerification')
+      .select('token')
+      .where('email', '=', email)
+      .executeTakeFirstOrThrow(() => new Error(`No verification token found for ${email}`))
+  ).token
 
   const verifyEmail = await sendPublic({
     query: `
@@ -55,9 +57,9 @@ const signUpVerified = async (email: string) => {
   expect(verifyEmail).toMatchObject({
     data: {
       verifyEmail: {
-        authToken: expect.toBeString(),
+        authToken: expect.any(String),
         user: {
-          id: expect.toBeString()
+          id: expect.any(String)
         }
       }
     }
@@ -153,7 +155,7 @@ test.skip('autoJoin on multiple teams does not create duplicate `OrganizationUse
   const newEmail = `${faker.internet.userName()}@${domain}`.toLowerCase()
   const {user: newUser} = await signUpVerified(newEmail)
 
-  expect(newUser.tms).toIncludeSameMembers(teamIds)
+  expect(newUser.tms).toEqual(expect.arrayContaining(teamIds))
   expect(newUser.organizations).toMatchObject([
     {
       id: orgId

packages/server/database/rethinkDriver.ts

@@ -26,9 +26,6 @@ import NotificationTeamInvitation from './types/NotificationTeamInvitation'
 import PasswordResetRequest from './types/PasswordResetRequest'
 import PushInvitation from './types/PushInvitation'
 import RetrospectivePrompt from './types/RetrospectivePrompt'
-import SuggestedActionCreateNewTeam from './types/SuggestedActionCreateNewTeam'
-import SuggestedActionInviteYourTeam from './types/SuggestedActionInviteYourTeam'
-import SuggestedActionTryTheDemo from './types/SuggestedActionTryTheDemo'
 import Task from './types/Task'
 
 export type RethinkSchema = {
@@ -127,12 +124,6 @@ export type RethinkSchema = {
     type: SlackNotification
     index: 'teamId' | 'userId'
   }
-  SuggestedAction: {
-    // tryRetroMeeting = 'tryRetroMeeting',
-    // tryActionMeeting = 'tryActionMeeting'
-    type: SuggestedActionCreateNewTeam | SuggestedActionInviteYourTeam | SuggestedActionTryTheDemo
-    index: 'userId' | 'teamId'
-  }
   Task: {
     type: Task
     index:

packages/server/dataloader/customLoaderMakers.ts

@@ -55,12 +55,12 @@ export interface ReactablesKey {
 
 export interface UserTasksKey {
   first: number
-  after?: Date
+  after?: Date | null
   userIds: string[]
   teamIds: string[]
   archived?: boolean
-  statusFilters: TaskStatusEnum[]
-  filterQuery?: string
+  statusFilters?: TaskStatusEnum[] | null
+  filterQuery?: string | null
   includeUnassigned?: boolean
 }
 

packages/server/dataloader/foreignKeyLoaderMakers.ts

@@ -1,5 +1,9 @@
 import getKysely from '../postgres/getKysely'
-import {selectTemplateDimension, selectTemplateScale} from '../postgres/select'
+import {
+  selectSuggestedAction,
+  selectTemplateDimension,
+  selectTemplateScale
+} from '../postgres/select'
 import {foreignKeyLoaderMaker} from './foreignKeyLoaderMaker'
 import {selectOrganizations, selectRetroReflections, selectTeams} from './primaryKeyLoaderMakers'
 
@@ -151,3 +155,11 @@ export const templateDimensionsByScaleId = foreignKeyLoaderMaker(
     return selectTemplateDimension().where('scaleId', 'in', scaleIds).orderBy('sortOrder').execute()
   }
 )
+
+export const suggestedActionsByUserId = foreignKeyLoaderMaker(
+  'suggestedActions',
+  'userId',
+  async (userIds) => {
+    return selectSuggestedAction().where('userId', 'in', userIds).execute()
+  }
+)

packages/server/dataloader/primaryKeyLoaderMakers.ts

@@ -7,7 +7,11 @@ import {getTeamPromptResponsesByIds} from '../postgres/queries/getTeamPromptResp
 import getTemplateRefsByIds from '../postgres/queries/getTemplateRefsByIds'
 import getTemplateScaleRefsByIds from '../postgres/queries/getTemplateScaleRefsByIds'
 import {getUsersByIds} from '../postgres/queries/getUsersByIds'
-import {selectTemplateDimension, selectTemplateScale} from '../postgres/select'
+import {
+  selectSuggestedAction,
+  selectTemplateDimension,
+  selectTemplateScale
+} from '../postgres/select'
 import {primaryKeyLoaderMaker} from './primaryKeyLoaderMaker'
 
 export const users = primaryKeyLoaderMaker(getUsersByIds)
@@ -159,3 +163,7 @@ export const templateScales = primaryKeyLoaderMaker((ids: readonly string[]) =>
 export const templateDimensions = primaryKeyLoaderMaker((ids: readonly string[]) => {
   return selectTemplateDimension().where('id', 'in', ids).execute()
 })
+
+export const suggestedActions = primaryKeyLoaderMaker((ids: readonly string[]) => {
+  return selectSuggestedAction().where('id', 'in', ids).execute()
+})

packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts

@@ -134,19 +134,6 @@ export const slackNotificationsByTeamId = new RethinkForeignKeyLoaderMaker(
   }
 )
 
-export const suggestedActionsByUserId = new RethinkForeignKeyLoaderMaker(
-  'suggestedActions',
-  'userId',
-  async (userIds) => {
-    const r = await getRethink()
-    return r
-      .table('SuggestedAction')
-      .getAll(r.args(userIds), {index: 'userId'})
-      .filter({removedAt: null})
-      .run()
-  }
-)
-
 export const tasksByDiscussionId = new RethinkForeignKeyLoaderMaker(
   'tasks',
   'discussionId',

packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts

@@ -15,6 +15,5 @@ export const newFeatures = new RethinkPrimaryKeyLoaderMaker('NewFeature')
 export const notifications = new RethinkPrimaryKeyLoaderMaker('Notification')
 export const slackAuths = new RethinkPrimaryKeyLoaderMaker('SlackAuth')
 export const slackNotifications = new RethinkPrimaryKeyLoaderMaker('SlackNotification')
-export const suggestedActions = new RethinkPrimaryKeyLoaderMaker('SuggestedAction')
 export const tasks = new RethinkPrimaryKeyLoaderMaker('Task')
 export const teamInvitations = new RethinkPrimaryKeyLoaderMaker('TeamInvitation')