Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Make subscription item id non-nullable (#1866)
Luke Vellabfd5ad8fee57
diff --git a/apps/web/src/features/billing/data.ts b/apps/web/src/features/billing/data.tsindex 5ff46dbaa..49999d760 100644--- a/apps/web/src/features/billing/data.ts+++ b/apps/web/src/features/billing/data.ts@@ -1,4 +1,5 @@import { prisma } from "@rallly/database";+import type { SpaceTier } from "@/features/space/schema";export async function getSpaceSubscription(spaceId: string) {const subscription = await prisma.subscription.findUnique({@@ -13,8 +14,8 @@ export async function getSpaceSubscription(spaceId: string) {return {id: subscription.id,- tier: subscription.active ? "pro" : "hobby",+ tier: (subscription.active ? "pro" : "hobby") as SpaceTier,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.tsindex 62523c044..97b056934 100644--- a/apps/web/src/features/billing/mutations.ts+++ b/apps/web/src/features/billing/mutations.ts@@ -3,43 +3,20 @@ import { getSpaceSubscription } from "@/features/billing/data";import { getSpaceSeatCount } from "@/features/space/data";import { AppError } from "@/lib/errors";-export async function increaseSpaceSeatCount(spaceId: string) {+export async function updateSeatCount(spaceId: string, delta: number) {+ const seatCount = await getSpaceSeatCount(spaceId);const subscription = await getSpaceSubscription(spaceId);- if (!subscription || subscription.tier !== "pro") {+ if (subscription?.tier !== "pro") {throw new AppError({code: "PAYMENT_REQUIRED",- message: "You need a Pro subscription to invite members to this space",+ message: "No active subscription found for 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,+ await stripe.subscriptionItems.update(subscription.subscriptionItemId, {+ quantity: seatCount + delta,});} catch (error) {throw new AppError({diff --git a/apps/web/src/features/space/actions.ts b/apps/web/src/features/space/actions.tsindex 0b1a659c5..dc7674bbd 100644--- a/apps/web/src/features/space/actions.ts+++ b/apps/web/src/features/space/actions.ts@@ -5,7 +5,7 @@ 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 { updateSeatCount } from "@/features/billing/mutations";import { memberRoleSchema } from "@/features/space/schema";import { toDBRole } from "@/features/space/utils";import { setActiveSpace } from "@/features/user/mutations";@@ -280,7 +280,7 @@ export const acceptInviteAction = authActionClient});if (isFeatureEnabled("billing")) {- await increaseSpaceSeatCount(spaceMemberInvite.spaceId);+ await updateSeatCount(spaceMemberInvite.spaceId, 1);}});diff --git a/apps/web/tests/house-keeping.spec.ts b/apps/web/tests/house-keeping.spec.tsindex 3583599a6..4c685164a 100644--- a/apps/web/tests/house-keeping.spec.ts+++ b/apps/web/tests/house-keeping.spec.ts@@ -76,6 +76,7 @@ test.describe("House-keeping API", () => {amount: 1000,status: "active",active: true,+ subscriptionItemId: "si_test_pro",currency: "USD",interval: "month",periodStart: new Date(),diff --git a/packages/database/prisma/migrations/20250730115902_subscription_item_id_non_nullable/migration.sql b/packages/database/prisma/migrations/20250730115902_subscription_item_id_non_nullable/migration.sqlnew file mode 100644index 000000000..f26400878--- /dev/null+++ b/packages/database/prisma/migrations/20250730115902_subscription_item_id_non_nullable/migration.sql@@ -0,0 +1,8 @@+/*+ Warnings:++ - Made the column `subscription_item_id` on table `subscriptions` required. This step will fail if there are existing NULL values in that column.++*/+-- AlterTable+ALTER TABLE "subscriptions" ALTER COLUMN "subscription_item_id" SET NOT NULL;diff --git a/packages/database/prisma/models/billing.prisma b/packages/database/prisma/models/billing.prismaindex 7e586c654..91b30f58a 100644--- a/packages/database/prisma/models/billing.prisma+++ b/packages/database/prisma/models/billing.prisma@@ -2,7 +2,7 @@ model Subscription {id String @idpriceId String @map("price_id")quantity Int @default(1)- subscriptionItemId String? @map("subscription_item_id")+ subscriptionItemId String @map("subscription_item_id")amount Intstatus SubscriptionStatusactive Boolean