convert everything to UTC

Author: waleedlatif1

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

@@ -76,12 +76,12 @@ describe('Billing Period Calculations', () => {
 
       const period = calculateBillingPeriod()
 
-      expect(period.start.getFullYear()).toBe(2024)
-      expect(period.start.getMonth()).toBe(6) // July (0-indexed)
-      expect(period.start.getDate()).toBe(1)
-      expect(period.end.getFullYear()).toBe(2024)
-      expect(period.end.getMonth()).toBe(6) // July (0-indexed)
-      expect(period.end.getDate()).toBe(31)
+      expect(period.start.getUTCFullYear()).toBe(2024)
+      expect(period.start.getUTCMonth()).toBe(6) // July (0-indexed)
+      expect(period.start.getUTCDate()).toBe(1)
+      expect(period.end.getUTCFullYear()).toBe(2024)
+      expect(period.end.getUTCMonth()).toBe(6) // July (0-indexed)
+      expect(period.end.getUTCDate()).toBe(31)
     })
   })
 
@@ -103,8 +103,8 @@ describe('Billing Period Calculations', () => {
       const nextPeriod = calculateNextBillingPeriod(periodEnd)
 
       expect(nextPeriod.start).toEqual(periodEnd)
-      // JavaScript's setMonth handles overflow: Jan 31 + 1 month = Mar 2 (Feb 29 + 2 days in 2024)
-      expect(nextPeriod.end.getMonth()).toBe(2) // March (0-indexed) due to overflow
+      // JavaScript's setUTCMonth handles overflow: Jan 31 + 1 month = Mar 2 (Feb 29 + 2 days in 2024)
+      expect(nextPeriod.end.getUTCMonth()).toBe(2) // March (0-indexed) due to overflow
     })
   })
 
