🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
refactor(getSubscription): Update subscription data handling and improve cron job initialization
Bill Yang16b66cc93c6f
diff --git a/server/src/api/stripe/getSubscription.ts b/server/src/api/stripe/getSubscription.tsindex 19c9adc17..c5c33924c 100644--- a/server/src/api/stripe/getSubscription.ts+++ b/server/src/api/stripe/getSubscription.ts@@ -65,28 +65,28 @@ export async function getSubscriptionInner(userId: string) {console.error("Plan details not found for price ID:", priceId);// Still return the basic subscription info even if local plan details missingreturn {- id: subscription.id,- planName: "Unknown Plan", // Indicate missing details- status: subscription.status,- currentPeriodEnd: new Date(subscriptionItem.current_period_end * 1000),- cancelAtPeriodEnd: subscription.cancel_at_period_end,- eventLimit: 0, // Unknown limit- monthlyEventCount: user.monthlyEventCount,- interval: subscriptionItem.price.recurring?.interval ?? "unknown",- };+ id: subscription.id,+ planName: "Unknown Plan", // Indicate missing details+ status: subscription.status,+ currentPeriodEnd: new Date(subscription.current_period_end * 1000),+ cancelAtPeriodEnd: subscription.cancel_at_period_end,+ eventLimit: 0, // Unknown limit+ monthlyEventCount: user.monthlyEventCount,+ interval: subscriptionItem.price.recurring?.interval ?? "unknown",+ };}// 4. Format and return the subscription dataconst responseData = {- id: subscription.id,- planName: planDetails.name,- status: subscription.status,- currentPeriodEnd: new Date(subscriptionItem.current_period_end * 1000),- cancelAtPeriodEnd: subscription.cancel_at_period_end,- eventLimit: planDetails.limits.events,- monthlyEventCount: user.monthlyEventCount,- interval: subscriptionItem.price.recurring?.interval ?? "unknown",- };+ id: subscription.id,+ planName: planDetails.name,+ status: subscription.status,+ currentPeriodEnd: new Date(subscription.current_period_end * 1000),+ cancelAtPeriodEnd: subscription.cancel_at_period_end,+ eventLimit: planDetails.limits.events,+ monthlyEventCount: user.monthlyEventCount,+ interval: subscriptionItem.price.recurring?.interval ?? "unknown",+ };return responseData;}diff --git a/server/src/cron/index.ts b/server/src/cron/index.tsindex b7028cd7f..297b466df 100644--- a/server/src/cron/index.ts+++ b/server/src/cron/index.ts@@ -8,9 +8,8 @@ export async function initializeCronJobs() {if (IS_CLOUD) {// Schedule the monthly usage checker to run every 5 minutes- const task = cron.schedule("*/5 * * * *", updateUsersMonthlyUsage);-- await task.execute()+ updateUsersMonthlyUsage();+ cron.schedule("*/5 * * * *", updateUsersMonthlyUsage);}cron.schedule("*/60 * * * * *", cleanupOldSessions);diff --git a/server/src/cron/monthly-usage-checker.ts b/server/src/cron/monthly-usage-checker.tsindex 40acf1480..cd92f07ff 100644--- a/server/src/cron/monthly-usage-checker.ts+++ b/server/src/cron/monthly-usage-checker.ts@@ -92,7 +92,7 @@ async function getUserSubscriptionInfo(userData: {// No active subscription, use default limit and start of current monthreturn [DEFAULT_EVENT_LIMIT, getStartOfMonth()];}-+const subscription = subscriptions.data[0];const subscriptionItem = subscription.items.data[0];@@ -121,10 +121,10 @@ async function getUserSubscriptionInfo(userData: {const currentMonthStart = getStartOfMonth();let periodStart = currentMonthStart;- if (subscriptionItem.current_period_start) {+ if (subscription.current_period_start) {// Convert subscription start timestamp to DateTimeconst subscriptionStartDate = DateTime.fromSeconds(- subscriptionItem.current_period_start+ subscription.current_period_start);const currentMonth = DateTime.now().startOf("month");