fix(billing): make subscription table source of truth for period start and period end

apps/sim/app/api/organizations/[id]/members/[memberId]/route.ts

@@ -1,6 +1,7 @@
 import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
+import { getUserUsageData } from '@/lib/billing/core/usage'
 import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { member, user, userStats } from '@/db/schema'
@@ -80,8 +81,6 @@ export async function GET(
         .select({
           currentPeriodCost: userStats.currentPeriodCost,
           currentUsageLimit: userStats.currentUsageLimit,
-          billingPeriodStart: userStats.billingPeriodStart,
-          billingPeriodEnd: userStats.billingPeriodEnd,
           usageLimitSetBy: userStats.usageLimitSetBy,
           usageLimitUpdatedAt: userStats.usageLimitUpdatedAt,
           lastPeriodCost: userStats.lastPeriodCost,
@@ -90,11 +89,22 @@ export async function GET(
         .where(eq(userStats.userId, memberId))
         .limit(1)
 
+      const computed = await getUserUsageData(memberId)
+
       if (usageData.length > 0) {
         memberData = {
           ...memberData,
-          usage: usageData[0],
-        } as typeof memberData & { usage: (typeof usageData)[0] }
+          usage: {
+            ...usageData[0],
+            billingPeriodStart: computed.billingPeriodStart,
+            billingPeriodEnd: computed.billingPeriodEnd,
+          },
+        } as typeof memberData & {
+          usage: (typeof usageData)[0] & {
+            billingPeriodStart: Date | null
+            billingPeriodEnd: Date | null
+          }
+        }
       }
     }
 

apps/sim/app/api/organizations/[id]/members/route.ts

@@ -3,6 +3,7 @@ import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getEmailSubject, renderInvitationEmail } from '@/components/emails/render-email'
 import { getSession } from '@/lib/auth'
+import { getUserUsageData } from '@/lib/billing/core/usage'
 import { validateSeatAvailability } from '@/lib/billing/validation/seat-management'
 import { sendEmail } from '@/lib/email/mailer'
 import { quickValidateEmail } from '@/lib/email/validation'
@@ -63,7 +64,7 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
 
     // Include usage data if requested and user has admin access
     if (includeUsage && hasAdminAccess) {
-      const membersWithUsage = await db
+      const base = await db
         .select({
           id: member.id,
           userId: member.userId,
@@ -74,8 +75,6 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
           userEmail: user.email,
           currentPeriodCost: userStats.currentPeriodCost,
           currentUsageLimit: userStats.currentUsageLimit,
-          billingPeriodStart: userStats.billingPeriodStart,
-          billingPeriodEnd: userStats.billingPeriodEnd,
           usageLimitSetBy: userStats.usageLimitSetBy,
           usageLimitUpdatedAt: userStats.usageLimitUpdatedAt,
         })
@@ -84,6 +83,17 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
         .leftJoin(userStats, eq(user.id, userStats.userId))
         .where(eq(member.organizationId, organizationId))
 
+      const membersWithUsage = await Promise.all(
+        base.map(async (row) => {
+          const usage = await getUserUsageData(row.userId)
+          return {
+            ...row,
+            billingPeriodStart: usage.billingPeriodStart,
+            billingPeriodEnd: usage.billingPeriodEnd,
+          }
+        })
+      )
+
       return NextResponse.json({
         success: true,
         data: membersWithUsage,

apps/sim/lib/billing/core/billing-periods.ts

@@ -145,12 +145,9 @@ export async function initializeBillingPeriod(
       end = billingPeriod.end
     }
 
-    // Update user stats with billing period info
     await db
       .update(userStats)
       .set({
-        billingPeriodStart: start,
-        billingPeriodEnd: end,
         currentPeriodCost: '0',
       })
       .where(eq(userStats.userId, userId))
@@ -212,14 +209,12 @@ export async function resetUserBillingPeriod(userId: string): Promise<void> {
       newPeriodEnd = billingPeriod.end
     }
 
-    // Archive current period cost and reset for new period
+    // Archive current period cost and reset for new period (no longer updating period dates in user_stats)
     await db
       .update(userStats)
       .set({
-        lastPeriodCost: currentPeriodCost, // Archive previous period
-        currentPeriodCost: '0', // Reset to zero for new period
-        billingPeriodStart: newPeriodStart,
-        billingPeriodEnd: newPeriodEnd,
+        lastPeriodCost: currentPeriodCost,
+        currentPeriodCost: '0',
       })
       .where(eq(userStats.userId, userId))
 

apps/sim/lib/billing/core/billing.ts

@@ -9,7 +9,7 @@ import { getUserUsageData } from '@/lib/billing/core/usage'
 import { requireStripeClient } from '@/lib/billing/stripe-client'
 import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
-import { member, organization, subscription, user, userStats } from '@/db/schema'
+import { member, organization, subscription, user } from '@/db/schema'
 
 const logger = createLogger('Billing')
 
@@ -673,45 +673,21 @@ export async function getUsersAndOrganizationsForOverageBilling(): Promise<{
         continue // Skip free plans
       }
 
-      // Check if subscription period ends today
+      // Check if subscription period ends today (range-based, inclusive of day)
       let shouldBillToday = false
 
       if (sub.periodEnd) {
         const periodEnd = new Date(sub.periodEnd)
-        periodEnd.setUTCHours(0, 0, 0, 0) // Normalize to start of day
+        const endsToday = periodEnd >= today && periodEnd < tomorrow
 
-        // Bill if the subscription period ends today
-        if (periodEnd.getTime() === today.getTime()) {
+        if (endsToday) {
           shouldBillToday = true
           logger.info('Subscription period ends today', {
             referenceId: sub.referenceId,
             plan: sub.plan,
             periodEnd: sub.periodEnd,
           })
         }
-      } else {
-        // Fallback: Check userStats billing period for users
-        const userStatsRecord = await db
-          .select({
-            billingPeriodEnd: userStats.billingPeriodEnd,
-          })
-          .from(userStats)
-          .where(eq(userStats.userId, sub.referenceId))
-          .limit(1)
-
-        if (userStatsRecord.length > 0 && userStatsRecord[0].billingPeriodEnd) {
-          const billingPeriodEnd = new Date(userStatsRecord[0].billingPeriodEnd)
-          billingPeriodEnd.setUTCHours(0, 0, 0, 0) // Normalize to start of day
-
-          if (billingPeriodEnd.getTime() === today.getTime()) {
-            shouldBillToday = true
-            logger.info('User billing period ends today (from userStats)', {
-              userId: sub.referenceId,
-              plan: sub.plan,
-              billingPeriodEnd: userStatsRecord[0].billingPeriodEnd,
-            })
-          }
-        }
       }
 
       if (shouldBillToday) {

apps/sim/lib/billing/core/organization-billing.ts

@@ -94,8 +94,6 @@ export async function getOrganizationBillingData(
         // User stats fields
         currentPeriodCost: userStats.currentPeriodCost,
         currentUsageLimit: userStats.currentUsageLimit,
-        billingPeriodStart: userStats.billingPeriodStart,
-        billingPeriodEnd: userStats.billingPeriodEnd,
         lastActive: userStats.lastActive,
       })
       .from(member)
@@ -151,10 +149,9 @@ export async function getOrganizationBillingData(
 
     const averageUsagePerMember = members.length > 0 ? totalCurrentUsage / members.length : 0
 
-    // Get billing period from first member (should be consistent across org)
-    const firstMember = membersWithUsage[0]
-    const billingPeriodStart = firstMember?.billingPeriodStart || null
-    const billingPeriodEnd = firstMember?.billingPeriodEnd || null
+    // Billing period comes from the organization's subscription
+    const billingPeriodStart = subscription.periodStart || null
+    const billingPeriodEnd = subscription.periodEnd || null
 
     return {
       organizationId,

apps/sim/lib/billing/core/usage.ts

@@ -41,6 +41,7 @@ export async function getUserUsageData(userId: string): Promise<UsageData> {
     }
 
     const stats = userStatsData[0]
+    const subscription = await getHighestPrioritySubscription(userId)
     const currentUsage = Number.parseFloat(
       stats.currentPeriodCost?.toString() ?? stats.totalCost.toString()
     )
@@ -49,14 +50,19 @@ export async function getUserUsageData(userId: string): Promise<UsageData> {
     const isWarning = percentUsed >= 80
     const isExceeded = currentUsage >= limit
 
+    // Derive billing period dates from subscription (source of truth).
+    // For free users or missing dates, expose nulls.
+    const billingPeriodStart = subscription?.periodStart ?? null
+    const billingPeriodEnd = subscription?.periodEnd ?? null
+
     return {
       currentUsage,
       limit,
       percentUsed,
       isWarning,
       isExceeded,
-      billingPeriodStart: stats.billingPeriodStart,
-      billingPeriodEnd: stats.billingPeriodEnd,
+      billingPeriodStart,
+      billingPeriodEnd,
       lastPeriodCost: Number.parseFloat(stats.lastPeriodCost?.toString() || '0'),
     }
   } catch (error) {