Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Revert "refactor(getSubscription): Update subscription data handling and improve cron job initialization"

Bill Yang49b8db82ee13
diff --git a/server/src/api/stripe/getSubscription.ts b/server/src/api/stripe/getSubscription.ts
index c5c33924c..19c9adc17 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 missing
return {
- 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",
- };
+ 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",
+ };
}
// 4. Format and return the subscription data
const responseData = {
- 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",
- };
+ 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",
+ };
return responseData;
}
diff --git a/server/src/cron/index.ts b/server/src/cron/index.ts
index 297b466df..b7028cd7f 100644
--- a/server/src/cron/index.ts
+++ b/server/src/cron/index.ts
@@ -8,8 +8,9 @@ export async function initializeCronJobs() {
if (IS_CLOUD) {
// Schedule the monthly usage checker to run every 5 minutes
- updateUsersMonthlyUsage();
- cron.schedule("*/5 * * * *", updateUsersMonthlyUsage);
+ const task = cron.schedule("*/5 * * * *", updateUsersMonthlyUsage);
+
+ await task.execute()
}
cron.schedule("*/60 * * * * *", cleanupOldSessions);
diff --git a/server/src/cron/monthly-usage-checker.ts b/server/src/cron/monthly-usage-checker.ts
index cd92f07ff..40acf1480 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 month
return [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 (subscription.current_period_start) {
+ if (subscriptionItem.current_period_start) {
// Convert subscription start timestamp to DateTime
const subscriptionStartDate = DateTime.fromSeconds(
- subscription.current_period_start
+ subscriptionItem.current_period_start
);
const currentMonth = DateTime.now().startOf("month");