Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
📈 Add space group analytics (#1919)
Luke Vellab10333c3cb43
diff --git a/apps/web/src/app/api/stripe/webhook/handlers/customer-subscription/updated.ts b/apps/web/src/app/api/stripe/webhook/handlers/customer-subscription/updated.tsindex 34ebc80c0..743d36d60 100644--- a/apps/web/src/app/api/stripe/webhook/handlers/customer-subscription/updated.ts+++ b/apps/web/src/app/api/stripe/webhook/handlers/customer-subscription/updated.ts@@ -1,6 +1,7 @@import type { Stripe } from "@rallly/billing";import { prisma } from "@rallly/database";import { posthog } from "@rallly/posthog/server";+import { updateSpaceGroup } from "@/features/space/analytics";import { subscriptionMetadataSchema } from "@/features/subscription/schema";import {getExpandedSubscription,@@ -57,6 +58,14 @@ export async function onCustomerSubscriptionUpdated(event: Stripe.Event) {},});+ updateSpaceGroup({+ spaceId: res.data.spaceId,+ properties: {+ seatCount: quantity,+ tier: isActive ? "pro" : "hobby",+ },+ });+posthog?.capture({distinctId: res.data.userId,event: "subscription change",@@ -66,5 +75,8 @@ export async function onCustomerSubscriptionUpdated(event: Stripe.Event) {tier: isActive ? "pro" : "hobby",},},+ groups: {+ space: res.data.spaceId,+ },});}diff --git a/apps/web/src/auth/adapters/prisma.ts b/apps/web/src/auth/adapters/prisma.tsindex d810a7807..01bf7d5b6 100644--- a/apps/web/src/auth/adapters/prisma.ts+++ b/apps/web/src/auth/adapters/prisma.ts@@ -13,6 +13,8 @@import { PrismaAdapter } from "@auth/prisma-adapter";import { prisma } from "@rallly/database";import type { Adapter } from "next-auth/adapters";+import { trackSpaceCreated } from "@/features/space/analytics";+import { createSpace } from "@/features/space/mutations";import { createUser } from "@/features/user/mutations";export function CustomPrismaAdapter(options: {@@ -50,6 +52,12 @@ export function CustomPrismaAdapter(options: {locale: user.locale ?? undefined,});+ const space = await createSpace({+ ownerId: newUser.id,+ });++ trackSpaceCreated({ space, userId: newUser.id });+return newUser;},} as Adapter;diff --git a/apps/web/src/features/poll/analytics.ts b/apps/web/src/features/poll/analytics.tsindex 6a09635fd..6e7b87087 100644--- a/apps/web/src/features/poll/analytics.ts+++ b/apps/web/src/features/poll/analytics.ts@@ -48,6 +48,7 @@ export type PollEvent =// Poll eventsexport interface PollCreateEvent extends BaseEventData {type: "poll_create";+ spaceId?: string;properties: {title: string;optionCount: number;diff --git a/apps/web/src/features/scheduled-event/actions.ts b/apps/web/src/features/scheduled-event/actions.tsindex 8450afa1d..47092d432 100644--- a/apps/web/src/features/scheduled-event/actions.ts+++ b/apps/web/src/features/scheduled-event/actions.ts@@ -46,10 +46,6 @@ export const cancelEventAction = spaceActionClient},});- ctx.captureProperties({- eventId: parsedInput.eventId,- });-// notify attendeesconst attendees = await prisma.scheduledEventInvite.findMany({where: {diff --git a/apps/web/src/features/space/actions.ts b/apps/web/src/features/space/actions.tsindex 89795e7e5..56510b21a 100644--- a/apps/web/src/features/space/actions.ts+++ b/apps/web/src/features/space/actions.ts@@ -7,7 +7,18 @@ import { absoluteUrl } from "@rallly/utils/absolute-url";import { waitUntil } from "@vercel/functions";import { revalidatePath } from "next/cache";import { z } from "zod";+import {+ trackInviteSent,+ trackMemberJoin,+ trackMemberLeaveSpace,+ trackMemberRemoved,+ trackSetActiveSpace,+ trackSpaceCreated,+ trackSpaceDeleted,+ trackSpaceUpdated,+} from "@/features/space/analytics";import { getMember, getSpaceSeatCount } from "@/features/space/data";+import { createSpace } from "@/features/space/mutations";import { memberRoleSchema } from "@/features/space/schema";import { getTotalSeatsForSpace, toDBRole } from "@/features/space/utils";import { setActiveSpace } from "@/features/user/mutations";@@ -64,6 +75,12 @@ export const setActiveSpaceAction = authActionClientuserId: ctx.user.id,spaceId: parsedInput.spaceId,});++ trackSetActiveSpace({+ spaceId: parsedInput.spaceId,+ userId: ctx.user.id,+ name: space.name,+ });});export const createSpaceAction = authActionClient@@ -77,19 +94,14 @@ export const createSpaceAction = authActionClient}),).action(async ({ ctx, parsedInput }) => {- await prisma.space.create({- data: {- name: parsedInput.name,- ownerId: ctx.user.id,- members: {- create: {- userId: ctx.user.id,- role: "ADMIN",- lastSelectedAt: new Date(),- },- },- },+ const space = await createSpace({+ name: parsedInput.name,+ ownerId: ctx.user.id,});++ trackSpaceCreated({ space, userId: ctx.user.id });++ return space;});export const deleteSpaceAction = spaceActionClient@@ -140,6 +152,11 @@ export const deleteSpaceAction = spaceActionClient},});+ trackSpaceDeleted({+ spaceId: space.id,+ userId: ctx.user.id,+ });+revalidatePath("/", "layout");});@@ -232,29 +249,34 @@ export const inviteMemberAction = spaceActionClient}try {- await prisma.$transaction(async (tx) => {- const invite = await tx.spaceMemberInvite.create({- data: {- spaceId: ctx.space.id,- email: parsedInput.email,- role: toDBRole(parsedInput.role),- inviterId: ctx.user.id,- },- });+ const invite = await prisma.spaceMemberInvite.create({+ data: {+ spaceId: ctx.space.id,+ email: parsedInput.email,+ role: toDBRole(parsedInput.role),+ inviterId: ctx.user.id,+ },+ });- const emailClient = getEmailClient(- existingUser?.locale ?? ctx.user.locale,- );-- await emailClient.sendTemplate("SpaceInviteEmail", {- to: parsedInput.email,- props: {- spaceName: ctx.space.name,- inviterName: ctx.user.name,- spaceRole: parsedInput.role,- inviteUrl: absoluteUrl(`/accept-invite/${invite.id}`),- },- });+ const emailClient = getEmailClient(+ existingUser?.locale ?? ctx.user.locale,+ );++ await emailClient.sendTemplate("SpaceInviteEmail", {+ to: parsedInput.email,+ props: {+ spaceName: ctx.space.name,+ inviterName: ctx.user.name,+ spaceRole: parsedInput.role,+ inviteUrl: absoluteUrl(`/accept-invite/${invite.id}`),+ },+ });++ trackInviteSent({+ spaceId: ctx.space.id,+ userId: ctx.user.id,+ role: parsedInput.role,+ email: parsedInput.email,});return {@@ -298,7 +320,7 @@ export const acceptInviteAction = authActionClient});}- await prisma.$transaction(async (tx) => {+ const { memberCount } = await prisma.$transaction(async (tx) => {// Check seat availability before accepting the inviteconst [usedSeats, totalSeats] = await Promise.all([tx.spaceMember.count({ where: { spaceId: parsedInput.spaceId } }),@@ -326,6 +348,8 @@ export const acceptInviteAction = authActionClientid: spaceMemberInvite.id,},});++ return { memberCount: usedSeats + 1 };});try {@@ -336,6 +360,12 @@ export const acceptInviteAction = authActionClient} catch {console.warn("Failed to update user's active space");}++ trackMemberJoin({+ spaceId: parsedInput.spaceId,+ userId: ctx.user.id,+ memberCount,+ });});export const removeMemberAction = spaceActionClient@@ -365,12 +395,22 @@ export const removeMemberAction = spaceActionClient});}- await prisma.$transaction(async (tx) => {- await tx.spaceMember.delete({- where: {- id: parsedInput.memberId,- },- });+ const deletedMember = await prisma.spaceMember.delete({+ where: {+ id: parsedInput.memberId,+ },+ });++ const memberCount = await prisma.spaceMember.count({+ where: {+ spaceId: member.spaceId,+ },+ });++ trackMemberRemoved({+ spaceId: member.spaceId,+ userId: deletedMember.userId,+ memberCount,});});@@ -494,6 +534,12 @@ export const updateSpaceAction = spaceActionClientif (oldImage && parsedInput.image && oldImage !== parsedInput.image) {await deleteImageFromS3(oldImage);}++ trackSpaceUpdated({+ spaceId: ctx.space.id,+ userId: ctx.user.id,+ name: parsedInput.name,+ });});export const getSpaceImageUploadUrlAction = spaceActionClient@@ -688,6 +734,18 @@ export const leaveSpaceFromAccountAction = authActionClient},});});++ const memberCount = await prisma.spaceMember.count({+ where: {+ spaceId: parsedInput.spaceId,+ },+ });++ trackMemberLeaveSpace({+ spaceId: parsedInput.spaceId,+ userId: ctx.user.id,+ memberCount,+ });});export const leaveSpaceAction = spaceActionClient@@ -758,4 +816,16 @@ export const leaveSpaceAction = spaceActionClient},});});++ const memberCount = await prisma.spaceMember.count({+ where: {+ spaceId: ctx.space.id,+ },+ });++ trackMemberLeaveSpace({+ spaceId: ctx.space.id,+ userId: ctx.user.id,+ memberCount,+ });});diff --git a/apps/web/src/features/space/analytics.ts b/apps/web/src/features/space/analytics.tsnew file mode 100644index 000000000..ad5ffd337--- /dev/null+++ b/apps/web/src/features/space/analytics.ts@@ -0,0 +1,271 @@+import { posthog } from "@rallly/posthog/server";+import { toCamelCaseKeys } from "es-toolkit";+import type { SpaceTier } from "@/features/space/schema";++export function updateSpaceGroup({+ spaceId,+ properties,+}: {+ spaceId: string;+ properties: {+ seatCount?: number;+ memberCount?: number;+ tier?: SpaceTier;+ name?: string;+ deleted?: boolean;+ deletedAt?: Date;+ };+}) {+ posthog?.groupIdentify({+ groupType: "space",+ groupKey: spaceId,+ properties: toCamelCaseKeys(properties),+ });+}++export function trackSpaceCreated({+ space,+ userId,+}: {+ space: {+ id: string;+ name: string;+ };+ userId: string;+}): void {+ if (!posthog) return;++ updateSpaceGroup({+ spaceId: space.id,+ properties: {+ name: space.name,+ memberCount: 1,+ seatCount: 1,+ tier: "hobby",+ },+ });++ posthog.capture({+ distinctId: userId,+ event: "space_create",+ properties: {+ space_id: space.id,+ space_name: space.name,+ },+ groups: {+ space: space.id,+ },+ });+}++export function trackSpaceUpdated({+ spaceId,+ name,+ userId,+}: {+ spaceId: string;+ userId: string;+ name?: string;+}): void {+ if (!posthog) return;++ updateSpaceGroup({+ spaceId,+ properties: {+ name,+ },+ });++ posthog.capture({+ distinctId: userId,+ event: "space_update",+ properties: {+ space_id: spaceId,+ name: name,+ },+ groups: {+ space: spaceId,+ },+ });+}++export function trackSpaceDeleted({+ spaceId,+ userId,+}: {+ spaceId: string;+ userId: string;+}): void {+ if (!posthog) return;++ updateSpaceGroup({+ spaceId,+ properties: {+ deleted: true,+ deletedAt: new Date(),+ },+ });++ posthog.capture({+ distinctId: userId,+ event: "space_delete",+ properties: {+ space_id: spaceId,+ },+ groups: {+ space: spaceId,+ },+ });+}++export function trackMemberJoin({+ spaceId,+ memberCount,+ userId,+}: {+ spaceId: string;+ memberCount: number;+ userId: string;+}): void {+ if (!posthog) return;++ updateSpaceGroup({+ spaceId,+ properties: {+ memberCount,+ },+ });++ posthog.capture({+ distinctId: userId,+ event: "space_member_join",+ properties: {+ space_id: spaceId,+ member_count: memberCount,+ },+ groups: {+ space: spaceId,+ },+ });+}++export function trackMemberRemoved({+ spaceId,+ memberCount,+ userId,+}: {+ spaceId: string;+ memberCount: number;+ userId: string;+}): void {+ if (!posthog) return;++ updateSpaceGroup({+ spaceId,+ properties: {+ memberCount,+ },+ });++ posthog.capture({+ distinctId: userId,+ event: "space_member_remove",+ properties: {+ space_id: spaceId,+ member_count: memberCount,+ },+ groups: {+ space: spaceId,+ },+ });+}++export function trackInviteSent({+ spaceId,+ role,+ userId,+ email,+}: {+ spaceId: string;+ role: string;+ userId: string;+ email: string;+}): void {+ if (!posthog) return;++ posthog?.capture({+ distinctId: userId,+ event: "space_member_invite",+ properties: {+ space_id: spaceId,+ role,+ email,+ },+ groups: {+ space: spaceId,+ },+ });+}++export function trackMemberLeaveSpace({+ spaceId,+ memberCount,+ userId,+}: {+ spaceId: string;+ memberCount: number;+ userId: string;+}): void {+ if (!posthog) return;++ updateSpaceGroup({+ spaceId,+ properties: {+ memberCount,+ },+ });++ posthog.capture({+ distinctId: userId,+ event: "space_member_leave",+ properties: {+ space_id: spaceId,+ member_count: memberCount,+ },+ groups: {+ space: spaceId,+ },+ });+}++export function trackSetActiveSpace({+ spaceId,+ userId,+ name,+}: {+ spaceId: string;+ userId: string;+ name: string;+}) {+ if (!posthog) return;++ updateSpaceGroup({+ spaceId,+ properties: {+ name,+ },+ });++ posthog.capture({+ distinctId: userId,+ event: "space_set_active",+ properties: {+ $set: {+ active_space_id: spaceId,+ },+ },+ groups: {+ space: spaceId,+ },+ });+}diff --git a/apps/web/src/features/space/mutations.ts b/apps/web/src/features/space/mutations.tsindex e41ff3262..056c97d24 100644--- a/apps/web/src/features/space/mutations.ts+++ b/apps/web/src/features/space/mutations.ts@@ -1,22 +1,25 @@import { prisma } from "@rallly/database";export async function createSpace({+ name = "Personal",ownerId,- name,}: {+ name?: string;ownerId: string;- name: string;}) {- return await prisma.space.create({+ const space = await prisma.space.create({data: {- ownerId,name,+ ownerId,members: {create: {userId: ownerId,role: "ADMIN",+ lastSelectedAt: new Date(),},},},});++ return space;}diff --git a/apps/web/src/features/user/mutations.ts b/apps/web/src/features/user/mutations.tsindex 80040b0df..3182f8287 100644--- a/apps/web/src/features/user/mutations.ts+++ b/apps/web/src/features/user/mutations.ts@@ -20,39 +20,21 @@ export async function createUser({locale?: string;weekStart?: number;}) {- return await prisma.$transaction(async (tx) => {- const user = await tx.user.create({- data: {- name,- email,- emailVerified,- image,- timeZone,- timeFormat,- locale,- weekStart,- role: "user",- },- });-- const space = await tx.space.create({- data: {- ownerId: user.id,- name: "Personal",- },- });-- await tx.spaceMember.create({- data: {- spaceId: space.id,- userId: user.id,- role: "ADMIN",- lastSelectedAt: new Date(),- },- });-- return user;+ const user = await prisma.user.create({+ data: {+ name,+ email,+ emailVerified,+ image,+ timeZone,+ timeFormat,+ locale,+ weekStart,+ role: "user",+ },});++ return user;}export async function setActiveSpace({diff --git a/apps/web/src/lib/safe-action/server.ts b/apps/web/src/lib/safe-action/server.tsindex d70eb864d..200e3dc7c 100644--- a/apps/web/src/lib/safe-action/server.ts+++ b/apps/web/src/lib/safe-action/server.ts@@ -1,6 +1,6 @@import "server-only";-import { posthog } from "@rallly/posthog/server";+import { PostHog } from "@rallly/posthog/server";import * as Sentry from "@sentry/nextjs";import { waitUntil } from "@vercel/functions";import { createMiddleware, createSafeActionClient } from "next-safe-action";@@ -13,27 +13,27 @@ import { AppError } from "@/lib/errors";import type { Duration } from "@/lib/rate-limit";import { rateLimit } from "@/lib/rate-limit";-const posthogMiddleware = createMiddleware<{- ctx: { user: { id: string } };- metadata: { actionName: string };-}>().define(async ({ ctx, next, metadata }) => {- let properties: Record<string, unknown> | undefined;+const posthogMiddleware = createMiddleware().define(async ({ next }) => {+ if (!process.env.NEXT_PUBLIC_POSTHOG_API_KEY) {+ return next({+ ctx: {+ posthog: null,+ },+ });+ }++ const posthog = new PostHog(process.env.NEXT_PUBLIC_POSTHOG_API_KEY, {+ host: process.env.NEXT_PUBLIC_POSTHOG_API_HOST,+ flushAt: 20,+ flushInterval: 10000,+ });const result = await next({ctx: {posthog,- captureProperties: (props?: Record<string, unknown>) => {- properties = props;- },},});- posthog?.capture({- distinctId: ctx.user.id,- event: metadata.actionName,- properties,- });-if (posthog) {waitUntil(posthog.shutdown());}@@ -85,26 +85,24 @@ export const actionClient = createSafeActionClient({return "INTERNAL_SERVER_ERROR" as const;},-});+}).use(posthogMiddleware);-export const authActionClient = actionClient- .use(async ({ next }) => {- const user = await getCurrentUser();+export const authActionClient = actionClient.use(async ({ next }) => {+ const user = await getCurrentUser();- if (!user) {- throw new AppError({- code: "UNAUTHORIZED",- message: "You are not authenticated.",- });- }+ if (!user) {+ throw new AppError({+ code: "UNAUTHORIZED",+ message: "You are not authenticated.",+ });+ }- const ability = defineAbilityFor(user);+ const ability = defineAbilityFor(user);- return next({- ctx: { user, ability },- });- })- .use(posthogMiddleware);+ return next({+ ctx: { user, ability },+ });+});export const adminActionClient = authActionClient.use(async ({ ctx, next }) => {if (ctx.user.role !== "admin") {diff --git a/apps/web/src/trpc/routers/auth.ts b/apps/web/src/trpc/routers/auth.tsindex 71a7b848b..656b95e74 100644--- a/apps/web/src/trpc/routers/auth.ts+++ b/apps/web/src/trpc/routers/auth.ts@@ -8,6 +8,8 @@ import { isEmailBlocked } from "@/auth/helpers/is-email-blocked";import { mergeGuestsIntoUser } from "@/auth/helpers/merge-user";import { isTemporaryEmail } from "@/auth/helpers/temp-email-domains";import { getInstanceSettings } from "@/features/instance-settings/queries";+import { trackSpaceCreated } from "@/features/space/analytics";+import { createSpace } from "@/features/space/mutations";import { createUser } from "@/features/user/mutations";import { getEmailClient } from "@/utils/emails";import { isValidName } from "@/utils/is-valid-name";@@ -133,6 +135,12 @@ export const auth = router({locale: input.locale,});+ const space = await createSpace({+ ownerId: user.id,+ });++ trackSpaceCreated({ space, userId: user.id });+if (ctx.user?.isGuest) {try {await mergeGuestsIntoUser(user.id, [ctx.user.id]);diff --git a/apps/web/src/trpc/routers/polls.ts b/apps/web/src/trpc/routers/polls.tsindex fbd152e30..2cad27ee4 100644--- a/apps/web/src/trpc/routers/polls.ts+++ b/apps/web/src/trpc/routers/polls.ts@@ -302,6 +302,7 @@ export const polls = router({type: "poll_create",userId: ctx.user.id,pollId: poll.id,+ spaceId: poll.spaceId ?? undefined,properties: {title: poll.title,optionCount: poll.options.length,