fix billing and 2fa admin

apps/api/src/index.ts

@@ -8,14 +8,12 @@ import { assertStorageConfiguration } from './lib/storage'
 import { createApp, corsOrigins } from './app'
 import { verifyAnyActorToken } from './security/tokens'
 import { getSessionCookieName } from './security/sessionCookies'
-import { sendNotification } from './services/notificationService'
+import { processNotificationOutbox, sendNotification } from './services/notificationService'
 import {
   runTrialExpirationJob,
-  runPaymentPendingTimeoutJob,
-  runPastDueTimeoutJob,
-  runSuspensionTimeoutJob,
   runPeriodEndCancellationJob,
 } from './modules/subscriptions/subscription.service'
+import { runCollectionsWorker } from './modules/subscriptions/subscription.collections.service'
 
 const app    = createApp()
 const server = http.createServer(app)
@@ -108,26 +106,24 @@ cron.schedule('0 * * * *', async () => {
   if (n > 0) console.log(`[subscription] trial_expiration: ${n} expired`)
 })
 
-// Hourly: payment_pending → past_due after 7 days
-cron.schedule('15 * * * *', async () => {
-  const n = await runPaymentPendingTimeoutJob()
-  if (n > 0) console.log(`[subscription] payment_pending_timeout: ${n} moved to past_due`)
-})
-
-// Hourly: past_due → suspended after 7 days
-cron.schedule('30 * * * *', async () => {
-  const n = await runPastDueTimeoutJob()
-  if (n > 0) console.log(`[subscription] past_due_timeout: ${n} suspended`)
-})
-
-// Daily: suspended → cancelled after 16 days; and period-end cancellations
+// Daily: explicit period-end cancellations. Subscription collections use the
+// timezone-aware 30-day grace worker below, so the old fixed 7-day chain is
+// intentionally not scheduled.
 cron.schedule('0 1 * * *', async () => {
-  const nSuspend = await runSuspensionTimeoutJob()
   const nPeriod  = await runPeriodEndCancellationJob()
-  if (nSuspend > 0) console.log(`[subscription] suspension_timeout: ${nSuspend} cancelled`)
   if (nPeriod > 0)  console.log(`[subscription] period_end_cancel: ${nPeriod} cancelled`)
 })
 
+cron.schedule('*/15 * * * *', async () => {
+  const n = await runCollectionsWorker()
+  if (n > 0) console.log(`[subscription] collections: ${n} cases processed`)
+})
+
+cron.schedule('* * * * *', async () => {
+  const n = await processNotificationOutbox()
+  if (n > 0) console.log(`[notifications] outbox: ${n} events completed`)
+})
+
 // Daily: send trial-ending reminders (3 days before trial end)
 cron.schedule('0 9 * * *', async () => {
   const soon = new Date(Date.now() + 3 * 24 * 60 * 60 * 1000)