Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

✨ Update subscription when adding members (#1862)

Luke Vella5cf018c503de
diff --git a/apps/web/src/app/api/stripe/webhook/handlers/customer-subscription/created.ts b/apps/web/src/app/api/stripe/webhook/handlers/customer-subscription/created.ts
index d48d4d436..5c1df80aa 100644
--- a/apps/web/src/app/api/stripe/webhook/handlers/customer-subscription/created.ts
+++ b/apps/web/src/app/api/stripe/webhook/handlers/customer-subscription/created.ts
@@ -27,6 +27,16 @@ export async function onCustomerSubscriptionCreated(event: Stripe.Event) {
const userId = res.data.userId;
const spaceId = res.data.spaceId;
+ const subscriptionItem = subscription.items.data[0];
+
+ if (!subscriptionItem) {
+ throw new Error(
+ `Missing subscription item in subscription ${subscription.id}`,
+ );
+ }
+
+ const subscriptionItemId = subscriptionItem.id;
+ const quantity = subscriptionItem.quantity ?? 1;
// If user already has a subscription, update it or replace it
// Update the existing subscription with new data
await prisma.subscription.upsert({
@@ -35,6 +45,8 @@ export async function onCustomerSubscriptionCreated(event: Stripe.Event) {
id: subscription.id,
userId,
active: isActive,
+ quantity,
+ subscriptionItemId,
priceId,
currency,
interval,
@@ -50,6 +62,8 @@ export async function onCustomerSubscriptionCreated(event: Stripe.Event) {
id: subscription.id,
userId,
active: isActive,
+ subscriptionItemId,
+ quantity,
priceId,
currency,
interval,
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.ts
index 9ee20a042..3a301c010 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
@@ -29,6 +29,15 @@ export async function onCustomerSubscriptionUpdated(event: Stripe.Event) {
throw new Error("Invalid subscription metadata");
}
+ const subscriptionItem = subscription.items.data[0];
+
+ if (!subscriptionItem) {
+ throw new Error("Expected subscription to have one item");
+ }
+
+ const subscriptionItemId = subscriptionItem.id;
+ const quantity = subscriptionItem.quantity ?? 1;
+
// Update the subscription in the database
await prisma.subscription.update({
where: {
@@ -39,6 +48,8 @@ export async function onCustomerSubscriptionUpdated(event: Stripe.Event) {
priceId,
currency,
interval,
+ subscriptionItemId,
+ quantity,
amount,
status: subscription.status,
periodStart: toDate(subscription.current_period_start),
diff --git a/apps/web/src/features/billing/constants.ts b/apps/web/src/features/billing/constants.ts
new file mode 100644
index 000000000..697ee3c0b
--- /dev/null
+++ b/apps/web/src/features/billing/constants.ts
@@ -0,0 +1,3 @@
+import { isSelfHosted } from "@/utils/constants";
+
+export const isBillingEnabled = !isSelfHosted;
diff --git a/apps/web/src/features/billing/data.ts b/apps/web/src/features/billing/data.ts
new file mode 100644
index 000000000..5ff46dbaa
--- /dev/null
+++ b/apps/web/src/features/billing/data.ts
@@ -0,0 +1,20 @@
+import { prisma } from "@rallly/database";
+
+export async function getSpaceSubscription(spaceId: string) {
+ const subscription = await prisma.subscription.findUnique({
+ where: {
+ spaceId,
+ },
+ });
+
+ if (!subscription) {
+ return null;
+ }
+
+ return {
+ id: subscription.id,
+ tier: subscription.active ? "pro" : "hobby",
+ quantity: subscription.quantity,
+ subscriptionItemId: subscription.subscriptionItemId,
+ } as const;
+}
diff --git a/apps/web/src/features/billing/mutations.ts b/apps/web/src/features/billing/mutations.ts
new file mode 100644
index 000000000..62523c044
--- /dev/null
+++ b/apps/web/src/features/billing/mutations.ts
@@ -0,0 +1,51 @@
+import { stripe } from "@rallly/billing";
+import { getSpaceSubscription } from "@/features/billing/data";
+import { getSpaceSeatCount } from "@/features/space/data";
+import { AppError } from "@/lib/errors";
+
+export async function increaseSpaceSeatCount(spaceId: string) {
+ const subscription = await getSpaceSubscription(spaceId);
+
+ if (!subscription || subscription.tier !== "pro") {
+ throw new AppError({
+ code: "PAYMENT_REQUIRED",
+ message: "You need a Pro subscription to invite members to this space",
+ });
+ }
+
+ let subscriptionItemId = subscription.subscriptionItemId;
+
+ if (!subscriptionItemId) {
+ try {
+ const stripeSub = await stripe.subscriptions.retrieve(subscription.id);
+ subscriptionItemId = stripeSub.items.data[0].id;
+ } catch (error) {
+ throw new AppError({
+ code: "INTERNAL_SERVER_ERROR",
+ message: "Failed to retrieve subscription from Stripe",
+ cause: error,
+ });
+ }
+ }
+
+ if (!subscriptionItemId) {
+ throw new AppError({
+ code: "INTERNAL_SERVER_ERROR",
+ message: "Expected subscription to have at least one item",
+ });
+ }
+
+ const seatCount = await getSpaceSeatCount(spaceId);
+
+ try {
+ await stripe.subscriptionItems.update(subscriptionItemId, {
+ quantity: seatCount + 1,
+ });
+ } catch (error) {
+ throw new AppError({
+ code: "INTERNAL_SERVER_ERROR",
+ message: "Failed to update subscription item quantity",
+ cause: error,
+ });
+ }
+}
diff --git a/apps/web/src/features/space/actions.ts b/apps/web/src/features/space/actions.ts
index 57d352fab..4f14bf4dd 100644
--- a/apps/web/src/features/space/actions.ts
+++ b/apps/web/src/features/space/actions.ts
@@ -5,10 +5,12 @@ import { accessibleBy } from "@casl/prisma";
import { prisma } from "@rallly/database";
import { absoluteUrl } from "@rallly/utils/absolute-url";
import { z } from "zod";
+import { increaseSpaceSeatCount } from "@/features/billing/mutations";
import { memberRoleSchema } from "@/features/space/schema";
import { toDBRole } from "@/features/space/utils";
import { setActiveSpace } from "@/features/user/mutations";
import { AppError } from "@/lib/errors";
+import { isFeatureEnabled } from "@/lib/feature-flags/server";
import { authActionClient, spaceActionClient } from "@/lib/safe-action/server";
import { getEmailClient } from "@/utils/emails";
@@ -288,6 +290,10 @@ export const acceptInviteAction = authActionClient
id: spaceMemberInvite.id,
},
});
+
+ if (isFeatureEnabled("billing")) {
+ await increaseSpaceSeatCount(spaceMemberInvite.spaceId);
+ }
});
try {
diff --git a/apps/web/src/features/space/data.ts b/apps/web/src/features/space/data.ts
index 86d2279f0..742a487e1 100644
--- a/apps/web/src/features/space/data.ts
+++ b/apps/web/src/features/space/data.ts
@@ -22,6 +22,14 @@ function getSpaceTier(space: {
return isSelfHosted ? "pro" : space.subscription?.active ? "pro" : "hobby";
}
+export async function getSpaceSeatCount(spaceId: string) {
+ return await prisma.spaceMember.count({
+ where: {
+ spaceId: spaceId,
+ },
+ });
+}
+
export function createSpaceDTO(
userId: string,
space: {
@@ -120,6 +128,7 @@ export const loadSubscription = cache(async () => {
currency: true,
interval: true,
status: true,
+ quantity: true,
periodEnd: true,
cancelAtPeriodEnd: true,
},
diff --git a/apps/web/src/lib/feature-flags/config.ts b/apps/web/src/lib/feature-flags/config.ts
index 4c95ea2d6..563e1defd 100644
--- a/apps/web/src/lib/feature-flags/config.ts
+++ b/apps/web/src/lib/feature-flags/config.ts
@@ -1,8 +1,8 @@
+import { isBillingEnabled } from "@/features/billing/constants";
import type { FeatureFlagConfig } from "@/lib/feature-flags/types";
import { isStorageEnabled } from "@/lib/storage";
-import { isSelfHosted } from "@/utils/constants";
export const featureFlagConfig: FeatureFlagConfig = {
storage: isStorageEnabled,
- billing: !isSelfHosted,
+ billing: isBillingEnabled,
};
diff --git a/packages/database/prisma/migrations/20250724140012_add_subscription_columns/migration.sql b/packages/database/prisma/migrations/20250724140012_add_subscription_columns/migration.sql
new file mode 100644
index 000000000..0acfff834
--- /dev/null
+++ b/packages/database/prisma/migrations/20250724140012_add_subscription_columns/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "subscriptions" ADD COLUMN "quantity" INTEGER NOT NULL DEFAULT 1,
+ADD COLUMN "subscription_item_id" TEXT;
diff --git a/packages/database/prisma/models/billing.prisma b/packages/database/prisma/models/billing.prisma
index e0a5d8295..7e586c654 100644
--- a/packages/database/prisma/models/billing.prisma
+++ b/packages/database/prisma/models/billing.prisma
@@ -1,17 +1,19 @@
model Subscription {
- id String @id
- priceId String @map("price_id")
- amount Int
- status SubscriptionStatus
- active Boolean
- currency String
- interval SubscriptionInterval
- createdAt DateTime @default(now()) @map("created_at")
- periodStart DateTime @map("period_start")
- periodEnd DateTime @map("period_end")
- cancelAtPeriodEnd Boolean @default(false) @map("cancel_at_period_end")
- userId String @unique @map("user_id")
- spaceId String? @unique @map("space_id")
+ id String @id
+ priceId String @map("price_id")
+ quantity Int @default(1)
+ subscriptionItemId String? @map("subscription_item_id")
+ amount Int
+ status SubscriptionStatus
+ active Boolean
+ currency String
+ interval SubscriptionInterval
+ createdAt DateTime @default(now()) @map("created_at")
+ periodStart DateTime @map("period_start")
+ periodEnd DateTime @map("period_end")
+ cancelAtPeriodEnd Boolean @default(false) @map("cancel_at_period_end")
+ userId String @unique @map("user_id")
+ spaceId String? @unique @map("space_id")
user User @relation("UserToSubscription", fields: [userId], references: [id], onDelete: Cascade)
space Space? @relation("SpaceToSubscription", fields: [spaceId], references: [id], onDelete: SetNull)
diff --git a/packages/database/prisma/seed/users.ts b/packages/database/prisma/seed/users.ts
index 7a5ac8cb5..b809c703c 100644
--- a/packages/database/prisma/seed/users.ts
+++ b/packages/database/prisma/seed/users.ts
@@ -39,6 +39,8 @@ async function createUser({
id: "sub-1",
spaceId: space.id,
userId: user.id,
+ subscriptionItemId: "subitem-1",
+ quantity: 1,
active: true,
amount: 700,
currency: "USD",