@@ -150,7 +150,7 @@ describe('Billing Period Calculations', () => {
       vi.setSystemTime(today)
 
       const endingTomorrow = new Date(today)
-      endingTomorrow.setDate(endingTomorrow.getDate() + 1)
+      endingTomorrow.setUTCDate(endingTomorrow.getUTCDate() + 1)
 
       const shouldBill = endingTomorrow.toDateString() === today.toDateString()
 
@@ -162,7 +162,7 @@ describe('Billing Period Calculations', () => {
       vi.setSystemTime(today)
 
       const endedYesterday = new Date(today)
-      endedYesterday.setDate(endedYesterday.getDate() - 1)
+      endedYesterday.setUTCDate(endedYesterday.getUTCDate() - 1)
 
       const shouldBill = endedYesterday.toDateString() === today.toDateString()
 

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

@@ -74,8 +74,8 @@ export function calculateBillingPeriod(
 
   // Fallback: Default monthly billing period (1st to last day of month)
   // This should only be used for users without proper subscription data
-  const start = new Date(now.getFullYear(), now.getMonth(), 1)
-  const end = new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59, 999)
+  const start = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), 1))
+  const end = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth() + 1, 0, 23, 59, 59, 999))
 
   logger.warn('Using fallback calendar month billing period', {
     start,

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

@@ -79,13 +79,16 @@ describe('Billing Core Functions', () => {
       vi.setSystemTime(new Date('2024-07-15T10:00:00Z'))
       const result = calculateBillingPeriod()
 
-      // Should return current calendar month
+      // Should return current calendar month (1st to last day of current month)
       expect(result.start.getUTCFullYear()).toBe(2024)
       expect(result.start.getUTCMonth()).toBe(6) // July (0-indexed)
       expect(result.start.getUTCDate()).toBe(1) // Should start on 1st of month
       expect(result.end.getUTCFullYear()).toBe(2024)
-      expect(result.end.getUTCMonth()).toBe(7) // August (0-indexed)
-      expect(result.end.getUTCDate()).toBe(1) // Should end on 1st of next month
+      expect(result.end.getUTCMonth()).toBe(6) // July (0-indexed) - ends on last day of current month
+      expect(result.end.getUTCDate()).toBe(31) // Should end on last day of July
+      expect(result.end.getUTCHours()).toBe(23) // Should end at 23:59:59.999
+      expect(result.end.getUTCMinutes()).toBe(59)
+      expect(result.end.getUTCSeconds()).toBe(59)
     })
 
     it.concurrent('handles subscription anniversary date correctly', () => {
@@ -110,18 +113,18 @@ describe('Billing Core Functions', () => {
       const currentPeriodEnd = new Date('2024-07-15T23:59:59Z')
       const result = calculateNextBillingPeriod(currentPeriodEnd)
 
-      expect(result.start.getDate()).toBe(15)
-      expect(result.start.getMonth()).toBe(6) // July (0-indexed)
-      expect(result.end.getDate()).toBe(15)
-      expect(result.end.getMonth()).toBe(7) // August (0-indexed)
+      expect(result.start.getUTCDate()).toBe(15)
+      expect(result.start.getUTCMonth()).toBe(6) // July (0-indexed)
+      expect(result.end.getUTCDate()).toBe(15)
+      expect(result.end.getUTCMonth()).toBe(7) // August (0-indexed)
     })
 
     it.concurrent('handles month boundary correctly', () => {
       const currentPeriodEnd = new Date('2024-01-31T23:59:59Z')
       const result = calculateNextBillingPeriod(currentPeriodEnd)
 
-      expect(result.start.getMonth()).toBe(0) // January
-      expect(result.end.getMonth()).toBeGreaterThanOrEqual(1) // February or later due to month overflow
+      expect(result.start.getUTCMonth()).toBe(0) // January
+      expect(result.end.getUTCMonth()).toBeGreaterThanOrEqual(1) // February or later due to month overflow
     })
   })
 
@@ -227,8 +230,8 @@ describe('Billing Core Functions', () => {
       const janEnd = new Date('2024-01-31T00:00:00Z')
       const result = calculateNextBillingPeriod(janEnd)
 
-      expect(result.start.getMonth()).toBe(0) // January
-      expect(result.end.getMonth()).toBeGreaterThanOrEqual(1) // February or later due to month overflow
+      expect(result.start.getUTCMonth()).toBe(0) // January
+      expect(result.end.getUTCMonth()).toBeGreaterThanOrEqual(1) // February or later due to month overflow
     })
 
     it.concurrent('handles leap year correctly', () => {
@@ -247,10 +250,10 @@ describe('Billing Core Functions', () => {
       const decEnd = new Date('2024-12-15T00:00:00Z')
       const result = calculateNextBillingPeriod(decEnd)
 
-      expect(result.start.getFullYear()).toBe(2024)
-      expect(result.start.getMonth()).toBe(11) // December
-      expect(result.end.getFullYear()).toBe(2025)
-      expect(result.end.getMonth()).toBe(0) // January
+      expect(result.start.getUTCFullYear()).toBe(2024)
+      expect(result.start.getUTCMonth()).toBe(11) // December
+      expect(result.end.getUTCFullYear()).toBe(2025)
+      expect(result.end.getUTCMonth()).toBe(0) // January
     })
 
     it.concurrent('basic date calculations work', () => {

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

@@ -452,9 +452,9 @@ export async function getUsersAndOrganizationsForOverageBilling(): Promise<{
 }> {
   try {
     const today = new Date()
-    today.setHours(0, 0, 0, 0) // Start of today
+    today.setUTCHours(0, 0, 0, 0) // Start of today
     const tomorrow = new Date(today)
-    tomorrow.setDate(tomorrow.getDate() + 1) // Start of tomorrow
+    tomorrow.setUTCDate(tomorrow.getUTCDate() + 1) // Start of tomorrow
 
     logger.info('Checking for subscriptions with billing periods ending today', {
       today: today.toISOString(),
@@ -480,7 +480,7 @@ export async function getUsersAndOrganizationsForOverageBilling(): Promise<{
 
       if (sub.periodEnd) {
         const periodEnd = new Date(sub.periodEnd)
-        periodEnd.setHours(0, 0, 0, 0) // Normalize to start of day
+        periodEnd.setUTCHours(0, 0, 0, 0) // Normalize to start of day
 
         // Bill if the subscription period ends today
         if (periodEnd.getTime() === today.getTime()) {
@@ -503,7 +503,7 @@ export async function getUsersAndOrganizationsForOverageBilling(): Promise<{
 
         if (userStatsRecord.length > 0 && userStatsRecord[0].billingPeriodEnd) {
           const billingPeriodEnd = new Date(userStatsRecord[0].billingPeriodEnd)
-          billingPeriodEnd.setHours(0, 0, 0, 0) // Normalize to start of day
+          billingPeriodEnd.setUTCHours(0, 0, 0, 0) // Normalize to start of day
 
           if (billingPeriodEnd.getTime() === today.getTime()) {
             shouldBillToday = true

apps/sim/lib/billing/webhooks/stripe-invoice-webhooks.ts

@@ -288,7 +288,7 @@ async function sendInvoiceNotificationEmail(invoice: Stripe.Invoice, invoiceAmou
   const billingPeriod = invoice.metadata?.billingPeriod || 'this month'
   const plan = invoice.metadata?.plan || 'your plan'
   const dueDate = invoice.due_date
-    ? new Date(invoice.due_date * 1000).toLocaleDateString()
+    ? new Date(invoice.due_date * 1000).toISOString().split('T')[0]
     : 'immediately'
   const invoiceUrl = invoice.hosted_invoice_url || undefined