Skip to content

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

πŸ—ƒοΈ Make subscription fields required (#1565)

Luke Vella9dd99619e5b9
diff --git a/apps/web/src/app/api/stripe/webhook/route.ts b/apps/web/src/app/api/stripe/webhook/route.ts
index d5caef535..ed546f72a 100644
--- a/apps/web/src/app/api/stripe/webhook/route.ts
+++ b/apps/web/src/app/api/stripe/webhook/route.ts
@@ -141,7 +141,9 @@ export async function POST(request: NextRequest) {
case "customer.subscription.created": {
const { id } = event.data.object as Stripe.Subscription;
- const subscription = await stripe.subscriptions.retrieve(id);
+ const subscription = await stripe.subscriptions.retrieve(id, {
+ expand: ["items.data.price.currency_options"],
+ });
// check if the subscription is active
const isActive =
@@ -166,12 +168,21 @@ export async function POST(request: NextRequest) {
const subscriptionItem = subscription.items.data[0];
const interval = subscriptionItem.price.recurring?.interval;
+ const currency = subscription.currency;
+ const amount =
+ subscriptionItem.price.currency_options?.[currency]?.unit_amount ??
+ subscriptionItem.price.unit_amount;
if (!interval) {
throw new Error(
`Missing interval in subscription ${subscription.id}`,
);
}
+
+ if (!amount) {
+ throw new Error(`Missing amount in subscription ${subscription.id}`);
+ }
+
// create or update the subscription in the database
await prisma.subscription.upsert({
where: {
@@ -181,9 +192,9 @@ export async function POST(request: NextRequest) {
id: subscription.id,
active: isActive,
priceId: price.id,
- currency: subscriptionItem.price.currency,
+ currency,
interval,
- amount: subscriptionItem.price.unit_amount,
+ amount,
status: subscription.status,
createdAt: toDate(subscription.created),
periodStart: toDate(subscription.current_period_start),
@@ -192,9 +203,9 @@ export async function POST(request: NextRequest) {
update: {
active: isActive,
priceId: price.id,
- currency: subscriptionItem.price.currency,
+ currency,
interval,
- amount: subscriptionItem.price.unit_amount,
+ amount,
status: subscription.status,
createdAt: toDate(subscription.created),
periodStart: toDate(subscription.current_period_start),
diff --git a/packages/billing/src/scripts/subscription-data-sync.ts b/packages/billing/src/scripts/subscription-data-sync.ts
index 521b70438..10ea8976b 100644
--- a/packages/billing/src/scripts/subscription-data-sync.ts
+++ b/packages/billing/src/scripts/subscription-data-sync.ts
@@ -3,7 +3,6 @@ import { prisma } from "@rallly/database";
import { stripe } from "../lib/stripe";
(async function syncSubscriptionData() {
- const BATCH_SIZE = 10;
let processed = 0;
let failed = 0;
@@ -11,23 +10,35 @@ import { stripe } from "../lib/stripe";
select: {
id: true,
},
- take: BATCH_SIZE,
});
- console.info(`πŸš€ Syncing ${userSubscriptions.length} subscriptions...`)
+ console.info(`πŸš€ Syncing ${userSubscriptions.length} subscriptions...`);
for (const userSubscription of userSubscriptions) {
try {
const subscription = await stripe.subscriptions.retrieve(
userSubscription.id,
+ {
+ expand: ["items.data.price.currency_options"],
+ },
);
-
+ const currency = subscription.currency;
const subscriptionItem = subscription.items.data[0];
+ const currencyOption =
+ subscriptionItem.price.currency_options?.[currency];
const interval = subscriptionItem.price.recurring?.interval;
+ const amount =
+ currencyOption?.unit_amount ?? subscriptionItem.price.unit_amount;
if (!interval) {
console.info(`🚨 Missing interval in subscription ${subscription.id}`);
- + failed++;
+ failed++;
+ continue;
+ }
+
+ if (!amount) {
+ console.info(`🚨 Missing amount in subscription ${subscription.id}`);
+ failed++;
continue;
}
@@ -36,20 +47,23 @@ import { stripe } from "../lib/stripe";
id: subscription.id,
},
data: {
- amount: subscriptionItem.price.unit_amount,
- currency: subscriptionItem.price.currency,
- interval: subscriptionItem.price.recurring?.interval,
- status: subscription.status,
+ amount,
+ currency,
},
});
- console.info(`βœ… Subscription ${subscription.id} synced`);
+ console.info(
+ `βœ… Subscription ${subscription.id} synced - ${currency}${amount}`,
+ );
processed++;
} catch (error) {
- console.error(`❌ Failed to sync subscription ${userSubscription.id}:`, error);
+ console.error(
+ `❌ Failed to sync subscription ${userSubscription.id}:`,
+ error,
+ );
failed++;
}
}
console.info(`πŸ“Š Sync complete: ${processed} processed, ${failed} failed`);
-})();
\ No newline at end of file
+})();
diff --git a/packages/database/prisma/migrations/20250217103625_make_subscription_fields_required/migration.sql b/packages/database/prisma/migrations/20250217103625_make_subscription_fields_required/migration.sql
new file mode 100644
index 000000000..a4b8a9251
--- /dev/null
+++ b/packages/database/prisma/migrations/20250217103625_make_subscription_fields_required/migration.sql
@@ -0,0 +1,16 @@
+/*
+ Warnings:
+
+ - You are about to drop the column `interval_count` on the `subscriptions` table. All the data in the column will be lost.
+ - Made the column `currency` on table `subscriptions` required. This step will fail if there are existing NULL values in that column.
+ - Made the column `interval` on table `subscriptions` required. This step will fail if there are existing NULL values in that column.
+ - Made the column `amount` on table `subscriptions` required. This step will fail if there are existing NULL values in that column.
+ - Made the column `status` on table `subscriptions` required. This step will fail if there are existing NULL values in that column.
+
+*/
+-- AlterTable
+ALTER TABLE "subscriptions" DROP COLUMN "interval_count",
+ALTER COLUMN "currency" SET NOT NULL,
+ALTER COLUMN "interval" SET NOT NULL,
+ALTER COLUMN "amount" SET NOT NULL,
+ALTER COLUMN "status" SET NOT NULL;
diff --git a/packages/database/prisma/schema.prisma b/packages/database/prisma/schema.prisma
index 6d112dc94..a888e747d 100644
--- a/packages/database/prisma/schema.prisma
+++ b/packages/database/prisma/schema.prisma
@@ -88,12 +88,11 @@ model UserPaymentData {
model Subscription {
id String @id
priceId String @map("price_id")
- amount Int?
- status String?
+ amount Int
+ status String
active Boolean
- currency String?
- interval String?
- intervalCount Int? @map("interval_count")
+ currency String
+ interval String
createdAt DateTime @default(now()) @map("created_at")
periodStart DateTime @map("period_start")
periodEnd DateTime @map("period_end")
diff --git a/packages/database/prisma/seed.ts b/packages/database/prisma/seed.ts
index 836a72b00..936df4d75 100644
--- a/packages/database/prisma/seed.ts
+++ b/packages/database/prisma/seed.ts
@@ -129,10 +129,14 @@ async function main() {
subscription: {
create: {
id: "sub_123",
+ currency: "usd",
+ amount: 700,
+ interval: "month",
+ status: "active",
active: true,
priceId: "price_123",
periodStart: new Date(),
- periodEnd: dayjs().add(1, "year").toDate(),
+ periodEnd: dayjs().add(1, "month").toDate(),
},
},
},