Skip to content

Commit 857aadd

Browse files
authored
refactor: replace sendAccountRemovedEvent with analytics call in user deletion mutations (#11081)
1 parent 3e214c3 commit 857aadd

File tree

3 files changed

+4
-37
lines changed

3 files changed

+4
-37
lines changed

Diff for: packages/server/graphql/mutations/deleteUser.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import {USER_REASON_REMOVED_LIMIT} from '../../postgres/constants'
33
import {getUserByEmail} from '../../postgres/queries/getUsersByEmails'
44
import {getUserById} from '../../postgres/queries/getUsersByIds'
55
import updateUser from '../../postgres/queries/updateUser'
6+
import {analytics} from '../../utils/analytics/analytics'
67
import {getUserId, isSuperUser} from '../../utils/authorization'
78
import {GQLContext} from '../graphql'
89
import DeleteUserPayload from '../types/DeleteUserPayload'
9-
import sendAccountRemovedEvent from './helpers/sendAccountRemovedEvent'
1010
import softDeleteUser from './helpers/softDeleteUser'
1111

1212
const markUserSoftDeleted = async (
@@ -69,7 +69,7 @@ export default {
6969
const deletedUserEmail = await softDeleteUser(userIdToDelete, dataLoader)
7070
await markUserSoftDeleted(userIdToDelete, deletedUserEmail, validReason)
7171

72-
sendAccountRemovedEvent(userIdToDelete, user.email, validReason)
72+
analytics.accountRemoved(user, validReason)
7373

7474
return {}
7575
}

Diff for: packages/server/graphql/mutations/helpers/sendAccountRemovedEvent.ts

-32
This file was deleted.

Diff for: packages/server/graphql/private/mutations/hardDeleteUser.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import {DataLoaderInstance} from '../../../dataloader/RootDataLoader'
22
import getKysely from '../../../postgres/getKysely'
33
import {getUserByEmail} from '../../../postgres/queries/getUsersByEmails'
44
import {getUserById} from '../../../postgres/queries/getUsersByIds'
5+
import {analytics} from '../../../utils/analytics/analytics'
56
import blacklistJWT from '../../../utils/blacklistJWT'
67
import {toEpochSeconds} from '../../../utils/epochTime'
7-
import sendAccountRemovedEvent from '../../mutations/helpers/sendAccountRemovedEvent'
88
import softDeleteUser from '../../mutations/helpers/softDeleteUser'
99
import {MutationResolvers} from '../resolverTypes'
1010

@@ -74,8 +74,7 @@ const hardDeleteUser: MutationResolvers['hardDeleteUser'] = async (
7474
.where('createdBy', '=', userIdToDelete)
7575
.execute()
7676

77-
// Send metrics to HubSpot before the user is really deleted in DB
78-
await sendAccountRemovedEvent(userIdToDelete, user.email, reasonText ?? '')
77+
analytics.accountRemoved(user, reasonText ?? '')
7978

8079
// User needs to be deleted after children
8180
await pg.deleteFrom('User').where('id', '=', userIdToDelete).execute()

0 commit comments

Comments
 (0)