chore(rethinkdb): OrganizationUser: Phase 2

packages/client/components/BillingLeaderActionMenu.tsx

@@ -36,7 +36,6 @@ const BillingLeaderActionMenu = (props: Props) => {
     graphql`
       fragment BillingLeaderActionMenu_organization on Organization {
         id
-        billingTier
       }
     `,
     organizationRef
@@ -45,7 +44,6 @@ const BillingLeaderActionMenu = (props: Props) => {
     graphql`
       fragment BillingLeaderActionMenu_organizationUser on OrganizationUser {
         role
-        newUserUntil
         user {
           id
         }
@@ -54,9 +52,9 @@ const BillingLeaderActionMenu = (props: Props) => {
     organizationUserRef
   )
   const atmosphere = useAtmosphere()
-  const {id: orgId, billingTier} = organization
+  const {id: orgId} = organization
   const {viewerId} = atmosphere
-  const {newUserUntil, role, user} = organizationUser
+  const {role, user} = organizationUser
   const isBillingLeader = role === 'BILLING_LEADER'
   const {id: userId} = user
 
@@ -82,14 +80,7 @@ const BillingLeaderActionMenu = (props: Props) => {
           <MenuItem label='Leave Organization' onClick={toggleLeave} />
         )}
         {viewerId !== userId && (
-          <MenuItem
-            label={
-              billingTier === 'team' && new Date(newUserUntil) > new Date()
-                ? 'Refund and Remove'
-                : 'Remove from Organization'
-            }
-            onClick={toggleRemove}
-          />
+          <MenuItem label={'Remove from Organization'} onClick={toggleRemove} />
         )}
       </Menu>
     </>

packages/client/modules/userDashboard/components/OrgUserRow/OrgMemberRow.tsx

@@ -21,7 +21,6 @@ import RowInfoHeader from '../../../../components/Row/RowInfoHeader'
 import RowInfoHeading from '../../../../components/Row/RowInfoHeading'
 import RowInfoLink from '../../../../components/Row/RowInfoLink'
 import BaseTag from '../../../../components/Tag/BaseTag'
-import EmphasisTag from '../../../../components/Tag/EmphasisTag'
 import InactiveTag from '../../../../components/Tag/InactiveTag'
 import RoleTag from '../../../../components/Tag/RoleTag'
 import {MenuPosition} from '../../../../hooks/useCoords'
@@ -126,24 +125,21 @@ interface UserInfoProps {
   isBillingLeader: boolean
   isOrgAdmin: boolean
   inactive: boolean | null
-  newUserUntil: string
 }
 
 const UserInfo: React.FC<UserInfoProps> = ({
   preferredName,
   email,
   isBillingLeader,
   isOrgAdmin,
-  inactive,
-  newUserUntil
+  inactive
 }) => (
   <StyledRowInfo>
     <RowInfoHeader>
       <RowInfoHeading>{preferredName}</RowInfoHeading>
       {isBillingLeader && <RoleTag>Billing Leader</RoleTag>}
       {isOrgAdmin && <BaseTag className='bg-gold-500 text-white'>Org Admin</BaseTag>}
       {inactive && !isBillingLeader && !isOrgAdmin && <InactiveTag>Inactive</InactiveTag>}
-      {new Date(newUserUntil) > new Date() && <EmphasisTag>New</EmphasisTag>}
     </RowInfoHeader>
     <RowInfoLink href={`mailto:${email}`} title='Send an email'>
       {email}
@@ -258,7 +254,6 @@ const OrgMemberRow = (props: Props) => {
           preferredName
         }
         role
-        newUserUntil
         ...BillingLeaderActionMenu_organizationUser
         ...OrgAdminActionMenu_organizationUser
       }
@@ -269,7 +264,6 @@ const OrgMemberRow = (props: Props) => {
   const {isViewerBillingLeader, isViewerOrgAdmin} = organization
 
   const {
-    newUserUntil,
     user: {email, inactive, picture, preferredName},
     role
   } = organizationUser
@@ -291,7 +285,6 @@ const OrgMemberRow = (props: Props) => {
         isBillingLeader={isBillingLeader}
         isOrgAdmin={isOrgAdmin}
         inactive={inactive}
-        newUserUntil={newUserUntil}
       />
       <UserActions
         isViewerOrgAdmin={isViewerOrgAdmin}

packages/server/billing/helpers/adjustUserCount.ts

@@ -1,3 +1,4 @@
+import {sql} from 'kysely'
 import {InvoiceItemType} from 'parabol-client/types/constEnums'
 import getRethink from '../../database/rethinkDriver'
 import {RDatum} from '../../database/stricterR'
@@ -36,7 +37,7 @@ const maybeUpdateOrganizationActiveDomain = async (
     return
 
   // don't modify if we can't guess the domain or the domain we guess is the current domain
-  const domain = await getActiveDomainForOrgId(orgId)
+  const domain = await getActiveDomainForOrgId(orgId, dataLoader)
   if (!domain || domain === activeDomain) return
   organization.activeDomain = domain
   const pg = getKysely()
@@ -52,13 +53,19 @@ const changePause = (inactive: boolean) => async (_orgIds: string[], user: IUser
     email,
     isActive: !inactive
   })
-  return Promise.all([
+  await Promise.all([
     updateUser(
       {
         inactive
       },
       userId
     ),
+    getKysely()
+      .updateTable('OrganizationUser')
+      .set({inactive})
+      .where('userId', '=', userId)
+      .where('removedAt', 'is', null)
+      .execute(),
     r
       .table('OrganizationUser')
       .getAll(userId, {index: 'userId'})
@@ -73,33 +80,28 @@ const addUser = async (orgIds: string[], user: IUser, dataLoader: DataLoaderWork
   const r = await getRethink()
   const [rawOrganizations, organizationUsers] = await Promise.all([
     dataLoader.get('organizations').loadMany(orgIds),
-    r
-      .table('OrganizationUser')
-      .getAll(userId, {index: 'userId'})
-      .orderBy(r.desc('newUserUntil'))
-      .coerceTo('array')
-      .run()
+    dataLoader.get('organizationUsersByUserId').load(userId)
   ])
+  dataLoader.get('organizationUsersByUserId').clear(userId)
   const organizations = rawOrganizations.filter(isValid)
   const docs = orgIds.map((orgId) => {
     const oldOrganizationUser = organizationUsers.find(
       (organizationUser) => organizationUser.orgId === orgId
     )
     const organization = organizations.find((organization) => organization.id === orgId)!
     // continue the grace period from before, if any OR set to the end of the invoice OR (if it is a free account) no grace period
-    const newUserUntil =
-      (oldOrganizationUser && oldOrganizationUser.newUserUntil) ||
-      organization.periodEnd ||
-      new Date()
     return new OrganizationUser({
       id: oldOrganizationUser?.id,
       orgId,
       userId,
-      newUserUntil,
       tier: organization.tier
     })
   })
-
+  await getKysely()
+    .insertInto('OrganizationUser')
+    .values(docs)
+    .onConflict((oc) => oc.doNothing())
+    .execute()
   await r.table('OrganizationUser').insert(docs, {conflict: 'replace'}).run()
   await Promise.all(
     orgIds.map((orgId) => {
@@ -111,7 +113,13 @@ const addUser = async (orgIds: string[], user: IUser, dataLoader: DataLoaderWork
 const deleteUser = async (orgIds: string[], user: IUser) => {
   const r = await getRethink()
   orgIds.forEach((orgId) => analytics.userRemovedFromOrg(user, orgId))
-  return r
+  await getKysely()
+    .updateTable('OrganizationUser')
+    .set({removedAt: sql`CURRENT_TIMESTAMP`})
+    .where('userId', '=', user.id)
+    .where('orgId', 'in', orgIds)
+    .execute()
+  await r
     .table('OrganizationUser')
     .getAll(user.id, {index: 'userId'})
     .filter((row: RDatum) => r.expr(orgIds).contains(row('orgId')))
@@ -152,7 +160,6 @@ export default async function adjustUserCount(
 
   const dbAction = dbActionTypeLookup[type]
   await dbAction(orgIds, user, dataLoader)
-
   const auditEventType = auditEventTypeLookup[type]
   await insertOrgUserAudit(orgIds, userId, auditEventType)
 

packages/server/billing/helpers/generateInvoice.ts

@@ -1,7 +1,6 @@
 import {InvoiceItemType} from 'parabol-client/types/constEnums'
 import Stripe from 'stripe'
 import getRethink from '../../database/rethinkDriver'
-import {RDatum} from '../../database/stricterR'
 import Coupon from '../../database/types/Coupon'
 import Invoice, {InvoiceStatusEnum} from '../../database/types/Invoice'
 import {InvoiceLineItemEnum} from '../../database/types/InvoiceLineItem'
@@ -353,16 +352,13 @@ export default async function generateInvoice(
     invoice.status === 'paid' && invoice.status_transitions.paid_at
       ? fromEpochSeconds(invoice.status_transitions.paid_at)
       : undefined
-  const [organization, billingLeaderIds] = await Promise.all([
+  const [organization, orgUsers] = await Promise.all([
     dataLoader.get('organizations').loadNonNull(orgId),
-    r
-      .table('OrganizationUser')
-      .getAll(orgId, {index: 'orgId'})
-      .filter({removedAt: null})
-      .filter((row: RDatum) => r.expr(['BILLING_LEADER', 'ORG_ADMIN']).contains(row('role')))
-      .coerceTo('array')('userId')
-      .run() as any as string[]
+    dataLoader.get('organizationUsersByOrgId').load(orgId)
   ])
+  const billingLeaderIds = orgUsers
+    .filter(({role}) => role && ['BILLING_LEADER', 'ORG_ADMIN'].includes(role))
+    .map(({userId}) => userId)
 
   const billingLeaders = (await dataLoader.get('users').loadMany(billingLeaderIds)).filter(isValid)
   const billingLeaderEmails = billingLeaders.map((user) => user.email)

packages/server/billing/helpers/handleEnterpriseOrgQuantityChanges.ts

@@ -1,5 +1,3 @@
-import getRethink from '../../database/rethinkDriver'
-import {RDatum} from '../../database/stricterR'
 import {DataLoaderWorker} from '../../graphql/graphql'
 import {OrganizationSource} from '../../graphql/public/types/Organization'
 import {analytics} from '../../utils/analytics/analytics'
@@ -9,31 +7,23 @@ const sendEnterpriseOverageEvent = async (
   organization: OrganizationSource,
   dataLoader: DataLoaderWorker
 ) => {
-  const r = await getRethink()
   const manager = getStripeManager()
   const {id: orgId, stripeSubscriptionId} = organization
   if (!stripeSubscriptionId) return
-  const [orgUserCount, subscriptionItem] = await Promise.all([
-    r
-      .table('OrganizationUser')
-      .getAll(orgId, {index: 'orgId'})
-      .filter({removedAt: null, inactive: false})
-      .count()
-      .run(),
+  const [orgUsers, subscriptionItem] = await Promise.all([
+    dataLoader.get('organizationUsersByOrgId').load(orgId),
     manager.getSubscriptionItem(stripeSubscriptionId)
   ])
+  const activeOrgUsers = orgUsers.filter(({inactive}) => !inactive)
+  const orgUserCount = activeOrgUsers.length
   if (!subscriptionItem) return
 
   const quantity = subscriptionItem.quantity
   if (!quantity) return
   if (orgUserCount > quantity) {
-    const billingLeaderOrgUser = await r
-      .table('OrganizationUser')
-      .getAll(orgId, {index: 'orgId'})
-      .filter({removedAt: null})
-      .filter((row: RDatum) => r.expr(['BILLING_LEADER', 'ORG_ADMIN']).contains(row('role')))
-      .nth(0)
-      .run()
+    const billingLeaderOrgUser = orgUsers.find(
+      ({role}) => role && ['BILLING_LEADER', 'ORG_ADMIN'].includes(role)
+    )!
     const {id: userId} = billingLeaderOrgUser
     const user = await dataLoader.get('users').loadNonNull(userId)
     analytics.enterpriseOverUserLimit(user, orgId)

packages/server/billing/helpers/teamLimitsCheck.ts

@@ -21,6 +21,13 @@ import sendTeamsLimitEmail from './sendTeamsLimitEmail'
 
 const enableUsageStats = async (userIds: string[], orgId: string) => {
   const pg = getKysely()
+  await pg
+    .updateTable('OrganizationUser')
+    .set({suggestedTier: 'team'})
+    .where('orgId', '=', orgId)
+    .where('userId', 'in', userIds)
+    .where('removedAt', 'is', null)
+    .execute()
   await r
     .table('OrganizationUser')
     .getAll(r.args(userIds), {index: 'userId'})
@@ -87,6 +94,13 @@ export const maybeRemoveRestrictions = async (orgId: string, dataLoader: DataLoa
         .set({tierLimitExceededAt: null, scheduledLockAt: null, lockedAt: null})
         .where('id', '=', orgId)
         .execute(),
+      pg
+        .updateTable('OrganizationUser')
+        .set({suggestedTier: 'starter'})
+        .where('orgId', '=', orgId)
+        .where('userId', 'in', billingLeadersIds)
+        .where('removedAt', 'is', null)
+        .execute(),
       r
         .table('OrganizationUser')
         .getAll(r.args(billingLeadersIds), {index: 'userId'})

packages/server/billing/helpers/updateSubscriptionQuantity.ts

@@ -11,9 +11,10 @@ import {getStripeManager} from '../../utils/stripe'
  */
 const updateSubscriptionQuantity = async (orgId: string, logMismatch?: boolean) => {
   const r = await getRethink()
+  const pg = getKysely()
   const manager = getStripeManager()
 
-  const org = await getKysely()
+  const org = await pg
     .selectFrom('Organization')
     .selectAll()
     .where('id', '=', orgId)
@@ -34,15 +35,29 @@ const updateSubscriptionQuantity = async (orgId: string, logMismatch?: boolean)
       return
     }
 
-    const [orgUserCount, teamSubscription] = await Promise.all([
+    const [orgUserCountRes, orgUserCount, teamSubscription] = await Promise.all([
+      pg
+        .selectFrom('OrganizationUser')
+        .select(({fn}) => fn.count<number>('id').as('count'))
+        .where('orgId', '=', orgId)
+        .where('removedAt', 'is', null)
+        .where('inactive', '=', false)
+        .executeTakeFirstOrThrow(),
       r
         .table('OrganizationUser')
         .getAll(orgId, {index: 'orgId'})
         .filter({removedAt: null, inactive: false})
         .count()
         .run(),
-      await manager.getSubscriptionItem(stripeSubscriptionId)
+      manager.getSubscriptionItem(stripeSubscriptionId)
     ])
+    if (orgUserCountRes.count !== orgUserCount) {
+      sendToSentry(new Error('OrganizationUser count mismatch'), {
+        tags: {
+          orgId
+        }
+      })
+    }
     if (
       teamSubscription &&
       teamSubscription.quantity !== undefined &&

packages/server/database/types/OrganizationUser.ts

@@ -5,7 +5,6 @@ export type OrgUserRole = 'BILLING_LEADER' | 'ORG_ADMIN'
 interface Input {
   orgId: string
   userId: string
-  newUserUntil?: Date
   id?: string
   inactive?: boolean
   joinedAt?: Date
@@ -20,36 +19,23 @@ export default class OrganizationUser {
   suggestedTier: TierEnum | null
   inactive: boolean
   joinedAt: Date
-  newUserUntil: Date
   orgId: string
   removedAt: Date | null
   role: OrgUserRole | null
   userId: string
-  tier: TierEnum | null
+  tier: TierEnum
   trialStartDate?: Date | null
 
   constructor(input: Input) {
-    const {
-      suggestedTier,
-      userId,
-      id,
-      removedAt,
-      inactive,
-      orgId,
-      joinedAt,
-      newUserUntil,
-      role,
-      tier
-    } = input
+    const {suggestedTier, userId, id, removedAt, inactive, orgId, joinedAt, role, tier} = input
     this.id = id || generateUID()
     this.suggestedTier = suggestedTier || null
     this.inactive = inactive || false
     this.joinedAt = joinedAt || new Date()
-    this.newUserUntil = newUserUntil || new Date()
     this.orgId = orgId
     this.removedAt = removedAt || null
     this.role = role || null
     this.userId = userId
-    this.tier = tier || null
+    this.tier = tier || 'starter'
   }
 }